Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
54e1450a
Commit
54e1450a
authored
Oct 23, 2017
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Undo added underscores on public symbols.
parent
b84dff15
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
73 additions
and
41 deletions
+73
-41
ChangeLog
ChangeLog
+4
-0
ecc-192.c
ecc-192.c
+2
-2
ecc-224.c
ecc-224.c
+2
-2
ecc-256.c
ecc-256.c
+2
-2
ecc-384.c
ecc-384.c
+2
-2
ecc-521.c
ecc-521.c
+2
-2
ecc-internal.h
ecc-internal.h
+14
-5
examples/ecc-benchmark.c
examples/ecc-benchmark.c
+5
-5
nettle-lookup-hash.c
nettle-lookup-hash.c
+0
-2
nettle-meta-aeads.c
nettle-meta-aeads.c
+4
-2
nettle-meta-armors.c
nettle-meta-armors.c
+4
-2
nettle-meta-ciphers.c
nettle-meta-ciphers.c
+4
-2
nettle-meta-hashes.c
nettle-meta-hashes.c
+4
-2
nettle-meta.h
nettle-meta.h
+16
-4
testsuite/Makefile.in
testsuite/Makefile.in
+3
-2
testsuite/testutils.c
testsuite/testutils.c
+5
-5
No files found.
ChangeLog
View file @
54e1450a
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)
...
...
ecc-192.c
View file @
54e1450a
...
...
@@ -110,7 +110,7 @@ ecc_192_modp (const struct ecc_modulo *m UNUSED, mp_limb_t *rp)
#define ecc_192_modp ecc_mod
#endif
const
struct
ecc_curve
_
nettle_secp_192r1
=
const
struct
ecc_curve
nettle_secp_192r1
=
{
{
192
,
...
...
@@ -174,5 +174,5 @@ const struct ecc_curve _nettle_secp_192r1 =
const
struct
ecc_curve
*
nettle_get_secp_192r1
(
void
)
{
return
&
_
nettle_secp_192r1
;
return
&
nettle_secp_192r1
;
}
ecc-224.c
View file @
54e1450a
...
...
@@ -62,7 +62,7 @@ ecc_224_modp (const struct ecc_modulo *m, mp_limb_t *rp);
# error Configuration error
#endif
const
struct
ecc_curve
_
nettle_secp_224r1
=
const
struct
ecc_curve
nettle_secp_224r1
=
{
{
224
,
...
...
@@ -126,5 +126,5 @@ const struct ecc_curve _nettle_secp_224r1 =
const
struct
ecc_curve
*
nettle_get_secp_224r1
(
void
)
{
return
&
_
nettle_secp_224r1
;
return
&
nettle_secp_224r1
;
}
ecc-256.c
View file @
54e1450a
...
...
@@ -239,7 +239,7 @@ ecc_256_modq (const struct ecc_modulo *q, mp_limb_t *rp)
#error Unsupported parameters
#endif
const
struct
ecc_curve
_
nettle_secp_256r1
=
const
struct
ecc_curve
nettle_secp_256r1
=
{
{
256
,
...
...
@@ -303,5 +303,5 @@ const struct ecc_curve _nettle_secp_256r1 =
const
struct
ecc_curve
*
nettle_get_secp_256r1
(
void
)
{
return
&
_
nettle_secp_256r1
;
return
&
nettle_secp_256r1
;
}
ecc-384.c
View file @
54e1450a
...
...
@@ -147,7 +147,7 @@ ecc_384_modp (const struct ecc_modulo *p, mp_limb_t *rp)
#define ecc_384_modp ecc_mod
#endif
const
struct
ecc_curve
_
nettle_secp_384r1
=
const
struct
ecc_curve
nettle_secp_384r1
=
{
{
384
,
...
...
@@ -211,5 +211,5 @@ const struct ecc_curve _nettle_secp_384r1 =
const
struct
ecc_curve
*
nettle_get_secp_384r1
(
void
)
{
return
&
_
nettle_secp_384r1
;
return
&
nettle_secp_384r1
;
}
ecc-521.c
View file @
54e1450a
...
...
@@ -75,7 +75,7 @@ ecc_521_modp (const struct ecc_modulo *m UNUSED, mp_limb_t *rp)
}
#endif
const
struct
ecc_curve
_
nettle_secp_521r1
=
const
struct
ecc_curve
nettle_secp_521r1
=
{
{
521
,
...
...
@@ -139,5 +139,5 @@ const struct ecc_curve _nettle_secp_521r1 =
const
struct
ecc_curve
*
nettle_get_secp_521r1
(
void
)
{
return
&
_
nettle_secp_521r1
;
return
&
nettle_secp_521r1
;
}
ecc-internal.h
View file @
54e1450a
...
...
@@ -73,11 +73,20 @@
#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
...
...
examples/ecc-benchmark.c
View file @
54e1450a
...
...
@@ -330,12 +330,12 @@ bench_curve (const struct ecc_curve *ecc)
}
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]))
...
...
nettle-lookup-hash.c
View file @
54e1450a
...
...
@@ -38,9 +38,7 @@
#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
)
...
...
nettle-meta-aeads.c
View file @
54e1450a
...
...
@@ -37,7 +37,9 @@
#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
,
...
...
@@ -51,5 +53,5 @@ const struct nettle_aead * const _nettle_aeads[] = {
const
struct
nettle_aead
*
const
*
nettle_get_aeads
(
void
)
{
return
_
nettle_aeads
;
return
nettle_aeads
;
}
nettle-meta-armors.c
View file @
54e1450a
...
...
@@ -36,7 +36,9 @@
#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
,
...
...
@@ -46,5 +48,5 @@ const struct nettle_armor * const _nettle_armors[] = {
const
struct
nettle_armor
*
const
*
nettle_get_armors
(
void
)
{
return
_
nettle_armors
;
return
nettle_armors
;
}
nettle-meta-ciphers.c
View file @
54e1450a
...
...
@@ -36,7 +36,9 @@
#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
,
...
...
@@ -60,5 +62,5 @@ const struct nettle_cipher * const _nettle_ciphers[] = {
const
struct
nettle_cipher
*
const
*
nettle_get_ciphers
(
void
)
{
return
_
nettle_ciphers
;
return
nettle_ciphers
;
}
nettle-meta-hashes.c
View file @
54e1450a
...
...
@@ -37,7 +37,9 @@
#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
,
...
...
@@ -57,5 +59,5 @@ const struct nettle_hash * const _nettle_hashes[] = {
const
struct
nettle_hash
*
const
*
nettle_get_hashes
(
void
)
{
return
_
nettle_hashes
;
return
nettle_hashes
;
}
nettle-meta.h
View file @
54e1450a
...
...
@@ -60,8 +60,11 @@ struct nettle_cipher
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__
...
...
@@ -122,8 +125,11 @@ struct nettle_hash
(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__
...
...
@@ -174,9 +180,12 @@ struct nettle_aead
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__
...
...
@@ -243,8 +252,11 @@ struct nettle_armor
(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__
...
...
testsuite/Makefile.in
View file @
54e1450a
...
...
@@ -121,9 +121,10 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
# 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)
...
...
testsuite/testutils.c
View file @
54e1450a
...
...
@@ -1212,11 +1212,11 @@ test_dsa_key(const struct dsa_params *params,
}
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
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment