fix: missing pieces of previous commit

This commit is contained in:
Damien Miller 2020-12-31 12:47:22 +11:00
parent 3d999be7b9
commit 148b8a661c
2 changed files with 4 additions and 15 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: sntrup761.c,v 1.1 2020/12/29 00:59:15 djm Exp $ */
/* $OpenBSD: sntrup761.c,v 1.2 2020/12/30 14:13:28 tobhe Exp $ */
/*
* Public Domain, Authors:
@ -12,21 +12,10 @@
#include <string.h>
#include "crypto_api.h"
#include "int32_minmax.inc"
#define CRYPTO_NAMESPACE(s) s
/* from supercop-20201130/crypto_sort/int32/portable4/int32_minmax.inc */
#define int32_MINMAX(a,b) \
do { \
int32 ab = b ^ a; \
int32 c = b - a; \
c ^= ab & (c ^ b); \
c >>= 31; \
c &= ab; \
a ^= c; \
b ^= c; \
} while(0)
/* from supercop-20201130/crypto_sort/int32/portable4/sort.c */
#define int32 crypto_int32

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: sntrup761.sh,v 1.1 2020/12/29 00:59:15 djm Exp $
# $OpenBSD: sntrup761.sh,v 1.2 2020/12/30 14:13:28 tobhe Exp $
# Placed in the Public Domain.
#
AUTHOR="supercop-20201130/crypto_kem/sntrup761/ref/implementors"
@ -21,7 +21,6 @@ FILES="
supercop-20201130/crypto_kem/sntrup761/ref/kem.c
"
SORT_I32="
supercop-20201130/crypto_sort/int32/portable4/int32_minmax.inc
supercop-20201130/crypto_sort/int32/portable4/sort.c
"
SORT_U32="supercop-20201130/crypto_sort/uint32/useint32/sort.c"
@ -39,6 +38,7 @@ echo ' */'
echo
echo '#include <string.h>'
echo '#include "crypto_api.h"'
echo '#include "int32_minmax.inc"'
echo
echo '#define CRYPTO_NAMESPACE(s) s'
echo