summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2020-04-13 12:59:12 +0300
committerDmitry Baryshkov <dbaryshkov@gmail.com>2020-04-13 17:18:06 +0300
commit1c32c46f14347d479e13c5799451037753fdb679 (patch)
tree62c862953d92b9465038e937d27cc15e8f4f605b
parent79282eda2bfa9493831694a998e43e0739f6d4d4 (diff)
downloadgnutls-1c32c46f14347d479e13c5799451037753fdb679.tar.gz
curve448: import write-le64.c which defines internal symbol
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
-rwxr-xr-xdevel/import-curve448-from-nettle.sh2
-rw-r--r--lib/nettle/Makefile.am1
2 files changed, 3 insertions, 0 deletions
diff --git a/devel/import-curve448-from-nettle.sh b/devel/import-curve448-from-nettle.sh
index da1f0ee86b..214e8d0c15 100755
--- a/devel/import-curve448-from-nettle.sh
+++ b/devel/import-curve448-from-nettle.sh
@@ -53,6 +53,7 @@ sha3-256.c
sha3-internal.h
sha3-permute.c
shake256.c
+write-le64.c
"
PUBLIC="
@@ -108,6 +109,7 @@ for f in $IMPORTS; do
sed -e 's/^#define \(.*\) nettle_\1/#define \1 gnutls_nettle_curve448_\1/' \
-e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_curve448_\1/' \
-e 's/^#define _\(.*\) _nettle_\1/#define _\1 _gnutls_nettle_curve448_\1/' \
+ -e 's/^_nettle_\(.*\)(.*/#define _nettle_\1 _gnutls_nettle_curve448_\1\n\0/' \
-e 's/^extern const struct ecc_curve _nettle_\(.*\);/#define _nettle_\1 _gnutls_nettle_curve448_\1\n\0/' \
-e 's/^extern const struct ecc_eddsa _nettle_\(.*\);/#define _nettle_\1 _gnutls_nettle_curve448_\1\n\0/' \
$dst > $dst-t && \
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 84bb90a247..f13cba4a8e 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -122,6 +122,7 @@ curve448/ecc-curve448-64.h: curve448/eccdata.stamp
$(AM_V_GEN)curve448/eccdata$(EXEEXT) curve448 38 6 64 > $@T && mv $@T $@
libcrypto_la_SOURCES += \
+ curve448/write-le64.c \
curve448/nettle-write.h curve448/gmp-glue.h curve448/gmp-glue.c
libcrypto_la_SOURCES += \