Use newly-implemented copy operation

python · gpshead · Feb 7, 2023 · Nov 4, 2022 · Nov 4, 2022 · Nov 4, 2022
commit a632c84b6c09e87b51378821f171f1ddce8df6aa
@@ -253,7 +253,7 @@ static inline void sha224_finish(uint32_t *st, uint8_t *h)
 Allocate initial state for the SHA2_256 hash. The state is to be freed by
 calling `free_256`.
 */
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256()
+Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
   uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));
@@ -269,6 +269,32 @@ Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256()
   return p;
 }
 
+/**
+Copies the state passed as argument into a newly allocated state. The state
+is to be freed by calling `free_256`
+*/
+Hacl_Streaming_SHA2_state_sha2_224
+*Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_SHA2_state_sha2_224 *s0)
+{
+  Hacl_Streaming_SHA2_state_sha2_224 scrut = *s0;
+  uint32_t *block_state0 = scrut.block_state;
+  uint8_t *buf0 = scrut.buf;
+  uint64_t total_len0 = scrut.total_len;
+  uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
+  memcpy(buf, buf0, (uint32_t)64U * sizeof (uint8_t));
+  uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));
+  memcpy(block_state, block_state0, (uint32_t)8U * sizeof (uint32_t));
+  Hacl_Streaming_SHA2_state_sha2_224
+  s = { .block_state = block_state, .buf = buf, .total_len = total_len0 };
+  Hacl_Streaming_SHA2_state_sha2_224
+  *p =
+    (Hacl_Streaming_SHA2_state_sha2_224 *)KRML_HOST_MALLOC(sizeof (
+        Hacl_Streaming_SHA2_state_sha2_224
+      ));
+  p[0U] = s;
+  return p;
+}
+
 /**
 Reset an existing state to the initial hash state with empty data.
 */
@@ -550,7 +576,7 @@ void Hacl_Streaming_SHA2_sha256(uint8_t *input, uint32_t input_len, uint8_t *dst
   sha256_finish(st, rb);
 }
 
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224()
+Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
   uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));

@@ -51,7 +51,14 @@ typedef Hacl_Streaming_SHA2_state_sha2_224 Hacl_Streaming_SHA2_state_sha2_256;
 Allocate initial state for the SHA2_256 hash. The state is to be freed by
 calling `free_256`.
 */
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256();
+Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256(void);
+
+/**
+Copies the state passed as argument into a newly allocated state. The state
+is to be freed by calling `free_256`
+*/
+Hacl_Streaming_SHA2_state_sha2_224
+*Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_SHA2_state_sha2_224 *s0);
 
 /**
 Reset an existing state to the initial hash state with empty data.
@@ -92,7 +99,7 @@ Hash `input`, of len `input_len`, into `dst`, an array of 32 bytes.
 */
 void Hacl_Streaming_SHA2_sha256(uint8_t *input, uint32_t input_len, uint8_t *dst);
 
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224();
+Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224(void);
 
 void Hacl_Streaming_SHA2_init_224(Hacl_Streaming_SHA2_state_sha2_224 *s);
 

@@ -9,7 +9,7 @@ if [[ $1 == "" ]]; then
 fi
 
 hacl_dir=$1
-expected_rev=b0f29a4bd3a9408a9453b97de9cefffb11d89391
+expected_rev=34b8a9fcd91859460b021dabc54deb961e02a675
 actual_rev=$(cd "$hacl_dir" && git rev-parse HEAD)
 
 if [[ $actual_rev != $expected_rev ]]; then
@@ -54,9 +54,9 @@ fi
 
 all_files=$(find . -name '*.h' -or -name '*.c')
 
-# types.h is a simple wrapper that defines the uint128 then proceeds to include
-# FStar_UInt_8_16_32_64.h; we jump the types.h step since our current selection
-# of algorithms does not necessitate the use of uint128
+# types.h is a simple wrapper that defines the uint128 type then proceeds to
+# include FStar_UInt_8_16_32_64.h; we jump the types.h step since our current
+# selection of algorithms does not necessitate the use of uint128
 $sed -i 's!#include.*types.h"!#include "krml/FStar_UInt_8_16_32_64.h"!g' $all_files
 $sed -i 's!#include.*compat.h"!!g' $all_files
 

@@ -74,14 +74,7 @@ _sha256_get_state(PyObject *module)
 static void SHAcopy(SHAobject *src, SHAobject *dest)
 {
     dest->digestsize = src->digestsize;
-    // TODO: implement this in HACL
-    if (dest->digestsize == 28)
-      dest->state = Hacl_Streaming_SHA2_create_in_224();
-    else
-      dest->state = Hacl_Streaming_SHA2_create_in_256();
-    dest->state->total_len = src->state->total_len;
-    memcpy(dest->state->block_state, src->state->block_state, SHA_DIGESTSIZE);
-    memcpy(dest->state->buf, src->state->buf, SHA_BLOCKSIZE);
+    dest->state = Hacl_Streaming_SHA2_copy_256(src->state);
 }
 
 static SHAobject *