From: Matt Caswell Date: Mon, 6 Apr 2020 17:19:30 +0000 (+0100) Subject: Use the libctx in Ed448 private key decoding X-Git-Tag: openssl-3.0.0-alpha1~101 X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopenssl.git;a=commitdiff_plain;h=f13fdeb321f0f6bf67e2c93209bba70c8c4fcbec;ds=sidebyside Use the libctx in Ed448 private key decoding The Ed448 private key deconding needs to use a library ctx. So we implement a priv_decode_with_libctx function for it. Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/11494) --- diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 03d6a7af83..62a73f9b08 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -35,7 +35,8 @@ typedef enum { /* Setup EVP_PKEY using public, private or generation */ static int ecx_key_op(EVP_PKEY *pkey, int id, const X509_ALGOR *palg, - const unsigned char *p, int plen, ecx_key_op_t op) + const unsigned char *p, int plen, ecx_key_op_t op, + OPENSSL_CTX *libctx, const char *propq) { ECX_KEY *key = NULL; unsigned char *privkey, *pubkey; @@ -98,11 +99,7 @@ static int ecx_key_op(EVP_PKEY *pkey, int id, const X509_ALGOR *palg, X448_public_from_private(pubkey, privkey); break; case EVP_PKEY_ED448: - /* - * TODO(3.0): We set the library context to NULL for now. This will - * need to change. - */ - ED448_public_from_private(NULL, pubkey, privkey); + ED448_public_from_private(libctx, pubkey, privkey); break; } } @@ -148,7 +145,7 @@ static int ecx_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey)) return 0; return ecx_key_op(pkey, pkey->ameth->pkey_id, palg, p, pklen, - KEY_OP_PUBLIC); + KEY_OP_PUBLIC, NULL, NULL); } static int ecx_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) @@ -162,7 +159,9 @@ static int ecx_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) return CRYPTO_memcmp(akey->pubkey, bkey->pubkey, KEYLEN(a)) == 0; } -static int ecx_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8) +static int ecx_priv_decode_with_libctx(EVP_PKEY *pkey, + const PKCS8_PRIV_KEY_INFO *p8, + OPENSSL_CTX *libctx, const char *propq) { const unsigned char *p; int plen; @@ -182,7 +181,8 @@ static int ecx_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8) plen = ASN1_STRING_length(oct); } - rv = ecx_key_op(pkey, pkey->ameth->pkey_id, palg, p, plen, KEY_OP_PRIVATE); + rv = ecx_key_op(pkey, pkey->ameth->pkey_id, palg, p, plen, KEY_OP_PRIVATE, + libctx, propq); ASN1_STRING_clear_free(oct); return rv; } @@ -310,7 +310,7 @@ static int ecx_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) case ASN1_PKEY_CTRL_SET1_TLS_ENCPT: return ecx_key_op(pkey, pkey->ameth->pkey_id, NULL, arg2, arg1, - KEY_OP_PUBLIC); + KEY_OP_PUBLIC, NULL, NULL); case ASN1_PKEY_CTRL_GET1_TLS_ENCPT: if (pkey->pkey.ecx != NULL) { @@ -345,14 +345,15 @@ static int ecd_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv, size_t len) { + /* TODO(3.0): We should pass a libctx here */ return ecx_key_op(pkey, pkey->ameth->pkey_id, NULL, priv, len, - KEY_OP_PRIVATE); + KEY_OP_PRIVATE, NULL, NULL); } static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len) { return ecx_key_op(pkey, pkey->ameth->pkey_id, NULL, pub, len, - KEY_OP_PUBLIC); + KEY_OP_PUBLIC, NULL, NULL); } static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv, @@ -479,7 +480,7 @@ const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth = { ecx_pub_cmp, ecx_pub_print, - ecx_priv_decode, + NULL, ecx_priv_encode, ecx_priv_print, @@ -510,7 +511,9 @@ const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth = { ecx_get_pub_key, ecx_pkey_dirty_cnt, ecx_pkey_export_to, - x25519_import_from + x25519_import_from, + + ecx_priv_decode_with_libctx }; static int x448_import_from(const OSSL_PARAM params[], void *key) @@ -530,7 +533,7 @@ const EVP_PKEY_ASN1_METHOD ecx448_asn1_meth = { ecx_pub_cmp, ecx_pub_print, - ecx_priv_decode, + NULL, ecx_priv_encode, ecx_priv_print, @@ -561,7 +564,9 @@ const EVP_PKEY_ASN1_METHOD ecx448_asn1_meth = { ecx_get_pub_key, ecx_pkey_dirty_cnt, ecx_pkey_export_to, - x448_import_from + x448_import_from, + + ecx_priv_decode_with_libctx }; static int ecd_size25519(const EVP_PKEY *pkey) @@ -653,7 +658,7 @@ const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth = { ecx_pub_cmp, ecx_pub_print, - ecx_priv_decode, + NULL, ecx_priv_encode, ecx_priv_print, @@ -683,7 +688,9 @@ const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth = { ecx_get_pub_key, ecx_pkey_dirty_cnt, ecx_pkey_export_to, - ed25519_import_from + ed25519_import_from, + + ecx_priv_decode_with_libctx }; static int ed448_import_from(const OSSL_PARAM params[], void *key) @@ -703,7 +710,7 @@ const EVP_PKEY_ASN1_METHOD ed448_asn1_meth = { ecx_pub_cmp, ecx_pub_print, - ecx_priv_decode, + NULL, ecx_priv_encode, ecx_priv_print, @@ -733,12 +740,15 @@ const EVP_PKEY_ASN1_METHOD ed448_asn1_meth = { ecx_get_pub_key, ecx_pkey_dirty_cnt, ecx_pkey_export_to, - ed448_import_from + ed448_import_from, + + ecx_priv_decode_with_libctx }; static int pkey_ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) { - return ecx_key_op(pkey, ctx->pmeth->pkey_id, NULL, NULL, 0, KEY_OP_KEYGEN); + return ecx_key_op(pkey, ctx->pmeth->pkey_id, NULL, NULL, 0, KEY_OP_KEYGEN, + NULL, NULL); } static int validate_ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key,