[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-389-g9816ae9

[by Jussi Kivilinna]

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  9816ae9d9931b75e4fdc9a5be10e6af447132313 (commit)
       via  77922a82c3f2e30eca04511fa5a355208349c657 (commit)
      from  b49cd64aaaff2e5488a84665362ef7150683226c (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 9816ae9d9931b75e4fdc9a5be10e6af447132313
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Mon Nov 18 20:27:35 2013 +0200

    Camellia: fix compiler warning
    
    * cipher/camellia-glue.c (camellia_setkey): Use braces around empty if
    statement.
    --
    
    Patch silences following warning:
    
     camellia-glue.c: In function 'camellia_setkey':
     camellia-glue.c:183:5: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki-fi>

diff --git a/cipher/camellia-glue.c b/cipher/camellia-glue.c
index 575bb04..f18d135 100644
--- a/cipher/camellia-glue.c
+++ b/cipher/camellia-glue.c
@@ -180,7 +180,7 @@ camellia_setkey(void *c, const byte *key, unsigned keylen)
   ctx->keybitlength=keylen*8;
 
   if (0)
-    ;
+    { }
 #ifdef USE_AESNI_AVX
   else if (ctx->use_aesni_avx)
     _gcry_camellia_aesni_avx_keygen(ctx, key, keylen);

commit 77922a82c3f2e30eca04511fa5a355208349c657
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Tue Nov 19 15:48:32 2013 +0200

    Tweak Camellia-AVX key-setup for small speed-up
    
    * cipher/camellia-aesni-avx-amd64.S (camellia_f): Merge S-function output
    rotation with P-function.
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/camellia-aesni-avx-amd64.S b/cipher/camellia-aesni-avx-amd64.S
index b25a8c7..ffb1aed 100644
--- a/cipher/camellia-aesni-avx-amd64.S
+++ b/cipher/camellia-aesni-avx-amd64.S
@@ -1213,7 +1213,7 @@ _gcry_camellia_aesni_avx_cfb_dec:
 	/* input rotation for sbox4 (<<< 1) */ \
 	vpand x, sbox4mask, t0; \
 	vpandn x, sbox4mask, x; \
-	vpsllw $1, t0, t1; \
+	vpaddw t0, t0, t1; \
 	vpsrlw $7, t0, t0; \
 	vpor t0, t1, t0; \
 	vpand sbox4mask, t0, t0; \
@@ -1238,34 +1238,22 @@ _gcry_camellia_aesni_avx_cfb_dec:
 	vpor sbox2mask, t4, t2; \
 	vpand x, sbox2mask, t0; \
 	vpand x, t4, t1; \
-	vpandn x, t2, x; \
-	vpsllw $1, t0, t2; \
+	vpaddb x, x, t2; \
+	vpshufb .Lsp1110111044044404mask RIP, x, t4; \
+	vpshufb .Lsp0044440410011110mask RIP, x, x; \
 	vpsrlw $7, t0, t0; \
-	vpor t0, t2, t0; \
-	vpand sbox2mask, t0, t0; \
-	vpsllw $7, t1, t2; \
+	vpsllw $7, t1, t3; \
 	vpsrlw $1, t1, t1; \
-	vpor t1, t2, t1; \
-	vpand t4, t1, t1; \
-	vpor x, t0, x; \
-	vpor x, t1, x; \
-	\
-	vpshufb .Lsp11101110mask RIP, x, t4; \
-	vpshufb .Lsp44044404mask RIP, x, t1; \
-	vpshufb .Lsp30333033mask RIP, x, t2; \
-	vpshufb .Lsp02220222mask RIP, x, t0; \
-	vpxor t2, t1, t1; \
-	\
-	vpshufb .Lsp00444404mask RIP, x, t2; \
-	vpxor t0, t1, t1; \
-	vpshufb .Lsp03303033mask RIP, x, t0; \
-	vpxor t2, t4, t4; \
-	vpshufb .Lsp22000222mask RIP, x, t2; \
-	vpxor t0, t1, t1; \
-	vpxor t2, t4, t4; \
-	vpshufb .Lsp10011110mask RIP, x, x; \
-	vpxor t1, x, x; \
-	vpxor t4, x, x;
+	vpor t0, t2, t0; \
+	vpshufb .Lsp0222022222000222mask RIP, t0, t0; \
+	vpor t1, t3, t1; \
+	vpshufb .Lsp3033303303303033mask RIP, t1, t1; \
+	\
+	vpxor x, t4, t4; \
+	vpxor t1, t0, t0; \
+	vpxor t4, t0, t0; \
+	vpsrldq $8, t0, x; \
+	vpxor t0, x, x;
 
 #define vec_rol128(in, out, nrol, t0) \
 	vpshufd $0x4e, in, out; \
@@ -1281,29 +1269,25 @@ _gcry_camellia_aesni_avx_cfb_dec:
 
 .data
 
-.align 8
+.align 16
+.Lsp1110111044044404mask:
+	.long 0x000000ff, 0x000000ff;
+	.long 0x0101ff01, 0x0101ff01;
+.Lsp0044440410011110mask:
+	.long 0xffff0404, 0x0404ff04;
+	.long 0x07ffff07, 0x070707ff;
+.Lsp0222022222000222mask:
+	.long 0xff030303, 0xff030303;
+	.long 0x0606ffff, 0xff060606;
+.Lsp3033303303303033mask:
+	.long 0x02ff0202, 0x02ff0202;
+	.long 0xff0505ff, 0x05ff0505;
 .Lsbox2_output_mask:
 	.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00;
 .Lsbox3_output_mask:
 	.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00;
 .Lsbox4_input_mask:
 	.byte 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00;
-.Lsp11101110mask:
-	.long 0x000000ff, 0x000000ff;
-.Lsp44044404mask:
-	.long 0x0101ff01, 0x0101ff01;
-.Lsp30333033mask:
-	.long 0x02ff0202, 0x02ff0202;
-.Lsp02220222mask:
-	.long 0xff030303, 0xff030303;
-.Lsp00444404mask:
-	.long 0xffff0404, 0x0404ff04;
-.Lsp03303033mask:
-	.long 0xff0505ff, 0x05ff0505;
-.Lsp22000222mask:
-	.long 0x0606ffff, 0xff060606;
-.Lsp10011110mask:
-	.long 0x07ffff07, 0x070707ff;
 .Lsigma1:
 	.long 0x3BCC908B, 0xA09E667F;
 .Lsigma2:

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

Summary of changes:
 cipher/camellia-aesni-avx-amd64.S |   72 +++++++++++++++----------------------
 cipher/camellia-glue.c            |    2 +-
 2 files changed, 29 insertions(+), 45 deletions(-)


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