Skip to content

Commit 9fbbfec

Browse files
committed
upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP
(20221122) and change the import approach to the same one we use for Streamlined NTRUPrime: use a shell script to extract the bits we need from SUPERCOP, make some minor adjustments and squish them all into a single file. ok tb@ tobhe@ OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b
1 parent 6283f4b commit 9fbbfec

File tree

13 files changed

+2091
-2158
lines changed

13 files changed

+2091
-2158
lines changed

.depend

Lines changed: 2 additions & 6 deletions
Large diffs are not rendered by default.

Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
106106
ssh-pkcs11.o smult_curve25519_ref.o \
107107
poly1305.o chacha.o cipher-chachapoly.o cipher-chachapoly-libcrypto.o \
108108
ssh-ed25519.o digest-openssl.o digest-libc.o \
109-
hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \
109+
hmac.o ed25519.o hash.o \
110110
kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
111111
kexgexc.o kexgexs.o \
112112
kexsntrup761x25519.o sntrup761.o kexgen.o \
@@ -677,7 +677,7 @@ regress/unittests/utf8/test_utf8$(EXEEXT): \
677677
SK_DUMMY_OBJS=\
678678
regress/misc/sk-dummy/sk-dummy.lo \
679679
regress/misc/sk-dummy/fatal.lo \
680-
ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo
680+
ed25519.lo hash.lo
681681

682682
SK_DUMMY_LIBRARY=@SK_DUMMY_LIBRARY@
683683

crypto_api.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: crypto_api.h,v 1.7 2021/01/08 02:33:13 dtucker Exp $ */
1+
/* $OpenBSD: crypto_api.h,v 1.8 2023/01/15 23:05:32 djm Exp $ */
22

33
/*
44
* Assembled from generated headers and source files by Markus Friedl.
@@ -32,8 +32,6 @@ typedef uint64_t crypto_uint64;
3232
int crypto_hash_sha512(unsigned char *, const unsigned char *,
3333
unsigned long long);
3434

35-
int crypto_verify_32(const unsigned char *, const unsigned char *);
36-
3735
#define crypto_sign_ed25519_SECRETKEYBYTES 64U
3836
#define crypto_sign_ed25519_PUBLICKEYBYTES 32U
3937
#define crypto_sign_ed25519_BYTES 64U

0 commit comments

Comments
 (0)