8000 gh-130213: update hacl_star_rev to 322f6d58290e0ed7f4ecb84fcce12917aa0f594b by chris-eibl · Pull Request #130960 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-130213: update hacl_star_rev to 322f6d58290e0ed7f4ecb84fcce12917aa0f594b #130960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 15, 2025
Merged

gh-130213: update hacl_star_rev to 322f6d58290e0ed7f4ecb84fcce12917aa0f594b #130960

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02f3ebe
update to hacl_star_rev=809c320227eecc61a744953f1ee574b4f24aabe3
chris-eibl Mar 7, 2025
94bcca9
fix #include "python_hacl_namespaces.h"
chris-eibl Mar 7, 2025
5db43ba
fix clang-cl warnings
chris-eibl Mar 7, 2025
75edcdd
remove Modules/_hacl/include/krml/fstar_uint128_gcc64.h
chris-eibl Mar 7, 2025
35052e8
make regen-sbom
chris-eibl Mar 7, 2025
427dfab
vendor from upstream main 322f6d58290e0ed7f4ecb84fcce12917aa0f594b
chris-eibl Mar 11, 2025
6968b93
blurb it
chris-eibl Mar 11, 2025
e5b9dcc
remove all "sed" lines that do nothing
chris-eibl Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
vendor from upstream main 322f6d58290e0ed7f4ecb84fcce12917aa0f594b 
remove FStar_UInt128.h
revert interim fixes in blake2module.c
regen sbom
  • Loading branch information
@chris-eibl
chris-eibl committed Mar 11, 2025
commit 427dfab85c0cbc04a2153f6eb5d763b01dd4760f
1 change: 0 additions & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,6 @@ LIBHACL_BLAKE2_OBJS= \
$(LIBHACL_SIMD256_OBJS)

