WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1781 from JacobBarthelmeh/Compatibility-Layer 

fix for IV of DES_ncbc function
pull/1787/head
toddouska 2018-08-24 10:16:21 -07:00 committed by GitHub
parent 274b41dea5 f23eb37ade
commit 7f324d2c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ssl.c
View File

@ -14066,7 +14066,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
Des myDes;
byte lastblock[DES_BLOCK_SIZE];
int lb_sz;
long blk;
long idx = length;
long blk;
WOLFSSL_ENTER("DES_ncbc_encrypt");
@ -14074,23 +14075,33 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
wc_Des_SetKey(&myDes, (const byte*)schedule, (const byte*)ivec, !enc);
lb_sz = length%DES_BLOCK_SIZE;
blk = length/DES_BLOCK_SIZE;
idx -= sizeof(DES_cblock);
if (lb_sz) {
idx += DES_BLOCK_SIZE - lb_sz;
}
if (enc){
wc_Des_CbcEncrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE);
if(lb_sz){
wc_Des_CbcEncrypt(&myDes, output, input,
(word32)blk * DES_BLOCK_SIZE);
if (lb_sz){
XMEMSET(lastblock, 0, DES_BLOCK_SIZE);
XMEMCPY(lastblock, input+length-lb_sz, lb_sz);
wc_Des_CbcEncrypt(&myDes, output+blk*DES_BLOCK_SIZE,
wc_Des_CbcEncrypt(&myDes, output + blk * DES_BLOCK_SIZE,
lastblock, (word32)DES_BLOCK_SIZE);
}
XMEMCPY(ivec, output + idx, sizeof(DES_cblock));
} else {
wc_Des_CbcDecrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE);
if(lb_sz){
wc_Des_CbcDecrypt(&myDes, lastblock, input+length-lb_sz, (word32)DES_BLOCK_SIZE);
WOLFSSL_DES_cblock tmp;
XMEMCPY(tmp, input + idx, sizeof(DES_cblock));
wc_Des_CbcDecrypt(&myDes, output, input,
(word32)blk * DES_BLOCK_SIZE);
if (lb_sz){
wc_Des_CbcDecrypt(&myDes, lastblock, input + length - lb_sz,
(word32)DES_BLOCK_SIZE);
XMEMCPY(output+length-lb_sz, lastblock, lb_sz);
}
XMEMCPY(ivec, tmp, sizeof(WOLFSSL_DES_cblock));
}
XMEMCPY(ivec, output + length - sizeof(DES_cblock), sizeof(DES_cblock));
}
#endif /* NO_DES3 */

48
tests/api.c
View File

@ -19304,6 +19304,53 @@ static void test_wolfSSL_X509_check_ca(void){
#endif
}
static void test_wolfSSL_DES_ncbc(void){
#if defined(OPENSSL_EXTRA) && !defined(NO_DES3)
const_DES_cblock myDes;
DES_cblock iv = {1};
DES_key_schedule key = {0};
unsigned char msg[] = "hello wolfssl";
unsigned char out[DES_BLOCK_SIZE * 2] = {0};
unsigned char pln[DES_BLOCK_SIZE * 2] = {0};
unsigned char exp[] = {0x31, 0x98, 0x2F, 0x3A, 0x55, 0xBF, 0xD8, 0xC4};
unsigned char exp2[] = {0xC7, 0x45, 0x8B, 0x28, 0x10, 0x53, 0xE0, 0x58};
printf(testingFmt, "wolfSSL_DES_ncbc()");
/* partial block test */
DES_set_key(&key, &myDes);
DES_ncbc_encrypt(msg, out, 3, &myDes, &iv, DES_ENCRYPT);
AssertIntEQ(XMEMCMP(exp, out, DES_BLOCK_SIZE), 0);
AssertIntEQ(XMEMCMP(exp, iv, DES_BLOCK_SIZE), 0);
DES_set_key(&key, &myDes);
XMEMSET((byte*)&iv, 0, DES_BLOCK_SIZE);
*((byte*)&iv) = 1;
DES_ncbc_encrypt(out, pln, 3, &myDes, &iv, DES_DECRYPT);
AssertIntEQ(XMEMCMP(msg, pln, 3), 0);
AssertIntEQ(XMEMCMP(exp, iv, DES_BLOCK_SIZE), 0);
/* full block test */
DES_set_key(&key, &myDes);
XMEMSET(pln, 0, DES_BLOCK_SIZE);
XMEMSET((byte*)&iv, 0, DES_BLOCK_SIZE);
*((byte*)&iv) = 1;
DES_ncbc_encrypt(msg, out, 8, &myDes, &iv, DES_ENCRYPT);
AssertIntEQ(XMEMCMP(exp2, out, DES_BLOCK_SIZE), 0);
AssertIntEQ(XMEMCMP(exp2, iv, DES_BLOCK_SIZE), 0);
DES_set_key(&key, &myDes);
XMEMSET((byte*)&iv, 0, DES_BLOCK_SIZE);
*((byte*)&iv) = 1;
DES_ncbc_encrypt(out, pln, 8, &myDes, &iv, DES_DECRYPT);
AssertIntEQ(XMEMCMP(msg, pln, 8), 0);
AssertIntEQ(XMEMCMP(exp2, iv, DES_BLOCK_SIZE), 0);
printf(resultFmt, passed);
#endif
}
static void test_no_op_functions(void)
{
#if defined(OPENSSL_EXTRA)
@ -20635,6 +20682,7 @@ void ApiTest(void)
test_wolfSSL_ASN1_TIME_to_generalizedtime();
test_wolfSSL_i2c_ASN1_INTEGER();
test_wolfSSL_X509_check_ca();
test_wolfSSL_DES_ncbc();
#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO)
AssertIntEQ(test_wolfSSL_CTX_use_certificate_ASN1(), WOLFSSL_SUCCESS);