[git] GCRYPT - branch, LIBGCRYPT-1-5-BRANCH, updated. libgcrypt-1.5.1-11-gf1f0168

[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, LIBGCRYPT-1-5-BRANCH has been updated
       via  f1f016855418aae561ede4472590d45a24ab4476 (commit)
      from  4cd279556777e02eda79973f68efaa4b741f9175 (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 f1f016855418aae561ede4472590d45a24ab4476
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Apr 18 14:40:43 2013 +0200

    cipher: Fix regression in Padlock support.
    
    * cipher/rijndael.c (do_setkey): Remove dummy padlock key generation case
    and use the standard one.
    --
    
    This is really a brown paper bag bug.  I should have been able to
    fix it by a bit of code staring or bi-secting it myself.  Instead
    Rafaël Carré did this and with the donation of a VIA nano board from
    Stefan Krüger.  Thanks to both of you.
    
    (regression since commit b825c5db17292988d261fefdc83cbc43d97d4b02)
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/THANKS b/THANKS
index 41f4c77..0f47d4f 100644
--- a/THANKS
+++ b/THANKS
@@ -130,6 +130,7 @@ Stephan Müller             smueller at atsec com
 Stephane Corthesy          stephane at sente.ch
 Stefan Karrmann 	   S.Karrmann at gmx.net
 Stefan Keller		   dres at cs.tu-berlin.de
+Stefan Krüger              stadtkind2 at gmx de
 Steffen Ullrich 	   ccrlphr at xensei.com
 Steffen Zahn		   zahn at berlin.snafu.de
 Steven Bakker		   steven at icoe.att.com
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index 9816280..4e8eb3a 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -279,15 +279,10 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen)
 
   ctx->rounds = rounds;
 
+  /* NB: We don't yet support Padlock hardware key generation.  */
+
   if (0)
     ;
-#ifdef USE_PADLOCK
-  else if (ctx->use_padlock)
-    {
-      /* Nothing to do as we support only hardware key generation for
-         now.  */
-    }
-#endif /*USE_PADLOCK*/
 #ifdef USE_AESNI_is_disabled_here
   else if (ctx->use_aesni && ctx->rounds == 10)
     {

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

Summary of changes:
 THANKS            |    1 +
 cipher/rijndael.c |    9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)


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