diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-11 10:05:13 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-11 10:15:26 +0200 |
commit | 17da95f6b40dc005f49ec3f1f17bb3b3bf811d43 (patch) | |
tree | bbbf4fc48c3a83c294f1e84d7ee58cfa25d5d11a | |
parent | f657355610d87ed42c4ad1e0dea65aebe7d80b4d (diff) | |
download | gnutls-17da95f6b40dc005f49ec3f1f17bb3b3bf811d43.tar.gz |
mac_to_entry -> _gnutls_mac_to_entry
-rw-r--r-- | lib/algorithms.h | 3 | ||||
-rw-r--r-- | lib/algorithms/mac.c | 2 | ||||
-rw-r--r-- | lib/libgnutls.map | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/algorithms.h b/lib/algorithms.h index 93062fc9b7..93ef670d45 100644 --- a/lib/algorithms.h +++ b/lib/algorithms.h @@ -75,7 +75,8 @@ int _gnutls_version_has_explicit_iv(const version_entry_st * ver) } /* Functions for MACs. */ -const mac_entry_st *mac_to_entry(gnutls_mac_algorithm_t c); +const mac_entry_st *_gnutls_mac_to_entry(gnutls_mac_algorithm_t c); +#define mac_to_entry(x) _gnutls_mac_to_entry(x) #define hash_to_entry(x) mac_to_entry((gnutls_mac_algorithm_t)(x)) inline static int _gnutls_mac_is_ok(const mac_entry_st * e) diff --git a/lib/algorithms/mac.c b/lib/algorithms/mac.c index 75ccd78052..c17355a8a8 100644 --- a/lib/algorithms/mac.c +++ b/lib/algorithms/mac.c @@ -54,7 +54,7 @@ static const mac_entry_st hash_algorithms[] = { #define GNUTLS_HASH_ALG_LOOP(a) \ GNUTLS_HASH_LOOP( if(p->id == algorithm) { a; break; } ) -const mac_entry_st *mac_to_entry(gnutls_mac_algorithm_t c) +const mac_entry_st *_gnutls_mac_to_entry(gnutls_mac_algorithm_t c) { GNUTLS_HASH_LOOP(if (c == p->id) return p); diff --git a/lib/libgnutls.map b/lib/libgnutls.map index be1897c4a4..b3d234bbae 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -1082,7 +1082,7 @@ GNUTLS_PRIVATE { _gnutls_mpi_release; # Internal symbols needed by tests/pkcs12_s2k: _gnutls_pkcs12_string_to_key; - mac_to_entry; + _gnutls_mac_to_entry; _gnutls_bin2hex; local: *; |