From 90f242bf2e4efa6bb13c6820f22d4d5889af2e8c Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Wed, 19 Jun 2013 12:13:56 +0200 Subject: [PATCH] Fixed values for 2-key Triple DES in cipher layer (cherry picked from commit 2be71faae4df9f97a700e7e813dad7b544492339) Conflicts: ChangeLog --- ChangeLog | 1 + library/cipher_wrap.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9485cacd8..23eb1a020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Bugfix * 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 diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c index 8edc06f37..48f6a0015 100644 --- a/library/cipher_wrap.c +++ b/library/cipher_wrap.c @@ -522,8 +522,8 @@ const cipher_info_t des_ede_cbc_info = { POLARSSL_MODE_CBC, POLARSSL_KEY_LENGTH_DES_EDE, "DES-EDE-CBC", - 16, - 16, + 8, + 8, &des_ede_info };