From 148b8a661c3f93e4b6d049ee902de3d521261fbc Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 31 Dec 2020 12:47:22 +1100
Subject: fix: missing pieces of previous commit

---
 sntrup761.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'sntrup761.c')

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
 
-- 
cgit v1.2.3