MSVSphere Packaging Team
2 months ago
parent
5c7fe459e0
commit
a8bcabfed1
GPG Key ID:
B2B0B9F29E528FE8
@ -0,0 +1,75 @@
|
|||||||
|
diff -up openssh-9.9p1/log.c.xxx openssh-9.9p1/log.c
|
||||||
|
--- openssh-9.9p1/log.c.xxx 2024-10-22 11:55:44.281939275 +0200
|
||||||
|
+++ openssh-9.9p1/log.c 2024-10-22 11:56:16.709676267 +0200
|
||||||
|
@@ -52,6 +52,9 @@
|
||||||
|
|
||||||
|
#include "log.h"
|
||||||
|
#include "match.h"
|
||||||
|
+#ifdef WITH_OPENSSL
|
||||||
|
+#include <openssl/err.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static LogLevel log_level = SYSLOG_LEVEL_INFO;
|
||||||
|
static int log_on_stderr = 1;
|
||||||
|
@@ -438,6 +438,26 @@ sshlog(const char *file, const char *fun
|
||||||
|
va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef WITH_OPENSSL
|
||||||
|
+static int
|
||||||
|
+openssl_error_print_cb(const char *str, size_t len, void *u)
|
||||||
|
+{
|
||||||
|
+ sshlogdirect(SYSLOG_LEVEL_DEBUG1, 0, "openssl error %s", str);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+sshlog_openssl(int r)
|
||||||
|
+{
|
||||||
|
+#ifdef WITH_OPENSSL
|
||||||
|
+ if (r != SSH_ERR_LIBCRYPTO_ERROR) return;
|
||||||
|
+
|
||||||
|
+ ERR_print_errors_cb(openssl_error_print_cb, NULL);
|
||||||
|
+#endif
|
||||||
|
+ return;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
sshlogdie(const char *file, const char *func, int line, int showfunc,
|
||||||
|
LogLevel level, const char *suffix, const char *fmt, ...)
|
||||||
|
diff -up openssh-8.7p1/log.h.xxx openssh-8.7p1/log.h
|
||||||
|
--- openssh-8.7p1/log.h.xxx 2024-10-18 12:56:18.944971946 +0200
|
||||||
|
+++ openssh-8.7p1/log.h 2024-10-18 13:03:38.324351416 +0200
|
||||||
|
@@ -71,6 +71,7 @@ void cleanup_exit(int) __attribute__((n
|
||||||
|
void sshlog(const char *, const char *, int, int,
|
||||||
|
LogLevel, const char *, const char *, ...)
|
||||||
|
__attribute__((format(printf, 7, 8)));
|
||||||
|
+void sshlog_openssl(int);
|
||||||
|
void sshlogv(const char *, const char *, int, int,
|
||||||
|
LogLevel, const char *, const char *, va_list);
|
||||||
|
void sshlogdie(const char *, const char *, int, int,
|
||||||
|
diff -up openssh-8.7p1/auth2-pubkey.c.yyy openssh-8.7p1/auth2-pubkey.c
|
||||||
|
--- openssh-8.7p1/auth2-pubkey.c.yyy 2024-10-18 13:27:00.709055845 +0200
|
||||||
|
+++ openssh-8.7p1/auth2-pubkey.c 2024-10-18 13:27:31.638784460 +0200
|
||||||
|
@@ -131,6 +131,7 @@ userauth_pubkey(struct ssh *ssh)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if ((r = sshkey_from_blob(pkblob, blen, &key)) != 0) {
|
||||||
|
+ sshlog_openssl(r);
|
||||||
|
error_fr(r, "parse key");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
diff -up openssh-8.7p1/dispatch.c.yyy openssh-8.7p1/dispatch.c
|
||||||
|
--- openssh-8.7p1/dispatch.c.yyy 2024-10-18 13:27:56.349366570 +0200
|
||||||
|
+++ openssh-8.7p1/dispatch.c 2024-10-18 13:28:17.921874757 +0200
|
||||||
|
@@ -130,6 +130,8 @@ ssh_dispatch_run_fatal(struct ssh *ssh,
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
|
||||||
|
- if ((r = ssh_dispatch_run(ssh, mode, done)) != 0)
|
||||||
|
+ if ((r = ssh_dispatch_run(ssh, mode, done)) != 0) {
|
||||||
|
+ sshlog_openssl(r);
|
||||||
|
sshpkt_fatal(ssh, r, "%s", __func__);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@ -0,0 +1,98 @@
|
|||||||
|
diff --git a/kexmlkem768x25519.c b/kexmlkem768x25519.c
|
||||||
|
index 679446e9..2b5d3960 100644
|
||||||
|
--- a/kexmlkem768x25519.c
|
||||||
|
+++ b/kexmlkem768x25519.c
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/* $OpenBSD: kexmlkem768x25519.c,v 1.1 2024/09/02 12:13:56 djm Exp $ */
|
||||||
|
+/* $OpenBSD: kexmlkem768x25519.c,v 1.2 2024/10/27 02:06:59 djm Exp $ */
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Markus Friedl. All rights reserved.
|
||||||
|
*
|
||||||
|
@@ -34,6 +34,9 @@
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <signal.h>
|
||||||
|
+#ifdef HAVE_ENDIAN_H
|
||||||
|
+# include <endian.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "sshkey.h"
|
||||||
|
#include "kex.h"
|
||||||
|
diff --git a/libcrux_mlkem768_sha3.h b/libcrux_mlkem768_sha3.h
|
||||||
|
index a82d60e8..b8ac1436 100644
|
||||||
|
--- a/libcrux_mlkem768_sha3.h
|
||||||
|
+++ b/libcrux_mlkem768_sha3.h
|
||||||
|
@@ -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 */
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -160,18 +161,19 @@ static inline void Eurydice_slice_to_array3(uint8_t *dst_tag, char *dst_ok,
|
||||||
|
// CORE STUFF (conversions, endianness, ...)
|
||||||
|
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
static inline uint64_t core_num__u64_9__from_le_bytes(uint8_t buf[8]) {
|
||||||
|
uint64_t 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]) {
|
||||||
|
uint32_t v;
|
||||||
|
memcpy(&v, buf, sizeof(v));
|
||||||
|
- return v;
|
||||||
|
+ return le32toh(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline uint32_t core_num__u8_6__count_ones(uint8_t x0) {
|
||||||
|
diff --git a/mlkem768.sh b/mlkem768.sh
|
||||||
|
index 2fdc2831..3d12b2ed 100644
|
||||||
|
--- a/mlkem768.sh
|
||||||
|
+++ b/mlkem768.sh
|
||||||
|
@@ -1,9 +1,10 @@
|
||||||
|
#!/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.
|
||||||
|
#
|
||||||
|
|
||||||
|
-WANT_LIBCRUX_REVISION="origin/main"
|
||||||
|
+#WANT_LIBCRUX_REVISION="origin/main"
|
||||||
|
+WANT_LIBCRUX_REVISION="84c5d87b3092c59294345aa269ceefe0eb97cc35"
|
||||||
|
|
||||||
|
FILES="
|
||||||
|
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_EXIT(x) fatal_f("internal error")'
|
||||||
|
echo
|
||||||
|
+
|
||||||
|
for i in $FILES; do
|
||||||
|
echo "/* from $i */"
|
||||||
|
# Changes to all files:
|
||||||
|
@@ -56,11 +58,16 @@ for i in $FILES; do
|
||||||
|
-e 's/[ ]*$//' \
|
||||||
|
$i | \
|
||||||
|
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.
|
||||||
|
*)
|
||||||
|
- cat
|
||||||
|
- ;;
|
||||||
|
+ cat
|
||||||
|
+ ;;
|
||||||
|
esac
|
||||||
|
echo
|
||||||
|
done
|
||||||
Loading…
Reference in new issue