commit 2a6a3a7e6985ea13b2749e151950a65ed5b7a5c9
author Paul Bakker <p.j.bakker@polarssl.org> Tue Sep 10 14:29:28 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Sep 10 14:29:28 2013 +0200
tree 28d0e458180c2cfac0afbfa0e8ca46ce5ee649f8
parent a0558e048419968c33e0c6d1a06e5118a08d1cfb

Better checking on cipher_info_from_values()

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index b23969c..8fded81 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -494,7 +494,7 @@
 #endif
 
 #if defined(POLARSSL_DES_C)
-    if( cipher_id == POLARSSL_CIPHER_ID_DES )
+    if( cipher_id == POLARSSL_CIPHER_ID_DES && key_length == 64 )
     {
         if( mode == POLARSSL_MODE_ECB )
             return &des_ecb_info;
@@ -524,13 +524,13 @@
 #endif
 
 #if defined(POLARSSL_ARC4_C)
-    if( cipher_id == POLARSSL_CIPHER_ID_ARC4 )
-        if( mode == POLARSSL_MODE_STREAM )
+    if( cipher_id == POLARSSL_CIPHER_ID_ARC4 &&
+        key_length == 128 && mode == POLARSSL_MODE_STREAM )
             return &arc4_128_info;
 #endif
 
 #if defined(POLARSSL_BLOWFISH_C)
-    if( cipher_id == POLARSSL_CIPHER_ID_BLOWFISH )
+    if( cipher_id == POLARSSL_CIPHER_ID_BLOWFISH && key_length == 128 )
     {
         if( mode == POLARSSL_MODE_ECB )
             return &blowfish_ecb_info;