diff options
| author | Damien Miller <djm@mindrot.org> | 2020-12-31 02:47:22 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-31 02:47:22 +0100 |
| commit | 148b8a661c3f93e4b6d049ee902de3d521261fbc (patch) | |
| tree | dec059f1713f203bd2454f74a0ea72720d43246a /sntrup761.c | |
| parent | upstream: Use int64_t for intermediate values in int32_MINMAX to (diff) | |
| download | openssh-148b8a661c3f93e4b6d049ee902de3d521261fbc.tar.xz openssh-148b8a661c3f93e4b6d049ee902de3d521261fbc.zip | |
fix: missing pieces of previous commit
Diffstat (limited to 'sntrup761.c')
| -rw-r--r-- | sntrup761.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sntrup761.c b/sntrup761.c index 21b59bd4b..db5aaacab 100644 --- a/sntrup761.c +++ b/sntrup761.c @@ -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 |