commit 90f242bf2e4efa6bb13c6820f22d4d5889af2e8c
author Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:13:56 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:13:56 2013 +0200
tree 6656f782408a674eb583aab7330cca0ed64d2f3c
parent a465d758aadebf53ae75b846498e6bf53607c0d2

Fixed values for 2-key Triple DES in cipher layer
(cherry picked from commit 2be71faae4df9f97a700e7e813dad7b544492339)

Conflicts:
	ChangeLog

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9485cac..23eb1a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
    * ssl_parse_certificate() now calls x509parse_crt_der() directly
      instead of the x509parse_crt() wrapper that can also parse PEM
 	 certificates
+   * Fixed values for 2-key Triple DES in cipher layer
 
 = Version 1.1.6 released on 2013-03-11
 Bugfix

library/cipher_wrap.c

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index 8edc06f..48f6a00 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -522,8 +522,8 @@
     POLARSSL_MODE_CBC,
     POLARSSL_KEY_LENGTH_DES_EDE,
     "DES-EDE-CBC",
-    16,
-    16,
+    8,
+    8,
     &des_ede_info
 };