From 2a6a3a7e6985ea13b2749e151950a65ed5b7a5c9 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Tue, 10 Sep 2013 14:29:28 +0200
Subject: [PATCH] Better checking on cipher_info_from_values()

---
 library/cipher.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/cipher.c b/library/cipher.c
index b23969cd74..8fded8186c 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -494,7 +494,7 @@ const cipher_info_t *cipher_info_from_values( const cipher_id_t cipher_id,
 #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 @@ const cipher_info_t *cipher_info_from_values( const cipher_id_t cipher_id,
 #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;