eliminate unused skip_read_hmac (cleanup from last migration refactor)

sjlombardo · sjlombardo · commit bdc020d16626 · 2023-08-16T12:18:02.000-04:00
diff --git a/src/crypto.h b/src/crypto.h
@@ -215,7 +215,6 @@ typedef struct {
   int plaintext_header_sz;
   int hmac_algorithm;
   int kdf_algorithm;
-  unsigned int skip_read_hmac;
   unsigned int need_kdf_salt;
   unsigned int flags;
   unsigned char *kdf_salt;
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -1112,7 +1112,7 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int
     memcpy(iv_out, iv_in, ctx->iv_sz); /* copy the iv from the input to output buffer */
   } 
 
-  if((ctx->flags & CIPHER_FLAG_HMAC) && (mode == CIPHER_DECRYPT) && !ctx->skip_read_hmac) {
+  if((ctx->flags & CIPHER_FLAG_HMAC) && (mode == CIPHER_DECRYPT)) {
     if(sqlcipher_page_hmac(ctx, c_ctx, pgno, in, size + ctx->iv_sz, hmac_out) != SQLITE_OK) {
       sqlcipher_log(SQLCIPHER_LOG_ERROR, "sqlcipher_page_cipher: hmac operation on decrypt failed for pgno=%d", pgno);
       goto error;

Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int`
`1112`	`1112`	`memcpy(iv_out, iv_in, ctx->iv_sz); /* copy the iv from the input to output buffer */`
`1113`	`1113`	`}`
`1114`	`1114`
`1115`		`- if((ctx->flags & CIPHER_FLAG_HMAC) && (mode == CIPHER_DECRYPT) && !ctx->skip_read_hmac) {`
	`1115`	`+ if((ctx->flags & CIPHER_FLAG_HMAC) && (mode == CIPHER_DECRYPT)) {`
`1116`	`1116`	`if(sqlcipher_page_hmac(ctx, c_ctx, pgno, in, size + ctx->iv_sz, hmac_out) != SQLITE_OK) {`
`1117`	`1117`	`sqlcipher_log(SQLCIPHER_LOG_ERROR, "sqlcipher_page_cipher: hmac operation on decrypt failed for pgno=%d", pgno);`
`1118`	`1118`	`goto error;`