[git] GCRYPT - branch, master, updated. libgcrypt-1.7.3-86-gd764c98

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, master has been updated
       via  d764c9894013727ff82eb194da6030209c273528 (commit)
      from  c1bb3d9fdb6fe5f336af1d5a03fc42bfdc1f8b0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d764c9894013727ff82eb194da6030209c273528
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 23 17:48:15 2017 +0200

    cipher: Fix compiler warnings.
    
    * cipher/poly1305.c (poly1305_default_ops): Move to the top.  Add
    prototypes and compile only if USE_SSE2 is not defined.
    (poly1305_init_ext_ref32): Compile only if USE_SSE2 is not defined.
    (poly1305_blocks_ref32): Ditto.
    (poly1305_finish_ext_ref32): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/cipher/poly1305.c b/cipher/poly1305.c
index 7ae3592..22255fb 100644
--- a/cipher/poly1305.c
+++ b/cipher/poly1305.c
@@ -55,7 +55,24 @@ static const poly1305_ops_t poly1305_amd64_sse2_ops = {
   _gcry_poly1305_amd64_sse2_finish_ext
 };
 
-#endif
+#else  /* !POLY1305_USE_SSE2 */
+
+static OPS_FUNC_ABI void poly1305_init_ext_ref32
+/**/                (void *state, const poly1305_key_t *key);
+static OPS_FUNC_ABI unsigned int poly1305_blocks_ref32
+/**/                (void *state, const byte *m, size_t bytes);
+static OPS_FUNC_ABI unsigned int poly1305_finish_ext_ref32
+/**/                (void *state, const byte * m,
+                     size_t remaining, byte mac[POLY1305_TAGLEN]);
+
+static const poly1305_ops_t poly1305_default_ops = {
+  POLY1305_REF_BLOCKSIZE,
+  poly1305_init_ext_ref32,
+  poly1305_blocks_ref32,
+  poly1305_finish_ext_ref32
+};
+
+#endif /* !POLY1305_USE_SSE2 */
 
 
 #ifdef POLY1305_USE_AVX2
@@ -111,6 +128,7 @@ typedef struct poly1305_state_ref32_s
 } poly1305_state_ref32_t;
 
 
+#ifndef POLY1305_USE_SSE2
 static OPS_FUNC_ABI void
 poly1305_init_ext_ref32 (void *state, const poly1305_key_t * key)
 {
@@ -141,8 +159,10 @@ poly1305_init_ext_ref32 (void *state, const poly1305_key_t * key)
 
   st->final = 0;
 }
+#endif /* !POLY1305_USE_SSE2 */
 
 
+#ifndef POLY1305_USE_SSE2
 static OPS_FUNC_ABI unsigned int
 poly1305_blocks_ref32 (void *state, const byte * m, size_t bytes)
 {
@@ -229,8 +249,10 @@ poly1305_blocks_ref32 (void *state, const byte * m, size_t bytes)
 
   return (16 * sizeof (u32) + 5 * sizeof (u64) + 5 * sizeof (void *));
 }
+#endif /* !POLY1305_USE_SSE2 */
 
 
+#ifndef POLY1305_USE_SSE2
 static OPS_FUNC_ABI unsigned int
 poly1305_finish_ext_ref32 (void *state, const byte * m,
 			   size_t remaining, byte mac[POLY1305_TAGLEN])
@@ -347,15 +369,9 @@ poly1305_finish_ext_ref32 (void *state, const byte * m,
   return (13 * sizeof (u32) + sizeof (u64) +
 	  POLY1305_REF_BLOCKSIZE + 6 * sizeof (void *)) + burn;
 }
+#endif /* !POLY1305_USE_SSE2*/
 
 
-static const poly1305_ops_t poly1305_default_ops = {
-  POLY1305_REF_BLOCKSIZE,
-  poly1305_init_ext_ref32,
-  poly1305_blocks_ref32,
-  poly1305_finish_ext_ref32
-};
-
 
 
 

-----------------------------------------------------------------------

Summary of changes:
 cipher/poly1305.c | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits