Suppress warnings in certain configuration and fix x86_64 build

diff --git a/gcm-internal.h b/gcm-internal.h
index 6e858b20ae6c79650440cea568c74c466824357e..36d5f6f3dba91ec3193ac13c940f273444b0dc2a 100644 (file)
--- a/gcm-internal.h
+++ b/gcm-internal.h
@@ -33,6 +33,17 @@
 #define NETTLE_GCM_INTERNAL_H_INCLUDED
 
 /* Functions available only in some configurations */
+#if HAVE_NATIVE_gcm_init_key
+void
+_nettle_gcm_init_key (union nettle_block16 *table);
+#endif
+
+#if HAVE_NATIVE_gcm_hash
+void
+_nettle_gcm_hash(const struct gcm_key *key, union nettle_block16 *x,
+                size_t length, const uint8_t *data);
+#endif
+
 #if HAVE_NATIVE_fat_gcm_init_key
 void
 _nettle_gcm_init_key (union nettle_block16 *table);

diff --git a/gcm.c b/gcm.c
index 4770e414ad7687aed831727becb0ac03b273a6b5..d6d68070f39fef89da216523038ce28839b768cf 100644 (file)
--- a/gcm.c
+++ b/gcm.c
@@ -153,7 +153,7 @@ gcm_gf_mul (union nettle_block16 *x, const union nettle_block16 *table)
 #  elif GCM_TABLE_BITS == 8
 #   if HAVE_NATIVE_gcm_hash8
 
-#define gcm_hash _nettle_gcm_hash8
+#define _nettle_gcm_hash _nettle_gcm_hash8
 void
 _nettle_gcm_hash8 (const struct gcm_key *key, union nettle_block16 *x,
                   size_t length, const uint8_t *data);