diff options
| author | tobhe@openbsd.org <tobhe@openbsd.org> | 2021-01-03 18:05:21 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-01-08 13:45:46 +1100 |
| commit | 4d96a3ebab2224f17e639a15078e03be1ad3736d (patch) | |
| tree | 7924eafde66c573d3d93835b044d2da0ca6fb4e6 | |
| parent | a23954eeb930ccc8a66a2710153730769dba31b6 (diff) | |
upstream: Prevent redefinition of `crypto_int32' error with gcc3.
Fixes compilation on luna88k.
Feedback millert@
Found by and ok aoyama@
OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6
| -rw-r--r-- | sntrup761.c | 3 | ||||
| -rw-r--r-- | sntrup761.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sntrup761.c b/sntrup761.c index 5b2456ad2..c7ef95c77 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 5ddea77a0..3ab303ab7 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 |