RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-17 23:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by

Browse Source 
jsg@ feedback/ok deraadt@

OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0
This commit is contained in:
djm@openbsd.org 2024-10-27 02:06:01 +00:00 committed by Damien Miller
parent ae566d51b6
commit cf3e48ee8b
No known key found for this signature in database
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcrux_mlkem768_sha3.h
View File

@ -1,4 +1,5 @@
/* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.1 2024/09/02 12:13:56 djm Exp $ */ /* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.2 2024/10/27 02:06:01 djm Exp $ */
/* Extracted from libcrux revision 84c5d87b3092c59294345aa269ceefe0eb97cc35 */ /* Extracted from libcrux revision 84c5d87b3092c59294345aa269ceefe0eb97cc35 */
/* /*
@ -160,18 +161,19 @@ static inline void Eurydice_slice_to_array3(uint8_t *dst_tag, char *dst_ok,
// CORE STUFF (conversions, endianness, ...) // CORE STUFF (conversions, endianness, ...)
static inline void core_num__u64_9__to_le_bytes(uint64_t v, uint8_t buf[8]) { static inline void core_num__u64_9__to_le_bytes(uint64_t v, uint8_t buf[8]) {
v = htole64(v);
memcpy(buf, &v, sizeof(v)); memcpy(buf, &v, sizeof(v));
} }
static inline uint64_t core_num__u64_9__from_le_bytes(uint8_t buf[8]) { static inline uint64_t core_num__u64_9__from_le_bytes(uint8_t buf[8]) {
uint64_t v; uint64_t v;
memcpy(&v, buf, sizeof(v)); memcpy(&v, buf, sizeof(v));
return v; return le64toh(v);
} }
static inline uint32_t core_num__u32_8__from_le_bytes(uint8_t buf[4]) { static inline uint32_t core_num__u32_8__from_le_bytes(uint8_t buf[4]) {
uint32_t v; uint32_t v;
memcpy(&v, buf, sizeof(v)); memcpy(&v, buf, sizeof(v));
return v; return le32toh(v);
} }
static inline uint32_t core_num__u8_6__count_ones(uint8_t x0) { static inline uint32_t core_num__u8_6__count_ones(uint8_t x0) {

17
mlkem768.sh
View File

@ -1,9 +1,10 @@
#!/bin/sh #!/bin/sh
# $OpenBSD: mlkem768.sh,v 1.2 2024/09/04 05:11:33 djm Exp $ # $OpenBSD: mlkem768.sh,v 1.3 2024/10/27 02:06:01 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
# #
WANT_LIBCRUX_REVISION="origin/main" #WANT_LIBCRUX_REVISION="origin/main"
WANT_LIBCRUX_REVISION="84c5d87b3092c59294345aa269ceefe0eb97cc35"
FILES=" FILES="
libcrux/libcrux-ml-kem/cg/eurydice_glue.h libcrux/libcrux-ml-kem/cg/eurydice_glue.h
@ -47,6 +48,7 @@ echo '#define KRML_NOINLINE __attribute__((noinline, unused))'
echo '#define KRML_HOST_EPRINTF(...)' echo '#define KRML_HOST_EPRINTF(...)'
echo '#define KRML_HOST_EXIT(x) fatal_f("internal error")' echo '#define KRML_HOST_EXIT(x) fatal_f("internal error")'
echo echo
for i in $FILES; do for i in $FILES; do
echo "/* from $i */" echo "/* from $i */"
# Changes to all files: # Changes to all files:
@ -56,11 +58,16 @@ for i in $FILES; do
-e 's/[ ]*$//' \ -e 's/[ ]*$//' \
$i | \ $i | \
case "$i" in case "$i" in
# XXX per-file handling goes here. */libcrux-ml-kem/cg/eurydice_glue.h)
# Replace endian functions with versions that work.
perl -0777 -pe 's/(static inline void core_num__u64_9__to_le_bytes.*\n)([^}]*\n)/\1 v = htole64(v);\n\2/' |
perl -0777 -pe 's/(static inline uint64_t core_num__u64_9__from_le_bytes.*?)return v;/\1return le64toh(v);/s' |
perl -0777 -pe 's/(static inline uint32_t core_num__u32_8__from_le_bytes.*?)return v;/\1return le32toh(v);/s'
;;
# Default: pass through. # Default: pass through.
*) *)
cat cat
;; ;;
esac esac
echo echo
done done