wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2113 from JacobBarthelmeh/Testing

Browse Source 
EVP decrypt with padding fix
This commit is contained in:
toddouska
2019-02-27 14:35:57 -08:00
committed by GitHub
parent 4226fb66f9 b33023df2f
commit b830447690
2 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/evp.c
View File

@@ -361,9 +361,13 @@ WOLFSSL_API int wolfSSL_EVP_CipherUpdate(WOLFSSL_EVP_CIPHER_CTX *ctx,
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size); XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size);
*outl+= ctx->block_size * blocks; *outl+= ctx->block_size * blocks;
} else { } else {
ctx->lastUsed = 1; if (inl == 0) {
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * (blocks-1)], ctx->block_size); ctx->lastUsed = 1;
*outl+= ctx->block_size * (blocks-1); blocks = blocks - 1; /* save last block to check padding in
* EVP_CipherFinal call */
}
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size);
*outl+= ctx->block_size * blocks;
} }
} else { } else {
*outl+= ctx->block_size * blocks; *outl+= ctx->block_size * blocks;
@@ -430,6 +434,11 @@ WOLFSSL_API int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx,
*outl = 0; *outl = 0;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
if ((ctx->bufUsed % ctx->block_size) != 0) {
*outl = 0;
/* not enough padding for decrypt */
return WOLFSSL_FAILURE;
}
if (ctx->lastUsed) { if (ctx->lastUsed) {
PRINT_BUF(ctx->lastBlock, ctx->block_size); PRINT_BUF(ctx->lastBlock, ctx->block_size);
if ((fl = checkPad(ctx, ctx->lastBlock)) >= 0) { if ((fl = checkPad(ctx, ctx->lastBlock)) >= 0) {

107
wolfcrypt/test/test.c
View File

@@ -12670,6 +12670,75 @@ static int openssl_aes_test(void)
if (XMEMCMP(plain, cbcPlain, 18)) if (XMEMCMP(plain, cbcPlain, 18))
return -7315; return -7315;
/* test with encrypting/decrypting more than 16 bytes at once */
total = 0;
EVP_CIPHER_CTX_init(&en);
if (EVP_CipherInit(&en, EVP_aes_128_cbc(),
(unsigned char*)key, (unsigned char*)iv, 1) == 0)
return -7316;
if (EVP_CipherUpdate(&en, (byte*)cipher, &outlen,
(byte*)cbcPlain, 17) == 0)
return -7317;
if (outlen != 16)
return -7318;
total += outlen;
if (EVP_CipherUpdate(&en, (byte*)&cipher[total], &outlen,
(byte*)&cbcPlain[17] , 1) == 0)
return -7319;
if (outlen != 0)
return -7320;
total += outlen;
if (EVP_CipherFinal(&en, (byte*)&cipher[total], &outlen) == 0)
return -7321;
if (outlen != 16)
return -7322;
total += outlen;
if (total != 32)
return -7323;
total = 0;
EVP_CIPHER_CTX_init(&de);
if (EVP_CipherInit(&de, EVP_aes_128_cbc(),
(unsigned char*)key, (unsigned char*)iv, 0) == 0)
return -7324;
if (EVP_CipherUpdate(&de, (byte*)plain, &outlen, (byte*)cipher, 17) == 0)
return -7325;
if (outlen != 16)
return -7326;
total += outlen;
/* final call on non block size should fail */
if (EVP_CipherFinal(&de, (byte*)&plain[total], &outlen) != 0)
return -7327;
if (EVP_CipherUpdate(&de, (byte*)&plain[total], &outlen,
(byte*)&cipher[17], 1) == 0)
return -7328;
if (outlen != 0)
total += outlen;
if (EVP_CipherUpdate(&de, (byte*)&plain[total], &outlen,
(byte*)&cipher[17+1], 14) == 0)
return -7329;
if (outlen != 0)
return -7330;
total += outlen;
if (EVP_CipherFinal(&de, (byte*)&plain[total], &outlen) == 0)
return -7331;
if (outlen != 2)
return -7332;
total += outlen;
if (total != 18)
return -7333;
if (XMEMCMP(plain, cbcPlain, 18))
return -7334;
} }
{ /* evp_cipher test: EVP_aes_128_cbc */ { /* evp_cipher test: EVP_aes_128_cbc */
@@ -12695,23 +12764,23 @@ static int openssl_aes_test(void)
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0)
return -7316; return -7335;
if (EVP_Cipher(&ctx, cipher, (byte*)msg, 16) == 0) if (EVP_Cipher(&ctx, cipher, (byte*)msg, 16) == 0)
return -7317; return -7336;
if (XMEMCMP(cipher, verify, AES_BLOCK_SIZE)) if (XMEMCMP(cipher, verify, AES_BLOCK_SIZE))
return -7318; return -7337;
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0)
return -7319; return -7338;
if (EVP_Cipher(&ctx, plain, cipher, 16) == 0) if (EVP_Cipher(&ctx, plain, cipher, 16) == 0)
return -7320; return -7339;
if (XMEMCMP(plain, msg, AES_BLOCK_SIZE)) if (XMEMCMP(plain, msg, AES_BLOCK_SIZE))
return -7321; return -7340;
} /* end evp_cipher test: EVP_aes_128_cbc*/ } /* end evp_cipher test: EVP_aes_128_cbc*/
@@ -13404,32 +13473,44 @@ int openssl_test(void)
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0)
return -7417; return -7417;
if (EVP_CipherUpdate(&ctx, plain, &idx, cipher, cipherSz) == 0) /* check partial decrypt (not enough padding for full block) */
if (EVP_CipherUpdate(&ctx, plain, &idx, cipher, 1) == 0)
return -7418; return -7418;
plainSz = idx; plainSz = idx;
if (EVP_CipherFinal(&ctx, plain + plainSz, &idx) == 0) if (EVP_CipherFinal(&ctx, plain + plainSz, &idx) != 0)
return -7419; return -7419;
EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0)
return -7420;
if (EVP_CipherUpdate(&ctx, plain, &idx, cipher, cipherSz) == 0)
return -7421;
plainSz = idx;
if (EVP_CipherFinal(&ctx, plain + plainSz, &idx) == 0)
return -7422;
plainSz += idx; plainSz += idx;
if ((plainSz != sizeof(msg)) || XMEMCMP(plain, msg, sizeof(msg))) if ((plainSz != sizeof(msg)) || XMEMCMP(plain, msg, sizeof(msg)))
return -7420; return -7423;
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0)
return -7421; return -7424;
if (EVP_CipherUpdate(&ctx, cipher, &idx, msg, AES_BLOCK_SIZE) == 0) if (EVP_CipherUpdate(&ctx, cipher, &idx, msg, AES_BLOCK_SIZE) == 0)
return -7422; return -7425;
cipherSz = idx; cipherSz = idx;
if (EVP_CipherFinal(&ctx, cipher + cipherSz, &idx) == 0) if (EVP_CipherFinal(&ctx, cipher + cipherSz, &idx) == 0)
return -7423; return -7426;
cipherSz += idx; cipherSz += idx;
if ((cipherSz != (int)sizeof(verify2)) || if ((cipherSz != (int)sizeof(verify2)) ||
XMEMCMP(cipher, verify2, cipherSz)) XMEMCMP(cipher, verify2, cipherSz))
return -7424; return -7427;
} /* end evp_cipher test: EVP_aes_128_cbc*/ } /* end evp_cipher test: EVP_aes_128_cbc*/
#endif /* WOLFSSL_AES_128 && HAVE_AES_CBC */ #endif /* WOLFSSL_AES_128 && HAVE_AES_CBC */