nettle: vendor in poly1305 code

Nettle's poly1305 code ended up with internal symbol _poly1305_block in
public header. This causes issues on Nettle version changes. Since those
symbols are going to become nettle-internal, vendor in relevant source
file.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>

diff --git a/devel/import-chacha-from-nettle.sh b/devel/import-chacha-from-nettle.sh
index bd570b8b2536375a2bf6497527cd249066db09b0..29ba8b9fa0838f59d959d7fce91b06751cddf6f1 100755 (executable)
--- a/devel/import-chacha-from-nettle.sh
+++ b/devel/import-chacha-from-nettle.sh
@@ -18,9 +18,12 @@ chacha-poly1305.h
 chacha-set-key.c
 chacha-set-nonce.c
 chacha.h
+poly1305-internal.c
+poly1305.h
 "
 
 PUBLIC="
+aes.h
 bignum.h
 ecc-curve.h
 ecc.h
@@ -28,7 +31,6 @@ macros.h
 memxor.h
 nettle-meta.h
 nettle-types.h
-poly1305.h
 "
 
 test -d $DST || mkdir $DST

diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index b54568846bc150fa0acf4a7ee820759484932e0a..c3cb7b7d9b74e1b208983b9431d1b5f0f56e625d 100644 (file)
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -174,5 +174,6 @@ libcrypto_la_SOURCES += \
        chacha/chacha-core-internal.c chacha/chacha-crypt.c \
        chacha/chacha-internal.h chacha/chacha-poly1305.c \
        chacha/chacha-poly1305.h chacha/chacha-set-key.c \
-       chacha/chacha-set-nonce.c chacha/chacha.h
+       chacha/chacha-set-nonce.c chacha/chacha.h \
+       chacha/poly1305.h chacha/poly1305-internal.c
 endif