diff options
author | Richard Levitte <levitte@openssl.org> | 2020-03-19 22:29:10 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-03-23 10:07:38 +0100 |
commit | 0996cff91fe9d6ed7c37830debdf585119dcc067 (patch) | |
tree | 64bfae0bbb313c8f827958ec6206b84be8174c80 /crypto/ec | |
parent | 8cc86b81ac20ff3e933ea7fd107a5a6066032330 (diff) |
DH, DSA, EC_KEY: Fix exporters to allow domain parameter keys
The export-to-provider functions for DH, DSA and EC_KEY assumed that a
public key is always present, and would fail if not. This blocks any
attempt to export a key structure with only domain parameters.
While fixing this, we also modify the selection declaration to
evp_keymgmt_import() to be more adaptive, the diverse selection bits
are now added when the corresponding data is added to the OSSL_PARAM
array.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11374)
Diffstat (limited to 'crypto/ec')
-rw-r--r-- | crypto/ec/ec_ameth.c | 36 | ||||
-rw-r--r-- | crypto/ec/ecx_meth.c | 6 |
2 files changed, 22 insertions, 20 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 652086a93a..944fc05835 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -630,6 +630,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, OSSL_PARAM *params = NULL; const BIGNUM *priv_key = NULL; const EC_POINT *pub_point = NULL; + int selection = 0; int rv = 0; if (from == NULL @@ -648,26 +649,24 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, /* export the domain parameters */ if (!ecparams_to_params(eckey, &tmpl)) - return 0; + goto err; + selection |= OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS; priv_key = EC_KEY_get0_private_key(eckey); pub_point = EC_KEY_get0_public_key(eckey); - /* public_key must be present, priv_key is optional */ - if (pub_point == NULL) - return 0; - - /* convert pub_point to a octet string according to the SECG standard */ - if ((pub_key_buflen = EC_POINT_point2buf(ecg, pub_point, - POINT_CONVERSION_COMPRESSED, - &pub_key_buf, NULL)) == 0) - return 0; - - if (!ossl_param_bld_push_octet_string(&tmpl, - OSSL_PKEY_PARAM_PUB_KEY, - pub_key_buf, - pub_key_buflen)) - goto err; + if (pub_point != NULL) { + /* convert pub_point to a octet string according to the SECG standard */ + if ((pub_key_buflen = EC_POINT_point2buf(ecg, pub_point, + POINT_CONVERSION_COMPRESSED, + &pub_key_buf, NULL)) == 0 + || !ossl_param_bld_push_octet_string(&tmpl, + OSSL_PKEY_PARAM_PUB_KEY, + pub_key_buf, + pub_key_buflen)) + goto err; + selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY; + } if (priv_key != NULL) { size_t sz; @@ -716,6 +715,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, OSSL_PKEY_PARAM_PRIV_KEY, priv_key, sz)) goto err; + selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY; /* * The ECDH Cofactor Mode is defined only if the EC_KEY actually @@ -730,13 +730,13 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, OSSL_PKEY_PARAM_USE_COFACTOR_ECDH, ecdh_cofactor_mode)) goto err; + selection |= OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS; } params = ossl_param_bld_to_param(&tmpl); /* We export, the provider imports */ - rv = evp_keymgmt_import(to_keymgmt, to_keydata, OSSL_KEYMGMT_SELECT_ALL, - params); + rv = evp_keymgmt_import(to_keymgmt, to_keydata, selection, params); err: ossl_param_bld_free(params); diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 5f85927bd0..9b9536f022 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -423,6 +423,7 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata, const ECX_KEY *key = from->pkey.ecx; OSSL_PARAM_BLD tmpl; OSSL_PARAM *params = NULL; + int selection = 0; int rv = 0; ossl_param_bld_init(&tmpl); @@ -431,19 +432,20 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata, if (!ossl_param_bld_push_octet_string(&tmpl, OSSL_PKEY_PARAM_PUB_KEY, key->pubkey, key->keylen)) goto err; + selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY; if (key->privkey != NULL) { if (!ossl_param_bld_push_octet_string(&tmpl, OSSL_PKEY_PARAM_PRIV_KEY, key->privkey, key->keylen)) goto err; + selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY; } params = ossl_param_bld_to_param(&tmpl); /* We export, the provider imports */ - rv = evp_keymgmt_import(to_keymgmt, to_keydata, OSSL_KEYMGMT_SELECT_ALL, - params); + rv = evp_keymgmt_import(to_keymgmt, to_keydata, selection, params); err: ossl_param_bld_free(params); |