01_ed25519.patch (3513B)
1 Bug 1325335 2 3 diff --git a/dist/gcc-compatible/Hacl_Ed25519.c b/dist/gcc-compatible/Hacl_Ed25519.c 4 index 2f6e0bc3ca..f7a5ea6d75 100644 5 --- a/dist/gcc-compatible/Hacl_Ed25519.c 6 +++ b/dist/gcc-compatible/Hacl_Ed25519.c 7 @@ -25,12 +25,13 @@ 8 #include "internal/Hacl_Ed25519.h" 9 10 #include "internal/Hacl_Krmllib.h" 11 -#include "internal/Hacl_Hash_SHA2.h" 12 #include "internal/Hacl_Ed25519_PrecompTable.h" 13 #include "internal/Hacl_Curve25519_51.h" 14 #include "internal/Hacl_Bignum_Base.h" 15 #include "internal/Hacl_Bignum25519_51.h" 16 17 +#include "../Hacl_Hash_SHA2_shim.h" 18 + 19 static inline void 20 fsum(uint64_t *out, uint64_t *a, uint64_t *b) 21 { 22 @@ -1669,50 +1670,6 @@ load_32_bytes(uint64_t *out, uint8_t *b) 23 out[4U] = b41; 24 } 25 26 -static inline void 27 -sha512_pre_msg(uint8_t *hash, uint8_t *prefix, uint32_t len, uint8_t *input) 28 -{ 29 - uint8_t buf[128U] = { 0U }; 30 - uint64_t block_state[8U] = { 0U }; 31 - Hacl_Streaming_MD_state_64 32 - s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U }; 33 - Hacl_Streaming_MD_state_64 p = s; 34 - Hacl_SHA2_Scalar32_sha512_init(block_state); 35 - Hacl_Streaming_MD_state_64 *st = &p; 36 - Hacl_Streaming_Types_error_code 37 - err0 = Hacl_Streaming_SHA2_update_512(st, prefix, (uint32_t)32U); 38 - Hacl_Streaming_Types_error_code err1 = Hacl_Streaming_SHA2_update_512(st, input, len); 39 - KRML_HOST_IGNORE(err0); 40 - KRML_HOST_IGNORE(err1); 41 - Hacl_Streaming_SHA2_finish_512(st, hash); 42 -} 43 - 44 -static inline void 45 -sha512_pre_pre2_msg( 46 - uint8_t *hash, 47 - uint8_t *prefix, 48 - uint8_t *prefix2, 49 - uint32_t len, 50 - uint8_t *input) 51 -{ 52 - uint8_t buf[128U] = { 0U }; 53 - uint64_t block_state[8U] = { 0U }; 54 - Hacl_Streaming_MD_state_64 55 - s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U }; 56 - Hacl_Streaming_MD_state_64 p = s; 57 - Hacl_SHA2_Scalar32_sha512_init(block_state); 58 - Hacl_Streaming_MD_state_64 *st = &p; 59 - Hacl_Streaming_Types_error_code 60 - err0 = Hacl_Streaming_SHA2_update_512(st, prefix, (uint32_t)32U); 61 - Hacl_Streaming_Types_error_code 62 - err1 = Hacl_Streaming_SHA2_update_512(st, prefix2, (uint32_t)32U); 63 - Hacl_Streaming_Types_error_code err2 = Hacl_Streaming_SHA2_update_512(st, input, len); 64 - KRML_HOST_IGNORE(err0); 65 - KRML_HOST_IGNORE(err1); 66 - KRML_HOST_IGNORE(err2); 67 - Hacl_Streaming_SHA2_finish_512(st, hash); 68 -} 69 - 70 static inline void 71 sha512_modq_pre(uint64_t *out, uint8_t *prefix, uint32_t len, uint8_t *input) 72 { 73 diff --git a/dist/gcc-compatible/Hacl_Ed25519.h b/dist/gcc-compatible/Hacl_Ed25519.h 74 index 12e16e142c..7d6f87dff2 100644 75 --- a/dist/gcc-compatible/Hacl_Ed25519.h 76 +++ b/dist/gcc-compatible/Hacl_Ed25519.h 77 @@ -36,7 +36,6 @@ extern "C" { 78 79 #include "Hacl_Streaming_Types.h" 80 #include "Hacl_Krmllib.h" 81 -#include "Hacl_Hash_SHA2.h" 82 83 /******************************************************************************** 84 Verified C library for EdDSA signing and verification on the edwards25519 curve. 85 diff --git a/dist/gcc-compatible/internal/Hacl_Ed25519.h b/dist/gcc-compatible/internal/Hacl_Ed25519.h 86 index ba77b6dc09..ad36672b92 100644 87 --- a/dist/gcc-compatible/internal/Hacl_Ed25519.h 88 +++ b/dist/gcc-compatible/internal/Hacl_Ed25519.h 89 @@ -35,7 +35,6 @@ extern "C" { 90 #include "krml/internal/target.h" 91 92 #include "internal/Hacl_Krmllib.h" 93 -#include "internal/Hacl_Hash_SHA2.h" 94 #include "internal/Hacl_Ed25519_PrecompTable.h" 95 #include "internal/Hacl_Curve25519_51.h" 96 #include "internal/Hacl_Bignum_Base.h"