Skip to content

Commit 427dfab

Browse files
chris-eiblchris-eibl
committed
vendor from upstream main 322f6d58290e0ed7f4ecb84fcce12917aa0f594b
remove FStar_UInt128.h revert interim fixes in blake2module.c regen sbom
1 parent 35052e8 commit 427dfab

11 files changed

+39
-136
lines changed

‎Makefile.pre.in

-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ LIBHACL_BLAKE2_OBJS= \
666666
$(LIBHACL_SIMD256_OBJS)
667667

668668
LIBHACL_HEADERS= \
669-
Modules/_hacl/include/krml/FStar_UInt128.h \
670669
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
671670
Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h \
672671
Modules/_hacl/include/krml/fstar_uint128_struct_endianness.h \

‎Misc/sbom.spdx.json

+16-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ Hacl_Hash_Blake2b_Simd256_store_state256b_to_state32(
527527
os[i] = x;);
528528
}
529529

530-
Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_with_key(void)
530+
Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_internal_state_with_key(void)
531531
{
532532
Lib_IntVector_Intrinsics_vec256
533533
*buf =
@@ -565,7 +565,7 @@ Hacl_Hash_Blake2b_Simd256_update_last_no_inline(
565565
}
566566

567567
void
568-
Hacl_Hash_Blake2b_Simd256_copy(
568+
Hacl_Hash_Blake2b_Simd256_copy_internal_state(
569569
Lib_IntVector_Intrinsics_vec256 *src,
570570
Lib_IntVector_Intrinsics_vec256 *dst
571571
)
@@ -831,7 +831,7 @@ The caller must satisfy the following requirements.
831831
832832
*/
833833
Hacl_Hash_Blake2b_Simd256_state_t
834-
*Hacl_Hash_Blake2b_Simd256_malloc_with_key0(uint8_t *k, uint8_t kk)
834+
*Hacl_Hash_Blake2b_Simd256_malloc_with_key(uint8_t *k, uint8_t kk)
835835
{
836836
uint8_t nn = 64U;
837837
Hacl_Hash_Blake2b_index i = { .key_length = kk, .digest_length = nn, .last_node = false };
@@ -857,7 +857,7 @@ use Blake2 as a hash function. Further resettings of the state SHALL be done wit
857857
*/
858858
Hacl_Hash_Blake2b_Simd256_state_t *Hacl_Hash_Blake2b_Simd256_malloc(void)
859859
{
860-
return Hacl_Hash_Blake2b_Simd256_malloc_with_key0(NULL, 0U);
860+
return Hacl_Hash_Blake2b_Simd256_malloc_with_key(NULL, 0U);
861861
}
862862

863863
static Hacl_Hash_Blake2b_index index_of_state(Hacl_Hash_Blake2b_Simd256_state_t *s)
@@ -1367,7 +1367,7 @@ void Hacl_Hash_Blake2b_Simd256_free(Hacl_Hash_Blake2b_Simd256_state_t *state)
13671367
Copying. This preserves all parameters.
13681368
*/
13691369
Hacl_Hash_Blake2b_Simd256_state_t
1370-
*Hacl_Hash_Blake2b_Simd256_copy0(Hacl_Hash_Blake2b_Simd256_state_t *state)
1370+
*Hacl_Hash_Blake2b_Simd256_copy(Hacl_Hash_Blake2b_Simd256_state_t *state)
13711371
{
13721372
Hacl_Hash_Blake2b_Simd256_state_t scrut = *state;
13731373
Hacl_Hash_Blake2b_Simd256_block_state_t block_state0 = scrut.block_state;

‎Modules/_hacl/Hacl_Hash_Blake2b_Simd256.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The caller must satisfy the following requirements.
8888
8989
*/
9090
Hacl_Hash_Blake2b_Simd256_state_t
91-
*Hacl_Hash_Blake2b_Simd256_malloc_with_key0(uint8_t *k, uint8_t kk);
91+
*Hacl_Hash_Blake2b_Simd256_malloc_with_key(uint8_t *k, uint8_t kk);
9292

9393
/**
9494
Specialized allocation function that picks default values for all
@@ -165,7 +165,7 @@ void Hacl_Hash_Blake2b_Simd256_free(Hacl_Hash_Blake2b_Simd256_state_t *state);
165165
Copying. This preserves all parameters.
166166
*/
167167
Hacl_Hash_Blake2b_Simd256_state_t
168-
*Hacl_Hash_Blake2b_Simd256_copy0(Hacl_Hash_Blake2b_Simd256_state_t *state);
168+
*Hacl_Hash_Blake2b_Simd256_copy(Hacl_Hash_Blake2b_Simd256_state_t *state);
169169

170170
/**
171171
Write the BLAKE2b digest of message `input` using key `key` into `output`.

‎Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Hacl_Hash_Blake2s_Simd128_load_state128s_from_state32(
519519
r3[0U] = Lib_IntVector_Intrinsics_vec128_load32s(b3[0U], b3[1U], b3[2U], b3[3U]);
520520
}
521521

522-
Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_with_key(void)
522+
Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_internal_state_with_key(void)
523523
{
524524
Lib_IntVector_Intrinsics_vec128
525525
*buf =
@@ -557,7 +557,7 @@ Hacl_Hash_Blake2s_Simd128_update_last_no_inline(
557557
}
558558

559559
void
560-
Hacl_Hash_Blake2s_Simd128_copy(
560+
Hacl_Hash_Blake2s_Simd128_copy_internal_state(
561561
Lib_IntVector_Intrinsics_vec128 *src,
562562
Lib_IntVector_Intrinsics_vec128 *dst
563563
)
@@ -820,7 +820,7 @@ The caller must satisfy the following requirements.
820820
821821
*/
822822
Hacl_Hash_Blake2s_Simd128_state_t
823-
*Hacl_Hash_Blake2s_Simd128_malloc_with_key0(uint8_t *k, uint8_t kk)
823+
*Hacl_Hash_Blake2s_Simd128_malloc_with_key(uint8_t *k, uint8_t kk)
824824
{
825825
uint8_t nn = 32U;
826826
Hacl_Hash_Blake2b_index i = { .key_length = kk, .digest_length = nn, .last_node = false };
@@ -846,7 +846,7 @@ use Blake2 as a hash function. Further resettings of the state SHALL be done wit
846846
*/
847847
Hacl_Hash_Blake2s_Simd128_state_t *Hacl_Hash_Blake2s_Simd128_malloc(void)
848848
{
849-
return Hacl_Hash_Blake2s_Simd128_malloc_with_key0(NULL, 0U);
849+
return Hacl_Hash_Blake2s_Simd128_malloc_with_key(NULL, 0U);
850850
}
851851

852852
static Hacl_Hash_Blake2b_index index_of_state(Hacl_Hash_Blake2s_Simd128_state_t *s)
@@ -1322,7 +1322,7 @@ void Hacl_Hash_Blake2s_Simd128_free(Hacl_Hash_Blake2s_Simd128_state_t *state)
13221322
Copying. This preserves all parameters.
13231323
*/
13241324
Hacl_Hash_Blake2s_Simd128_state_t
1325-
*Hacl_Hash_Blake2s_Simd128_copy0(Hacl_Hash_Blake2s_Simd128_state_t *state)
1325+
*Hacl_Hash_Blake2s_Simd128_copy(Hacl_Hash_Blake2s_Simd128_state_t *state)
13261326
{
13271327
Hacl_Hash_Blake2s_Simd128_state_t scrut = *state;
13281328
Hacl_Hash_Blake2s_Simd128_block_state_t block_state0 = scrut.block_state;

‎Modules/_hacl/Hacl_Hash_Blake2s_Simd128.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The caller must satisfy the following requirements.
8888
8989
*/
9090
Hacl_Hash_Blake2s_Simd128_state_t
91-
*Hacl_Hash_Blake2s_Simd128_malloc_with_key0(uint8_t *k, uint8_t kk);
91+
*Hacl_Hash_Blake2s_Simd128_malloc_with_key(uint8_t *k, uint8_t kk);
9292

9393
/**
9494
Specialized allocation function that picks default values for all
@@ -165,7 +165,7 @@ void Hacl_Hash_Blake2s_Simd128_free(Hacl_Hash_Blake2s_Simd128_state_t *state);
165165
Copying. This preserves all parameters.
166166
*/
167167
Hacl_Hash_Blake2s_Simd128_state_t
168-
*Hacl_Hash_Blake2s_Simd128_copy0(Hacl_Hash_Blake2s_Simd128_state_t *state);
168+
*Hacl_Hash_Blake2s_Simd128_copy(Hacl_Hash_Blake2s_Simd128_state_t *state);
169169

170170
/**
171171
Write the BLAKE2s digest of message `input` using key `key` into `output`.

‎Modules/_hacl/include/krml/FStar_UInt128.h

-78
This file was deleted.

‎Modules/_hacl/internal/Hacl_Hash_Blake2b_Simd256.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ Hacl_Hash_Blake2b_Simd256_store_state256b_to_state32(
8181
Lib_IntVector_Intrinsics_vec256 *st
8282
);
8383

84-
Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_with_key(void);
84+
Lib_IntVector_Intrinsics_vec256
85+
*Hacl_Hash_Blake2b_Simd256_malloc_internal_state_with_key(void);
8586

8687
void
8788
Hacl_Hash_Blake2b_Simd256_update_multi_no_inline(
@@ -100,7 +101,7 @@ Hacl_Hash_Blake2b_Simd256_update_last_no_inline(
100101
);
101102

102103
void
103-
Hacl_Hash_Blake2b_Simd256_copy(
104+
Hacl_Hash_Blake2b_Simd256_copy_internal_state(
104105
Lib_IntVector_Intrinsics_vec256 *src,
105106
Lib_IntVector_Intrinsics_vec256 *dst
106107
);

‎Modules/_hacl/internal/Hacl_Hash_Blake2s_Simd128.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ Hacl_Hash_Blake2s_Simd128_load_state128s_from_state32(
8181
uint32_t *st32
8282
);
8383

84-
Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_with_key(void);
84+
Lib_IntVector_Intrinsics_vec128
85+
*Hacl_Hash_Blake2s_Simd128_malloc_internal_state_with_key(void);
8586

8687
void
8788
Hacl_Hash_Blake2s_Simd128_update_multi_no_inline(
@@ -100,7 +101,7 @@ Hacl_Hash_Blake2s_Simd128_update_last_no_inline(
100101
);
101102

102103
void
103-
Hacl_Hash_Blake2s_Simd128_copy(
104+
Hacl_Hash_Blake2s_Simd128_copy_internal_state(
104105
Lib_IntVector_Intrinsics_vec128 *src,
105106
Lib_IntVector_Intrinsics_vec128 *dst
106107
);

0 commit comments

Comments
 (0)