Delete name mangling of internal umac symbolsdelete-internal-name-mangling

1 files changed, 15 insertions, 26 deletions

diff --git a/umac-internal.h b/umac-internal.h
index 1d2cc091..b07a7043 100644
--- a/umac-internal.h
+++ b/umac-internal.h
@@ -36,24 +36,13 @@
 
 #include "nettle-types.h"
 
-#define _umac_set_key _nettle_umac_set_key
-#define _umac_nh _nettle_umac_nh
-#define _umac_nh_n _nettle_umac_nh_n
-#define _umac_poly64 _nettle_umac_poly64
-#define _umac_poly128 _nettle_umac_poly128
-#define _umac_l2_init _nettle_umac_l2_init
-#define _umac_l2 _nettle_umac_l2
-#define _umac_l2_final _nettle_umac_l2_final
-#define _umac_l3_init _nettle_umac_l3_init
-#define _umac_l3 _nettle_umac_l3
-
 void
-_umac_set_key (uint32_t *l1_key, uint32_t *l2_key,
-	       uint64_t *l3_key1, uint32_t *l3_key2,
-	       struct aes128_ctx *pad, const uint8_t *key, unsigned n);
+_nettle_umac_set_key (uint32_t *l1_key, uint32_t *l2_key,
+		      uint64_t *l3_key1, uint32_t *l3_key2,
+		      struct aes128_ctx *pad, const uint8_t *key, unsigned n);
 
 uint64_t
-_umac_nh (const uint32_t *key, unsigned length, const uint8_t *msg);
+_nettle_umac_nh (const uint32_t *key, unsigned length, const uint8_t *msg);
 
 /* Equivalent to
 
@@ -63,33 +52,33 @@ _umac_nh (const uint32_t *key, unsigned length, const uint8_t *msg);
    but processing input only once.
 */
 void
-_umac_nh_n (uint64_t *out, unsigned n, const uint32_t *key,
-	    unsigned length, const uint8_t *msg);
+_nettle_umac_nh_n (uint64_t *out, unsigned n, const uint32_t *key,
+		   unsigned length, const uint8_t *msg);
 
 /* Returns y*k + m (mod p), including "marker" processing. Return
    value is *not* in canonical representation, and must be normalized
    before the output is used. */
 uint64_t
-_umac_poly64 (uint32_t kh, uint32_t kl, uint64_t y, uint64_t m);
+_nettle_umac_poly64 (uint32_t kh, uint32_t kl, uint64_t y, uint64_t m);
 
 void
-_umac_poly128 (const uint32_t *k, uint64_t *y, uint64_t mh, uint64_t ml);
+_nettle_umac_poly128 (const uint32_t *k, uint64_t *y, uint64_t mh, uint64_t ml);
 
 void
-_umac_l2_init (unsigned size, uint32_t *k);
+_nettle_umac_l2_init (unsigned size, uint32_t *k);
 
 void
-_umac_l2(const uint32_t *key, uint64_t *state, unsigned n,
-	 uint64_t count, const uint64_t *m);
+_nettle_umac_l2(const uint32_t *key, uint64_t *state, unsigned n,
+		uint64_t count, const uint64_t *m);
 
 void
-_umac_l2_final(const uint32_t *key, uint64_t *state, unsigned n,
-	       uint64_t count);
+_nettle_umac_l2_final(const uint32_t *key, uint64_t *state, unsigned n,
+		      uint64_t count);
 
 void
-_umac_l3_init (unsigned size, uint64_t *k);
+_nettle_umac_l3_init (unsigned size, uint64_t *k);
 
 uint32_t
-_umac_l3 (const uint64_t *key, const uint64_t *m);
+_nettle_umac_l3 (const uint64_t *key, const uint64_t *m);
 
 #endif /* NETTLE_UMAC_INTERNAL_H_INCLUDED */