import-curve448: fix several additional symbol clashes

Fix sed script used to rename symbols to remove few additional symbols
sitting in _nettle_FOO namespace.

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

diff --git a/devel/import-curve448-from-nettle.sh b/devel/import-curve448-from-nettle.sh
index 7cd974302a5731d04661193f63925856d79f7d15..da1f0ee86b7e44b2219d48ac062e1fbcbb730f8f 100755 (executable)
--- a/devel/import-curve448-from-nettle.sh
+++ b/devel/import-curve448-from-nettle.sh
@@ -106,7 +106,11 @@ for f in $IMPORTS; do
       *.h)
        # Add prefix to function symbols avoid clashing with the public ones.
        sed -e 's/^#define \(.*\) nettle_\1/#define \1 gnutls_nettle_curve448_\1/' \
-           -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_curve448_\1/' $dst > $dst-t && \
+           -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_curve448_\1/' \
+           -e 's/^#define _\(.*\) _nettle_\1/#define _\1 _gnutls_nettle_curve448_\1/' \
+           -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 && \
          mv $dst-t $dst
       ;;
     esac