upstream: switch sntrup implementation source from supercop to

libpqcrypto; the latter is almost identical but doesn't rely on signed
underflow to implement an optimised integer sort; from markus@

OpenBSD-Commit-ID: cd09bbf0e0fcef1bedca69fdf7990dc360567cf8

1 files changed, 23 insertions, 24 deletions

diff --git a/sntrup4591761.sh b/sntrup4591761.sh
index 5540ca4d9..2a0a4200b 100644
--- a/sntrup4591761.sh
+++ b/sntrup4591761.sh
@@ -1,28 +1,28 @@
 #!/bin/sh
 FILES="
-        supercop-20181216/crypto_sort/int32/portable3/int32_minmax.inc
-        supercop-20181216/crypto_sort/int32/portable3/sort.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/small.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/mod3.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/modq.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/params.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/r3.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/swap.h
-        supercop-20181216/crypto_kem/sntrup4591761/ref/dec.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/enc.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/keypair.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/r3_mult.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/r3_recip.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/randomsmall.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/randomweightw.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq_mult.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq_recip3.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq_round3.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/rq_rounded.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/small.c
-        supercop-20181216/crypto_kem/sntrup4591761/ref/swap.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/int32_sort.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/int32_sort.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/small.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/mod3.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/modq.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/params.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/r3.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/swap.h
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/dec.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/enc.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/keypair.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/r3_mult.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/r3_recip.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/randomsmall.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/randomweightw.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq_mult.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq_recip3.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq_round3.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/rq_rounded.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/small.c
+        libpqcrypto-20180314/crypto_kem/sntrup4591761/ref/swap.c
 "
 ###
 
@@ -40,7 +40,6 @@ for i in $FILES; do
            grep -v "extern crypto_int32 small_random32" |
            sed -e "s/crypto_kem_/crypto_kem_sntrup4591761_/g" \
                 -e "s/smaller_mask/smaller_mask_${b}/g" \
-                -e "s/void crypto_sort/void crypto_sort_int32/" \
                 -e "s/^extern void /static void /" \
                 -e "s/^void /static void /"
         echo