[openssh-commits] [openssh] 01/05: upstream: Prevent redefinition of `crypto_int32' error with gcc3.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4d96a3ebab2224f17e639a15078e03be1ad3736d
Author: tobhe at openbsd.org <tobhe at openbsd.org>
Date:   Sun Jan 3 18:05:21 2021 +0000

    upstream: Prevent redefinition of `crypto_int32' error with gcc3.
    
    Fixes compilation on luna88k.
    
    Feedback millert@
    Found by and ok aoyama@
    
    OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6
---
 sntrup761.c  | 3 +--
 sntrup761.sh | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sntrup761.c b/sntrup761.c
index 5b2456ad..c7ef95c7 100644
--- a/sntrup761.c
+++ b/sntrup761.c
@@ -1,4 +1,4 @@
-/*  $OpenBSD: sntrup761.c,v 1.2 2020/12/30 14:13:28 tobhe Exp $ */
+/*  $OpenBSD: sntrup761.c,v 1.3 2021/01/03 18:05:21 tobhe Exp $ */
 
 /*
  * Public Domain, Authors:
@@ -160,7 +160,6 @@ typedef int16_t int16;
 #define int32_divmod_uint14 CRYPTO_NAMESPACE(int32_divmod_uint14)
 
 
-typedef int32_t int32;
 
 /*
 assuming 1 <= m < 16384:
diff --git a/sntrup761.sh b/sntrup761.sh
index 5ddea77a..3ab303ab 100644
--- a/sntrup761.sh
+++ b/sntrup761.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: sntrup761.sh,v 1.2 2020/12/30 14:13:28 tobhe Exp $
+#       $OpenBSD: sntrup761.sh,v 1.3 2021/01/03 18:05:21 tobhe Exp $
 #       Placed in the Public Domain.
 #
 AUTHOR="supercop-20201130/crypto_kem/sntrup761/ref/implementors"
@@ -60,6 +60,7 @@ for i in $FILES; do
 	   -v '#include' $i | \
 	   sed -e "s/crypto_kem_/crypto_kem_sntrup761_/g" \
 		-e "s/^extern void /static void /" \
-		-e "s/^void /static void /"
+		-e "s/^void /static void /" \
+		-e "/^typedef int32_t int32;$/d"
 	echo
 done

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.