diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-13 12:43:42 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-13 17:13:21 +0300 |
| commit | 79282eda2bfa9493831694a998e43e0739f6d4d4 (patch) | |
| tree | 27fc90debb44ab6aced10997ab635faa1b472429 | |
| parent | b143a756aee850b0a0d3bdfdfaa51ee27cb2f25f (diff) | |
| download | gnutls-79282eda2bfa9493831694a998e43e0739f6d4d4.tar.gz | |
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>
| -rwxr-xr-x | devel/import-curve448-from-nettle.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/devel/import-curve448-from-nettle.sh b/devel/import-curve448-from-nettle.sh index 7cd974302a..da1f0ee86b 100755 --- 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 |