mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
b305452f69
The KEYMGMT libcrypto <-> provider interface currently makes a few assumptions: 1. provider side domain parameters and key data isn't mutable. In other words, as soon as a key has been created in any (loaded, imported data, ...), it's set in stone. 2. provider side domain parameters can be strictly separated from the key data. This does work for the most part, but there are places where that's a bit too rigid for the functionality that the EVP_PKEY API delivers. Key data needs to be mutable to allow the flexibility that functions like EVP_PKEY_copy_parameters promise, as well as to provide the combinations of data that an EVP_PKEY is generally assumed to be able to hold: - domain parameters only - public key only - public key + private key - domain parameters + public key - domain parameters + public key + private key To remedy all this, we: 1. let go of the distinction between domain parameters and key material proper in the libcrypto <-> provider interface. As a consequence, functions that still need it gain a selection argument, which is a set of bits that indicate what parts of the key object are to be considered in a specific call. This allows a reduction of very similar functions into one. 2. Rework the libcrypto <-> provider interface so provider side key objects are created and destructed with a separate function, and get their data filled and extracted in through import and export. (future work will see other key object constructors and other functions to fill them with data) Fixes #10979 squash! Redesign the KEYMGMT libcrypto <-> provider interface - the basics Remedy 1 needs a rewrite: Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/11006)
445 lines
13 KiB
C
445 lines
13 KiB
C
/*
|
|
* Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/evp.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "crypto/evp.h"
|
|
#include "internal/provider.h"
|
|
#include "evp_local.h"
|
|
|
|
static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation)
|
|
{
|
|
int ret = 0;
|
|
void *provkey = NULL;
|
|
EVP_ASYM_CIPHER *cipher = NULL;
|
|
EVP_KEYMGMT *tmp_keymgmt = NULL;
|
|
const char *supported_ciph = NULL;
|
|
|
|
if (ctx == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
|
|
evp_pkey_ctx_free_old_ops(ctx);
|
|
ctx->operation = operation;
|
|
|
|
/*
|
|
* TODO when we stop falling back to legacy, this and the ERR_pop_to_mark()
|
|
* calls can be removed.
|
|
*/
|
|
ERR_set_mark();
|
|
|
|
if (ctx->keytype == NULL || ctx->engine != NULL)
|
|
goto legacy;
|
|
|
|
/* Ensure that the key is provided. If not, go legacy */
|
|
tmp_keymgmt = ctx->keymgmt;
|
|
provkey = evp_pkey_make_provided(ctx->pkey, ctx->libctx,
|
|
&tmp_keymgmt, ctx->propquery);
|
|
if (provkey == NULL)
|
|
goto legacy;
|
|
if (!EVP_KEYMGMT_up_ref(tmp_keymgmt)) {
|
|
ERR_clear_last_mark();
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
|
|
goto err;
|
|
}
|
|
EVP_KEYMGMT_free(ctx->keymgmt);
|
|
ctx->keymgmt = tmp_keymgmt;
|
|
|
|
if (ctx->keymgmt->query_operation_name != NULL)
|
|
supported_ciph =
|
|
ctx->keymgmt->query_operation_name(OSSL_OP_ASYM_CIPHER);
|
|
|
|
/*
|
|
* If we didn't get a supported ciph, assume there is one with the
|
|
* same name as the key type.
|
|
*/
|
|
if (supported_ciph == NULL)
|
|
supported_ciph = ctx->keytype;
|
|
|
|
/*
|
|
* Because we cleared out old ops, we shouldn't need to worry about
|
|
* checking if cipher is already there.
|
|
*/
|
|
cipher =
|
|
EVP_ASYM_CIPHER_fetch(ctx->libctx, supported_ciph, ctx->propquery);
|
|
|
|
if (cipher == NULL
|
|
|| (EVP_KEYMGMT_provider(ctx->keymgmt)
|
|
!= EVP_ASYM_CIPHER_provider(cipher))) {
|
|
/*
|
|
* We don't need to free ctx->keymgmt here, as it's not necessarily
|
|
* tied to this operation. It will be freed by EVP_PKEY_CTX_free().
|
|
*/
|
|
EVP_ASYM_CIPHER_free(cipher);
|
|
goto legacy;
|
|
}
|
|
|
|
/*
|
|
* TODO remove this when legacy is gone
|
|
* If we don't have the full support we need with provided methods,
|
|
* let's go see if legacy does.
|
|
*/
|
|
ERR_pop_to_mark();
|
|
|
|
/* No more legacy from here down to legacy: */
|
|
|
|
ctx->op.ciph.cipher = cipher;
|
|
ctx->op.ciph.ciphprovctx = cipher->newctx(ossl_provider_ctx(cipher->prov));
|
|
if (ctx->op.ciph.ciphprovctx == NULL) {
|
|
/* The provider key can stay in the cache */
|
|
EVPerr(0, EVP_R_INITIALIZATION_ERROR);
|
|
goto err;
|
|
}
|
|
|
|
switch (operation) {
|
|
case EVP_PKEY_OP_ENCRYPT:
|
|
if (cipher->encrypt_init == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
ret = -2;
|
|
goto err;
|
|
}
|
|
ret = cipher->encrypt_init(ctx->op.ciph.ciphprovctx, provkey);
|
|
break;
|
|
case EVP_PKEY_OP_DECRYPT:
|
|
if (cipher->decrypt_init == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
ret = -2;
|
|
goto err;
|
|
}
|
|
ret = cipher->decrypt_init(ctx->op.ciph.ciphprovctx, provkey);
|
|
break;
|
|
default:
|
|
EVPerr(0, EVP_R_INITIALIZATION_ERROR);
|
|
goto err;
|
|
}
|
|
|
|
if (ret <= 0) {
|
|
cipher->freectx(ctx->op.ciph.ciphprovctx);
|
|
ctx->op.ciph.ciphprovctx = NULL;
|
|
goto err;
|
|
}
|
|
return 1;
|
|
|
|
legacy:
|
|
/*
|
|
* TODO remove this when legacy is gone
|
|
* If we don't have the full support we need with provided methods,
|
|
* let's go see if legacy does.
|
|
*/
|
|
ERR_pop_to_mark();
|
|
|
|
if (ctx->pmeth == NULL || ctx->pmeth->encrypt == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
switch(ctx->operation) {
|
|
case EVP_PKEY_OP_ENCRYPT:
|
|
if (ctx->pmeth->encrypt_init == NULL)
|
|
return 1;
|
|
ret = ctx->pmeth->encrypt_init(ctx);
|
|
break;
|
|
case EVP_PKEY_OP_DECRYPT:
|
|
if (ctx->pmeth->decrypt_init == NULL)
|
|
return 1;
|
|
ret = ctx->pmeth->decrypt_init(ctx);
|
|
break;
|
|
default:
|
|
EVPerr(0, EVP_R_INITIALIZATION_ERROR);
|
|
ret = -1;
|
|
}
|
|
|
|
err:
|
|
if (ret <= 0)
|
|
ctx->operation = EVP_PKEY_OP_UNDEFINED;
|
|
return ret;
|
|
}
|
|
|
|
int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
|
|
{
|
|
return evp_pkey_asym_cipher_init(ctx, EVP_PKEY_OP_ENCRYPT);
|
|
}
|
|
|
|
int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
|
|
unsigned char *out, size_t *outlen,
|
|
const unsigned char *in, size_t inlen)
|
|
{
|
|
int ret;
|
|
|
|
if (ctx == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
|
|
if (ctx->operation != EVP_PKEY_OP_ENCRYPT) {
|
|
EVPerr(0, EVP_R_OPERATON_NOT_INITIALIZED);
|
|
return -1;
|
|
}
|
|
|
|
if (ctx->op.ciph.ciphprovctx == NULL)
|
|
goto legacy;
|
|
|
|
ret = ctx->op.ciph.cipher->encrypt(ctx->op.ciph.ciphprovctx, out, outlen,
|
|
(out == NULL ? 0 : *outlen), in, inlen);
|
|
return ret;
|
|
|
|
legacy:
|
|
if (ctx->pmeth == NULL || ctx->pmeth->encrypt == NULL) {
|
|
EVPerr(EVP_F_EVP_PKEY_ENCRYPT,
|
|
EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
|
|
return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
|
|
}
|
|
|
|
int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
|
|
{
|
|
return evp_pkey_asym_cipher_init(ctx, EVP_PKEY_OP_DECRYPT);
|
|
}
|
|
|
|
int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
|
|
unsigned char *out, size_t *outlen,
|
|
const unsigned char *in, size_t inlen)
|
|
{
|
|
int ret;
|
|
|
|
if (ctx == NULL) {
|
|
EVPerr(0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
|
|
if (ctx->operation != EVP_PKEY_OP_DECRYPT) {
|
|
EVPerr(0, EVP_R_OPERATON_NOT_INITIALIZED);
|
|
return -1;
|
|
}
|
|
|
|
if (ctx->op.ciph.ciphprovctx == NULL)
|
|
goto legacy;
|
|
|
|
ret = ctx->op.ciph.cipher->decrypt(ctx->op.ciph.ciphprovctx, out, outlen,
|
|
(out == NULL ? 0 : *outlen), in, inlen);
|
|
return ret;
|
|
|
|
legacy:
|
|
if (ctx->pmeth == NULL || ctx->pmeth->decrypt == NULL) {
|
|
EVPerr(EVP_F_EVP_PKEY_DECRYPT,
|
|
EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
|
return -2;
|
|
}
|
|
M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
|
|
return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
|
|
}
|
|
|
|
|
|
static EVP_ASYM_CIPHER *evp_asym_cipher_new(OSSL_PROVIDER *prov)
|
|
{
|
|
EVP_ASYM_CIPHER *cipher = OPENSSL_zalloc(sizeof(EVP_ASYM_CIPHER));
|
|
|
|
if (cipher == NULL) {
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
cipher->lock = CRYPTO_THREAD_lock_new();
|
|
if (cipher->lock == NULL) {
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE);
|
|
OPENSSL_free(cipher);
|
|
return NULL;
|
|
}
|
|
cipher->prov = prov;
|
|
ossl_provider_up_ref(prov);
|
|
cipher->refcnt = 1;
|
|
|
|
return cipher;
|
|
}
|
|
|
|
static void *evp_asym_cipher_from_dispatch(int name_id,
|
|
const OSSL_DISPATCH *fns,
|
|
OSSL_PROVIDER *prov)
|
|
{
|
|
EVP_ASYM_CIPHER *cipher = NULL;
|
|
int ctxfncnt = 0, encfncnt = 0, decfncnt = 0;
|
|
int gparamfncnt = 0, sparamfncnt = 0;
|
|
|
|
if ((cipher = evp_asym_cipher_new(prov)) == NULL) {
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE);
|
|
goto err;
|
|
}
|
|
|
|
cipher->name_id = name_id;
|
|
|
|
for (; fns->function_id != 0; fns++) {
|
|
switch (fns->function_id) {
|
|
case OSSL_FUNC_ASYM_CIPHER_NEWCTX:
|
|
if (cipher->newctx != NULL)
|
|
break;
|
|
cipher->newctx = OSSL_get_OP_asym_cipher_newctx(fns);
|
|
ctxfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_ENCRYPT_INIT:
|
|
if (cipher->encrypt_init != NULL)
|
|
break;
|
|
cipher->encrypt_init = OSSL_get_OP_asym_cipher_encrypt_init(fns);
|
|
encfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_ENCRYPT:
|
|
if (cipher->encrypt != NULL)
|
|
break;
|
|
cipher->encrypt = OSSL_get_OP_asym_cipher_encrypt(fns);
|
|
encfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_DECRYPT_INIT:
|
|
if (cipher->decrypt_init != NULL)
|
|
break;
|
|
cipher->decrypt_init = OSSL_get_OP_asym_cipher_decrypt_init(fns);
|
|
decfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_DECRYPT:
|
|
if (cipher->decrypt != NULL)
|
|
break;
|
|
cipher->decrypt = OSSL_get_OP_asym_cipher_decrypt(fns);
|
|
decfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_FREECTX:
|
|
if (cipher->freectx != NULL)
|
|
break;
|
|
cipher->freectx = OSSL_get_OP_asym_cipher_freectx(fns);
|
|
ctxfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_DUPCTX:
|
|
if (cipher->dupctx != NULL)
|
|
break;
|
|
cipher->dupctx = OSSL_get_OP_asym_cipher_dupctx(fns);
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_GET_CTX_PARAMS:
|
|
if (cipher->get_ctx_params != NULL)
|
|
break;
|
|
cipher->get_ctx_params
|
|
= OSSL_get_OP_asym_cipher_get_ctx_params(fns);
|
|
gparamfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_GETTABLE_CTX_PARAMS:
|
|
if (cipher->gettable_ctx_params != NULL)
|
|
break;
|
|
cipher->gettable_ctx_params
|
|
= OSSL_get_OP_asym_cipher_gettable_ctx_params(fns);
|
|
gparamfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_SET_CTX_PARAMS:
|
|
if (cipher->set_ctx_params != NULL)
|
|
break;
|
|
cipher->set_ctx_params
|
|
= OSSL_get_OP_asym_cipher_set_ctx_params(fns);
|
|
sparamfncnt++;
|
|
break;
|
|
case OSSL_FUNC_ASYM_CIPHER_SETTABLE_CTX_PARAMS:
|
|
if (cipher->settable_ctx_params != NULL)
|
|
break;
|
|
cipher->settable_ctx_params
|
|
= OSSL_get_OP_asym_cipher_settable_ctx_params(fns);
|
|
sparamfncnt++;
|
|
break;
|
|
}
|
|
}
|
|
if (ctxfncnt != 2
|
|
|| (encfncnt != 0 && encfncnt != 2)
|
|
|| (decfncnt != 0 && decfncnt != 2)
|
|
|| (encfncnt != 2 && decfncnt != 2)
|
|
|| (gparamfncnt != 0 && gparamfncnt != 2)
|
|
|| (sparamfncnt != 0 && sparamfncnt != 2)) {
|
|
/*
|
|
* In order to be a consistent set of functions we must have at least
|
|
* a set of context functions (newctx and freectx) as well as a pair of
|
|
* "cipher" functions: (encrypt_init, encrypt) or
|
|
* (decrypt_init decrypt). set_ctx_params and settable_ctx_params are
|
|
* optional, but if one of them is present then the other one must also
|
|
* be present. The same applies to get_ctx_params and
|
|
* gettable_ctx_params. The dupctx function is optional.
|
|
*/
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
|
|
goto err;
|
|
}
|
|
|
|
return cipher;
|
|
err:
|
|
EVP_ASYM_CIPHER_free(cipher);
|
|
return NULL;
|
|
}
|
|
|
|
void EVP_ASYM_CIPHER_free(EVP_ASYM_CIPHER *cipher)
|
|
{
|
|
if (cipher != NULL) {
|
|
int i;
|
|
|
|
CRYPTO_DOWN_REF(&cipher->refcnt, &i, cipher->lock);
|
|
if (i > 0)
|
|
return;
|
|
ossl_provider_free(cipher->prov);
|
|
CRYPTO_THREAD_lock_free(cipher->lock);
|
|
OPENSSL_free(cipher);
|
|
}
|
|
}
|
|
|
|
int EVP_ASYM_CIPHER_up_ref(EVP_ASYM_CIPHER *cipher)
|
|
{
|
|
int ref = 0;
|
|
|
|
CRYPTO_UP_REF(&cipher->refcnt, &ref, cipher->lock);
|
|
return 1;
|
|
}
|
|
|
|
OSSL_PROVIDER *EVP_ASYM_CIPHER_provider(const EVP_ASYM_CIPHER *cipher)
|
|
{
|
|
return cipher->prov;
|
|
}
|
|
|
|
EVP_ASYM_CIPHER *EVP_ASYM_CIPHER_fetch(OPENSSL_CTX *ctx, const char *algorithm,
|
|
const char *properties)
|
|
{
|
|
return evp_generic_fetch(ctx, OSSL_OP_ASYM_CIPHER, algorithm, properties,
|
|
evp_asym_cipher_from_dispatch,
|
|
(int (*)(void *))EVP_ASYM_CIPHER_up_ref,
|
|
(void (*)(void *))EVP_ASYM_CIPHER_free);
|
|
}
|
|
|
|
int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name)
|
|
{
|
|
return evp_is_a(cipher->prov, cipher->name_id, NULL, name);
|
|
}
|
|
|
|
int EVP_ASYM_CIPHER_number(const EVP_ASYM_CIPHER *cipher)
|
|
{
|
|
return cipher->name_id;
|
|
}
|
|
|
|
void EVP_ASYM_CIPHER_do_all_provided(OPENSSL_CTX *libctx,
|
|
void (*fn)(EVP_ASYM_CIPHER *cipher,
|
|
void *arg),
|
|
void *arg)
|
|
{
|
|
evp_generic_do_all(libctx, OSSL_OP_ASYM_CIPHER,
|
|
(void (*)(void *, void *))fn, arg,
|
|
evp_asym_cipher_from_dispatch,
|
|
(void (*)(void *))EVP_ASYM_CIPHER_free);
|
|
}
|
|
|
|
|
|
void EVP_ASYM_CIPHER_names_do_all(const EVP_ASYM_CIPHER *cipher,
|
|
void (*fn)(const char *name, void *data),
|
|
void *data)
|
|
{
|
|
if (cipher->prov != NULL)
|
|
evp_names_do_all(cipher->prov, cipher->name_id, fn, data);
|
|
}
|
|
|