LIBHACL_HEADERS= \
Modules/_hacl/include/krml/FStar_UInt128.h \
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h \
Modules/_hacl/include/krml/fstar_uint128_struct_endianness.h \
Expand Down
51 changes: 16 additions & 35 deletions Misc/sbom.spdx.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ Hacl_Hash_Blake2b_Simd256_store_state256b_to_state32(
os[i] = x;);
}

Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_with_key(void)
Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_internal_state_with_key(void)
{
Lib_IntVector_Intrinsics_vec256
*buf =
Expand Down Expand Up @@ -565,7 +565,7 @@ Hacl_Hash_Blake2b_Simd256_update_last_no_inline(
}

void
Hacl_Hash_Blake2b_Simd256_copy(
Hacl_Hash_Blake2b_Simd256_copy_internal_state(
Lib_IntVector_Intrinsics_vec256 *src,
Lib_IntVector_Intrinsics_vec256 *dst
)
Expand Down Expand Up @@ -831,7 +831,7 @@ The caller must satisfy the following requirements.

*/
Hacl_Hash_Blake2b_Simd256_state_t
*Hacl_Hash_Blake2b_Simd256_malloc_with_key0(uint8_t *k, uint8_t kk)
*Hacl_Hash_Blake2b_Simd256_malloc_with_key(uint8_t *k, uint8_t kk)
{
uint8_t nn = 64U;
Hacl_Hash_Blake2b_index i = { .key_length = kk, .digest_length = nn, .last_node = false };
Expand All @@ -857,7 +857,7 @@ use Blake2 as a hash function. Further resettings of the state SHALL be done wit
*/
Hacl_Hash_Blake2b_Simd256_state_t *Hacl_Hash_Blake2b_Simd256_malloc(void)
{
return Hacl_Hash_Blake2b_Simd256_malloc_with_key0(NULL, 0U);
return Hacl_Hash_Blake2b_Simd256_malloc_with_key(NULL, 0U);
}

static Hacl_Hash_Blake2b_index index_of_state(Hacl_Hash_Blake2b_Simd256_state_t *s)
Expand Down Expand Up @@ -1367,7 +1367,7 @@ void Hacl_Hash_Blake2b_Simd256_free(Hacl_Hash_Blake2b_Simd256_state_t *state)
Copying. This preserves all parameters.
*/
Hacl_Hash_Blake2b_Simd256_state_t
*Hacl_Hash_Blake2b_Simd256_copy0(Hacl_Hash_Blake2b_Simd256_state_t *state)
*Hacl_Hash_Blake2b_Simd256_copy(Hacl_Hash_Blake2b_Simd256_state_t *state)
{
Hacl_Hash_Blake2b_Simd256_state_t scrut = *state;
Hacl_Hash_Blake2b_Simd256_block_state_t block_state0 = scrut.block_state;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_hacl/Hacl_Hash_Blake2b_Simd256.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The caller must satisfy the following requirements.

*/
Hacl_Hash_Blake2b_Simd256_state_t
*Hacl_Hash_Blake2b_Simd256_malloc_with_key0(uint8_t *k, uint8_t kk);
*Hacl_Hash_Blake2b_Simd256_malloc_with_key(uint8_t *k, uint8_t kk);

/**
Specialized allocation function that picks default values for all
Expand Down Expand Up @@ -165,7 +165,7 @@ void Hacl_Hash_Blake2b_Simd256_free(Hacl_Hash_Blake2b_Simd256_state_t *state);
Copying. This preserves all parameters.
*/
Hacl_Hash_Blake2b_Simd256_state_t
*Hacl_Hash_Blake2b_Simd256_copy0(Hacl_Hash_Blake2b_Simd256_state_t *state);
*Hacl_Hash_Blake2b_Simd256_copy(Hacl_Hash_Blake2b_Simd256_state_t *state);

/**
Write the BLAKE2b digest of message `input` using key `key` into `output`.
Expand Down
10 changes: 5 additions & 5 deletions Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ Hacl_Hash_Blake2s_Simd128_load_state128s_from_state32(
r3[0U] = Lib_IntVector_Intrinsics_vec128_load32s(b3[0U], b3[1U], b3[2U], b3[3U]);
}

Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_with_key(void)
Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_internal_state_with_key(void)
{
Lib_IntVector_Intrinsics_vec128
*buf =
Expand Down Expand Up @@ -557,7 +557,7 @@ Hacl_Hash_Blake2s_Simd128_update_last_no_inline(
}

void
Hacl_Hash_Blake2s_Simd128_copy(
Hacl_Hash_Blake2s_Simd128_copy_internal_state(
Lib_IntVector_Intrinsics_vec128 *src,
Lib_IntVector_Intrinsics_vec128 * 8000 dst
)
Expand Down Expand Up @@ -820,7 +820,7 @@ The caller must satisfy the following requirements.

*/
Hacl_Hash_Blake2s_Simd128_state_t
*Hacl_Hash_Blake2s_Simd128_malloc_with_key0(uint8_t *k, uint8_t kk)
*Hacl_Hash_Blake2s_Simd128_malloc_with_key(uint8_t *k, uint8_t kk)
{
uint8_t nn = 32U;
Hacl_Hash_Blake2b_index i = { .key_length = kk, .digest_length = nn, .last_node = false };
Expand All @@ -846,7 +846,7 @@ use Blake2 as a hash function. Further resettings of the state SHALL be done wit
*/
Hacl_Hash_Blake2s_Simd128_state_t *Hacl_Hash_Blake2s_Simd128_malloc(void)
{
return Hacl_Hash_Blake2s_Simd128_malloc_with_key0(NULL, 0U);
return Hacl_Hash_Blake2s_Simd128_malloc_with_key(NULL, 0U);
}

static Hacl_Hash_Blake2b_index index_of_state(Hacl_Hash_Blake2s_Simd128_state_t *s)
Expand Down Expand Up @@ -1322,7 +1322,7 @@ void Hacl_Hash_Blake2s_Simd128_free(Hacl_Hash_Blake2s_Simd128_state_t *state)
Copying. This preserves all parameters.
*/
Hacl_Hash_Blake2s_Simd128_state_t
*Hacl_Hash_Blake2s_Simd128_copy0(Hacl_Hash_Blake2s_Simd128_state_t *state)
*Hacl_Hash_Blake2s_Simd128_copy(Hacl_Hash_Blake2s_Simd128_state_t *state)
{
Hacl_Hash_Blake2s_Simd128_state_t scrut = *state;
Hacl_Hash_Blake2s_Simd128_block_state_t block_state0 = scrut.block_state;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_hacl/Hacl_Hash_Blake2s_Simd128.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The caller must satisfy the following requirements.

*/
Hacl_Hash_Blake2s_Simd128_state_t
*Hacl_Hash_Blake2s_Simd128_malloc_with_key0(uint8_t *k, uint8_t kk);
*Hacl_Hash_Blake2s_Simd128_malloc_with_key(uint8_t *k, uint8_t kk);

/**
Specialized allocation function that picks default values for all
Expand Down Expand Up @@ -165,7 +165,7 @@ void Hacl_Hash_Blake2s_Simd128_free(Hacl_Hash_Blake2s_Simd128_state_t *state);
Copying. This preserves all parameters.
*/
Hacl_Hash_Blake2s_Simd128_state_t
*Hacl_Hash_Blake2s_Simd128_copy0(Hacl_Hash_Blake2s_Simd128_state_t *state);
*Hacl_Hash_Blake2s_Simd128_copy(Hacl_Hash_Blake2s_Simd128_state_t *state);

/**
Write the BLAKE2s digest of message `input` using key `key` into `output`.
Expand Down
78 changes: 0 additions & 78 deletions Modules/_hacl/include/krml/FStar_UInt128.h
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feels like this file should go

This file was deleted.

5 changes: 3 additions & 2 deletions Modules/_hacl/internal/Hacl_Hash_Blake2b_Simd256.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ Hacl_Hash_Blake2b_Simd256_store_state256b_to_state32(
Lib_IntVector_Intrinsics_vec256 *st
);

Lib_IntVector_Intrinsics_vec256 *Hacl_Hash_Blake2b_Simd256_malloc_with_key(void);
Lib_IntVector_Intrinsics_vec256
*Hacl_Hash_Blake2b_Simd256_malloc_internal_state_with_key(void);

void
Hacl_Hash_Blake2b_Simd256_update_multi_no_inline(
Expand All @@ -100,7 +101,7 @@ Hacl_Hash_Blake2b_Simd256_update_last_no_inline(
);

void
Hacl_Hash_Blake2b_Simd256_copy(
Hacl_Hash_Blake2b_Simd256_copy_internal_state(
Lib_IntVector_Intrinsics_vec256 *src,
Lib_IntVector_Intrinsics_vec256 *dst
);
Expand Down
5 changes: 3 additions & 2 deletions Modules/_hacl/internal/Hacl_Hash_Blake2s_Simd128.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ Hacl_Hash_Blake2s_Simd128_load_state128s_from_state32(
uint32_t *st32
);

Lib_IntVector_Intrinsics_vec128 *Hacl_Hash_Blake2s_Simd128_malloc_with_key(void);
Lib_IntVector_Intrinsics_vec128
*Hacl_Hash_Blake2s_Simd128_malloc_internal_state_with_key(void);

void
Hacl_Hash_Blake2s_Simd128_update_multi_no_inline(
Expand All @@ -100,7 +101,7 @@ Hacl_Hash_Blake2s_Simd128_update_last_no_inline(
);

void
Hacl_Hash_Blake2s_Simd128_copy(
Hacl_Hash_Blake2s_Simd128_copy_internal_state(
Lib_IntVector_Intrinsics_vec128 *src,
Lib_IntVector_Intrinsics_vec128 *dst
);
Expand Down
Loading
Loading
0