Move finalXOF to end of evp_md_st to preserve memory layout

aws · Sep 19, 2023 · d2d298b · d2d298b
1 parent f702100
commit d2d298b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crypto/digest_extra/digest_extra.c b/crypto/digest_extra/digest_extra.c
@@ -263,9 +263,9 @@ static const EVP_MD evp_md_blake2b256 = {
   blake2b256_init,
   blake2b256_update,
   blake2b256_final,
-  /*finalXOf*/ NULL,
   BLAKE2B_CBLOCK,
   sizeof(BLAKE2B_CTX),
+  /*finalXOf*/ NULL,
 };
 
 const EVP_MD *EVP_blake2b256(void) { return &evp_md_blake2b256; }
diff --git a/crypto/fipsmodule/digest/internal.h b/crypto/fipsmodule/digest/internal.h
@@ -85,15 +85,15 @@ struct env_md_st {
   // final completes the hash and writes |md_size| bytes of digest to |out|.
   void (*final)(EVP_MD_CTX *ctx, uint8_t *out);
 
-  // finalXOF completes the hash and writes |len| bytes of digest extended output
-  // to |out|.
-  void (*finalXOF)(EVP_MD_CTX *ctx, uint8_t *out, size_t len);
-
   // block_size contains the hash's native block size.
   unsigned block_size;
 
   // ctx_size contains the size, in bytes, of the state of the hash function.
   unsigned ctx_size;
+
+  // finalXOF completes the hash and writes |len| bytes of digest extended output
+  // to |out|.
+  void (*finalXOF)(EVP_MD_CTX *ctx, uint8_t *out, size_t len);
 };
 
 // evp_md_pctx_ops contains function pointers to allow the |pctx| member of