+2017-10-23 Niels Möller <nisse@lysator.liu.se>
+
+ Undo added underscores on public symbols.
+
2017-04-09 Niels Möller <nisse@lysator.liu.se>
* ecc-curve.h (nettle_get_secp_192r1, nettle_get_secp_224r1)
#define ecc_192_modp ecc_mod
#endif
-const struct ecc_curve _nettle_secp_192r1 =
+const struct ecc_curve nettle_secp_192r1 =
{
{
192,
const struct ecc_curve *nettle_get_secp_192r1(void)
{
- return &_nettle_secp_192r1;
+ return &nettle_secp_192r1;
}
# error Configuration error
#endif
-const struct ecc_curve _nettle_secp_224r1 =
+const struct ecc_curve nettle_secp_224r1 =
{
{
224,
const struct ecc_curve *nettle_get_secp_224r1(void)
{
- return &_nettle_secp_224r1;
+ return &nettle_secp_224r1;
}
#error Unsupported parameters
#endif
-const struct ecc_curve _nettle_secp_256r1 =
+const struct ecc_curve nettle_secp_256r1 =
{
{
256,
const struct ecc_curve *nettle_get_secp_256r1(void)
{
- return &_nettle_secp_256r1;
+ return &nettle_secp_256r1;
}
#define ecc_384_modp ecc_mod
#endif
-const struct ecc_curve _nettle_secp_384r1 =
+const struct ecc_curve nettle_secp_384r1 =
{
{
384,
const struct ecc_curve *nettle_get_secp_384r1(void)
{
- return &_nettle_secp_384r1;
+ return &nettle_secp_384r1;
}
}
#endif
-const struct ecc_curve _nettle_secp_521r1 =
+const struct ecc_curve nettle_secp_521r1 =
{
{
521,
const struct ecc_curve *nettle_get_secp_521r1(void)
{
- return &_nettle_secp_521r1;
+ return &nettle_secp_521r1;
}
#define sec_modinv _nettle_sec_modinv
#define curve25519_eh_to_x _nettle_curve25519_eh_to_x
-extern const struct ecc_curve _nettle_secp_192r1;
-extern const struct ecc_curve _nettle_secp_224r1;
-extern const struct ecc_curve _nettle_secp_256r1;
-extern const struct ecc_curve _nettle_secp_384r1;
-extern const struct ecc_curve _nettle_secp_521r1;
+/* FIXME: Rename with leading underscore, but keep current name (and
+ size!) for now, for ABI compatibility with nettle-3.1, soname
+ libhogweed.so.4. */
+#undef nettle_secp_192r1
+#undef nettle_secp_224r1
+#undef nettle_secp_256r1
+#undef nettle_secp_384r1
+#undef nettle_secp_521r1
+
+extern const struct ecc_curve nettle_secp_192r1;
+extern const struct ecc_curve nettle_secp_224r1;
+extern const struct ecc_curve nettle_secp_256r1;
+extern const struct ecc_curve nettle_secp_384r1;
+extern const struct ecc_curve nettle_secp_521r1;
/* Keep this structure internal for now. It's misnamed (since it's
really implementing the equivalent twisted Edwards curve, with
}
const struct ecc_curve * const curves[] = {
- &_nettle_secp_192r1,
- &_nettle_secp_224r1,
+ &nettle_secp_192r1,
+ &nettle_secp_224r1,
&_nettle_curve25519,
- &_nettle_secp_256r1,
- &_nettle_secp_384r1,
- &_nettle_secp_521r1,
+ &nettle_secp_256r1,
+ &nettle_secp_384r1,
+ &nettle_secp_521r1,
};
#define numberof(x) (sizeof (x) / sizeof ((x)[0]))
#include "nettle-meta.h"
-/* Direct access to the array. */
#undef nettle_hashes
-#define nettle_hashes _nettle_hashes
const struct nettle_hash *
nettle_lookup_hash (const char *name)
#include "nettle-meta.h"
-const struct nettle_aead * const _nettle_aeads[] = {
+#undef nettle_aeads
+
+const struct nettle_aead * const nettle_aeads[] = {
&nettle_gcm_aes128,
&nettle_gcm_aes192,
&nettle_gcm_aes256,
const struct nettle_aead * const *
nettle_get_aeads (void)
{
- return _nettle_aeads;
+ return nettle_aeads;
}
#include <stddef.h>
#include "nettle-meta.h"
-const struct nettle_armor * const _nettle_armors[] = {
+#undef nettle_armors
+
+const struct nettle_armor * const nettle_armors[] = {
&nettle_base64,
&nettle_base64url,
&nettle_base16,
const struct nettle_armor * const *
nettle_get_armors (void)
{
- return _nettle_armors;
+ return nettle_armors;
}
#include <stddef.h>
#include "nettle-meta.h"
-const struct nettle_cipher * const _nettle_ciphers[] = {
+#undef nettle_ciphers
+
+const struct nettle_cipher * const nettle_ciphers[] = {
&nettle_aes128,
&nettle_aes192,
&nettle_aes256,
const struct nettle_cipher * const *
nettle_get_ciphers (void)
{
- return _nettle_ciphers;
+ return nettle_ciphers;
}
#include "nettle-meta.h"
-const struct nettle_hash * const _nettle_hashes[] = {
+#undef nettle_hashes
+
+const struct nettle_hash * const nettle_hashes[] = {
&nettle_md2,
&nettle_md4,
&nettle_md5,
const struct nettle_hash * const *
nettle_get_hashes (void)
{
- return _nettle_hashes;
+ return nettle_hashes;
}
nettle_cipher_func *decrypt;
};
+/* FIXME: Rename with leading underscore, but keep current name (and
+ size!) for now, for ABI compatibility with nettle-3.1, soname
+ libnettle.so.6. */
/* null-terminated list of ciphers implemented by this version of nettle */
-extern const struct nettle_cipher * const _nettle_ciphers[];
+extern const struct nettle_cipher * const nettle_ciphers[];
const struct nettle_cipher * const *
#ifdef __GNUC__
(nettle_hash_digest_func *) name##_digest \
}
+/* FIXME: Rename with leading underscore, but keep current name (and
+ size!) for now, for ABI compatibility with nettle-3.1, soname
+ libnettle.so.6. */
/* null-terminated list of digests implemented by this version of nettle */
-extern const struct nettle_hash * const _nettle_hashes[];
+extern const struct nettle_hash * const nettle_hashes[];
const struct nettle_hash * const *
#ifdef __GNUC__
nettle_hash_digest_func *digest;
};
+/* FIXME: Rename with leading underscore, but keep current name (and
+ size!) for now, for ABI compatibility with nettle-3.1, soname
+ libnettle.so.6. */
/* null-terminated list of aead constructions implemented by this
version of nettle */
-extern const struct nettle_aead * const _nettle_aeads[];
+extern const struct nettle_aead * const nettle_aeads[];
const struct nettle_aead * const *
#ifdef __GNUC__
(nettle_armor_decode_final_func *) name##_decode_final, \
}
+/* FIXME: Rename with leading underscore, but keep current name (and
+ size!) for now, for ABI compatibility with nettle-3.1, soname
+ libnettle.so.6. */
/* null-terminated list of armor schemes implemented by this version of nettle */
-extern const struct nettle_armor * const _nettle_armors[];
+extern const struct nettle_armor * const nettle_armors[];
const struct nettle_armor * const *
#ifdef __GNUC__
# data.
VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
-# The PATH update is for locating dlls on w*ndows.
+# The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX.
check: $(TS_ALL)
- LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
+ LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \
+ srcdir="$(srcdir)" \
EMULATOR="$(EMULATOR)" NM="$(NM)" EXEEXT="$(EXEEXT)" \
$(top_srcdir)/run-tests $(TS_ALL)
}
const struct ecc_curve * const ecc_curves[] = {
- &_nettle_secp_192r1,
- &_nettle_secp_224r1,
- &_nettle_secp_256r1,
- &_nettle_secp_384r1,
- &_nettle_secp_521r1,
+ &nettle_secp_192r1,
+ &nettle_secp_224r1,
+ &nettle_secp_256r1,
+ &nettle_secp_384r1,
+ &nettle_secp_521r1,
&_nettle_curve25519,
NULL
};