Add support for EVP_PKEY_derive in evp_test

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-01-29 14:58:36 +00:00
parent bc9d9ce27a
commit d4ad48d7bd

View file

@ -293,6 +293,7 @@ static const struct evp_test_method mac_test_method;
static const struct evp_test_method psign_test_method, pverify_test_method;
static const struct evp_test_method pdecrypt_test_method;
static const struct evp_test_method pverify_recover_test_method;
static const struct evp_test_method pderive_test_method;
static const struct evp_test_method pbe_test_method;
static const struct evp_test_method encode_test_method;
static const struct evp_test_method kdf_test_method;
@ -305,6 +306,7 @@ static const struct evp_test_method *evp_test_list[] = {
&pverify_test_method,
&pdecrypt_test_method,
&pverify_recover_test_method,
&pderive_test_method,
&pbe_test_method,
&encode_test_method,
&kdf_test_method,
@ -1339,6 +1341,75 @@ static const struct evp_test_method pverify_test_method = {
verify_test_run
};
static int pderive_test_init(struct evp_test *t, const char *name)
{
return pkey_test_init(t, name, 0, EVP_PKEY_derive_init, 0);
}
static int pderive_test_parse(struct evp_test *t,
const char *keyword, const char *value)
{
struct pkey_data *kdata = t->data;
if (strcmp(keyword, "PeerKey") == 0) {
EVP_PKEY *peer;
if (find_key(&peer, value, t->public) == 0)
return 0;
if (EVP_PKEY_derive_set_peer(kdata->ctx, peer) <= 0)
return 0;
return 1;
}
if (strcmp(keyword, "SharedSecret") == 0)
return test_bin(value, &kdata->output, &kdata->output_len);
if (strcmp(keyword, "Ctrl") == 0) {
char *p = strchr(value, ':');
if (p)
*p++ = 0;
if (EVP_PKEY_CTX_ctrl_str(kdata->ctx, value, p) <= 0)
return 0;
return 1;
}
return 0;
}
static int pderive_test_run(struct evp_test *t)
{
struct pkey_data *kdata = t->data;
unsigned char *out = NULL;
size_t out_len;
const char *err = "INTERNAL_ERROR";
out_len = kdata->output_len;
out = OPENSSL_malloc(out_len);
if (!out) {
fprintf(stderr, "Error allocating output buffer!\n");
exit(1);
}
err = "DERIVE_ERROR";
if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0)
goto err;
err = "SHARED_SECRET_LENGTH_MISMATCH";
if (out_len != kdata->output_len)
goto err;
err = "SHARED_SECRET_MISMATCH";
if (check_output(t, kdata->output, out, out_len))
goto err;
err = NULL;
err:
OPENSSL_free(out);
t->err = err;
return 1;
}
static const struct evp_test_method pderive_test_method = {
"Derive",
pderive_test_init,
pkey_test_cleanup,
pderive_test_parse,
pderive_test_run
};
/* PBE tests */
#define PBE_TYPE_SCRYPT 1