|
 |
62d6721 |
From 445dfa67a64dcd30067dab823f6bae31d1019c1e Mon Sep 17 00:00:00 2001
|
|
|
62d6721 |
From: Paul Howarth <paul@city-fan.org>
|
|
|
62d6721 |
Date: Tue, 15 Apr 2014 11:25:18 +0100
|
|
|
62d6721 |
Subject: [PATCH] des.c: Add support for two-key Triple-DES
|
|
|
62d6721 |
|
|
|
62d6721 |
Add two-key 3DES support, needed by pycrypto.
|
|
|
62d6721 |
|
|
|
62d6721 |
This commit is based on the one for the bundled libtomcrypt 1.16
|
|
|
62d6721 |
code in pycrypto:
|
|
|
62d6721 |
|
|
|
62d6721 |
https://github.com/dlitz/pycrypto/commit/65085f16
|
|
|
62d6721 |
---
|
|
|
62d6721 |
src/ciphers/des.c | 16 +++++++++++++---
|
|
|
62d6721 |
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
62d6721 |
|
|
|
62d6721 |
diff --git a/src/ciphers/des.c b/src/ciphers/des.c
|
|
|
62d6721 |
index af3a4d0..0034c80 100644
|
|
|
62d6721 |
--- a/src/ciphers/des.c
|
|
|
62d6721 |
+++ b/src/ciphers/des.c
|
|
|
62d6721 |
@@ -1562,17 +1562,27 @@ int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_k
|
|
|
62d6721 |
return CRYPT_INVALID_ROUNDS;
|
|
|
62d6721 |
}
|
|
|
62d6721 |
|
|
|
62d6721 |
- if (keylen != 24) {
|
|
|
62d6721 |
+ if (keylen != 24 && keylen != 16) {
|
|
|
62d6721 |
return CRYPT_INVALID_KEYSIZE;
|
|
|
62d6721 |
}
|
|
|
62d6721 |
|
|
|
62d6721 |
deskey(key, EN0, skey->des3.ek[0]);
|
|
|
62d6721 |
deskey(key+8, DE1, skey->des3.ek[1]);
|
|
|
62d6721 |
- deskey(key+16, EN0, skey->des3.ek[2]);
|
|
|
62d6721 |
+ if (keylen == 24) {
|
|
|
62d6721 |
+ deskey(key+16, EN0, skey->des3.ek[2]);
|
|
|
62d6721 |
+ } else {
|
|
|
62d6721 |
+ /* two-key 3DES: K3=K1 */
|
|
|
62d6721 |
+ deskey(key, EN0, skey->des3.ek[2]);
|
|
|
62d6721 |
+ }
|
|
|
62d6721 |
|
|
|
62d6721 |
deskey(key, DE1, skey->des3.dk[2]);
|
|
|
62d6721 |
deskey(key+8, EN0, skey->des3.dk[1]);
|
|
|
62d6721 |
- deskey(key+16, DE1, skey->des3.dk[0]);
|
|
|
62d6721 |
+ if (keylen == 24) {
|
|
|
62d6721 |
+ deskey(key+16, DE1, skey->des3.dk[0]);
|
|
|
62d6721 |
+ } else {
|
|
|
62d6721 |
+ /* two-key 3DES: K3=K1 */
|
|
|
62d6721 |
+ deskey(key, DE1, skey->des3.dk[0]);
|
|
|
62d6721 |
+ }
|
|
|
62d6721 |
|
|
|
62d6721 |
return CRYPT_OK;
|
|
|
62d6721 |
}
|
|
|
62d6721 |
--
|
|
|
62d6721 |
1.9.0
|
|
|
62d6721 |
|