mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update the tests to use the new EVP_PKEY_new_private_key() function

Browse Source 
Also to use the new EVP_PKEY_new_CMAC_key()

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5520)
This commit is contained in:
Matt Caswell 2018-03-05 16:22:41 +00:00
parent b3831fbb0b
commit 9442c8d763
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/evp_test.c
View File

@ -911,31 +911,17 @@ static int mac_test_run(EVP_TEST *t)
} }
#endif #endif
if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_id(expected->type, NULL))) { if (expected->type == EVP_PKEY_CMAC)
t->err = "MAC_PKEY_CTX_ERROR"; key = EVP_PKEY_new_CMAC_key(NULL, expected->key, expected->key_len,
EVP_get_cipherbyname(expected->alg));
else
key = EVP_PKEY_new_private_key(expected->type, NULL, expected->key,
expected->key_len);
if (key == NULL) {
t->err = "MAC_KEY_CREATE_ERROR";
goto err; goto err;
} }
if (EVP_PKEY_keygen_init(genctx) <= 0) {
t->err = "MAC_KEYGEN_INIT_ERROR";
goto err;
}
if (expected->type == EVP_PKEY_CMAC
&& EVP_PKEY_CTX_ctrl_str(genctx, "cipher", expected->alg) <= 0) {
t->err = "MAC_ALGORITHM_SET_ERROR";
goto err;
}
if (EVP_PKEY_CTX_set_mac_key(genctx, expected->key,
expected->key_len) <= 0) {
t->err = "MAC_KEY_SET_ERROR";
goto err;
}
if (EVP_PKEY_keygen(genctx, &key) <= 0) {
t->err = "MAC_KEY_GENERATE_ERROR";
goto err;
}
if (expected->type == EVP_PKEY_HMAC) { if (expected->type == EVP_PKEY_HMAC) {
if (!TEST_ptr(md = EVP_get_digestbyname(expected->alg))) { if (!TEST_ptr(md = EVP_get_digestbyname(expected->alg))) {
t->err = "MAC_ALGORITHM_SET_ERROR"; t->err = "MAC_ALGORITHM_SET_ERROR";