diff options
author | Werner Koch <wk@gnupg.org> | 2013-04-18 14:40:43 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-04-18 16:11:49 +0200 |
commit | 6c942ec4d63032539f1fc56c3b970cfec2369e2b (patch) | |
tree | 2e6c71bd29c919af312b7666c9cdd169cef3baa9 | |
parent | 03557687a09b9c8878c77cbfdd0f5049940c72da (diff) | |
download | libgcrypt-6c942ec4d63032539f1fc56c3b970cfec2369e2b.tar.gz |
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@gnupg.org>
(cherry picked from commit f1f016855418aae561ede4472590d45a24ab4476)
-rw-r--r-- | THANKS | 1 | ||||
-rw-r--r-- | cipher/rijndael.c | 9 |
2 files changed, 3 insertions, 7 deletions
@@ -130,6 +130,7 @@ Stephan Müller smueller at atsec com Stephane Corthesy stephane@sente.ch Stefan Karrmann S.Karrmann@gmx.net Stefan Keller dres@cs.tu-berlin.de +Stefan Krüger stadtkind2 at gmx de Steffen Ullrich ccrlphr@xensei.com Steffen Zahn zahn@berlin.snafu.de Steven Bakker steven@icoe.att.com diff --git a/cipher/rijndael.c b/cipher/rijndael.c index a3080f55..8d4036b7 100644 --- a/cipher/rijndael.c +++ b/cipher/rijndael.c @@ -285,15 +285,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) { |