diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-14 13:47:43 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-14 18:24:09 +0300 |
| commit | 17c6d031ddf6b74bd70706d39939448c79f01427 (patch) | |
| tree | a79fa22c17419fd1998411617112a9dcc2402e74 | |
| parent | 4714f5834dd91bac4342b20277423b68242286d3 (diff) | |
| download | gnutls-17c6d031ddf6b74bd70706d39939448c79f01427.tar.gz | |
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>
| -rwxr-xr-x | devel/import-chacha-from-nettle.sh | 4 | ||||
| -rw-r--r-- | lib/nettle/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/devel/import-chacha-from-nettle.sh b/devel/import-chacha-from-nettle.sh index bd570b8b25..29ba8b9fa0 100755 --- 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 b54568846b..c3cb7b7d9b 100644 --- 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 |