summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--cipher/rijndael.c9
2 files changed, 3 insertions, 7 deletions
diff --git a/THANKS b/THANKS
index 41f4c77a..0f47d4fa 100644
--- a/THANKS
+++ b/THANKS
@@ -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)
{