a860031621
It turns out that the strictness that was implemented in EVP_PKEY_asn1_new() (see Github openssl/openssl#6880) was badly placed for some usages, and that it's better to do this check only when the method is getting registered. Fixes #7758 Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7847)
451 lines
14 KiB
C
451 lines
14 KiB
C
/*
|
|
* Copyright 2006-2018 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 "e_os.h" /* for strncasecmp */
|
|
#include "internal/cryptlib.h"
|
|
#include <stdio.h>
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/engine.h>
|
|
#include "internal/asn1_int.h"
|
|
#include "internal/evp_int.h"
|
|
|
|
#include "standard_methods.h"
|
|
|
|
typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
|
|
static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
|
|
|
|
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
|
|
const EVP_PKEY_ASN1_METHOD *, ameth);
|
|
|
|
static int ameth_cmp(const EVP_PKEY_ASN1_METHOD *const *a,
|
|
const EVP_PKEY_ASN1_METHOD *const *b)
|
|
{
|
|
return ((*a)->pkey_id - (*b)->pkey_id);
|
|
}
|
|
|
|
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
|
|
const EVP_PKEY_ASN1_METHOD *, ameth);
|
|
|
|
int EVP_PKEY_asn1_get_count(void)
|
|
{
|
|
int num = OSSL_NELEM(standard_methods);
|
|
if (app_methods)
|
|
num += sk_EVP_PKEY_ASN1_METHOD_num(app_methods);
|
|
return num;
|
|
}
|
|
|
|
const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)
|
|
{
|
|
int num = OSSL_NELEM(standard_methods);
|
|
if (idx < 0)
|
|
return NULL;
|
|
if (idx < num)
|
|
return standard_methods[idx];
|
|
idx -= num;
|
|
return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
|
|
}
|
|
|
|
static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
|
|
{
|
|
EVP_PKEY_ASN1_METHOD tmp;
|
|
const EVP_PKEY_ASN1_METHOD *t = &tmp, **ret;
|
|
tmp.pkey_id = type;
|
|
if (app_methods) {
|
|
int idx;
|
|
idx = sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp);
|
|
if (idx >= 0)
|
|
return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
|
|
}
|
|
ret = OBJ_bsearch_ameth(&t, standard_methods, OSSL_NELEM(standard_methods));
|
|
if (!ret || !*ret)
|
|
return NULL;
|
|
return *ret;
|
|
}
|
|
|
|
/*
|
|
* Find an implementation of an ASN1 algorithm. If 'pe' is not NULL also
|
|
* search through engines and set *pe to a functional reference to the engine
|
|
* implementing 'type' or NULL if no engine implements it.
|
|
*/
|
|
|
|
const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
|
|
{
|
|
const EVP_PKEY_ASN1_METHOD *t;
|
|
|
|
for (;;) {
|
|
t = pkey_asn1_find(type);
|
|
if (!t || !(t->pkey_flags & ASN1_PKEY_ALIAS))
|
|
break;
|
|
type = t->pkey_base_id;
|
|
}
|
|
if (pe) {
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
ENGINE *e;
|
|
/* type will contain the final unaliased type */
|
|
e = ENGINE_get_pkey_asn1_meth_engine(type);
|
|
if (e) {
|
|
*pe = e;
|
|
return ENGINE_get_pkey_asn1_meth(e, type);
|
|
}
|
|
#endif
|
|
*pe = NULL;
|
|
}
|
|
return t;
|
|
}
|
|
|
|
const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
|
|
const char *str, int len)
|
|
{
|
|
int i;
|
|
const EVP_PKEY_ASN1_METHOD *ameth = NULL;
|
|
|
|
if (len == -1)
|
|
len = strlen(str);
|
|
if (pe) {
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
ENGINE *e;
|
|
ameth = ENGINE_pkey_asn1_find_str(&e, str, len);
|
|
if (ameth) {
|
|
/*
|
|
* Convert structural into functional reference
|
|
*/
|
|
if (!ENGINE_init(e))
|
|
ameth = NULL;
|
|
ENGINE_free(e);
|
|
*pe = e;
|
|
return ameth;
|
|
}
|
|
#endif
|
|
*pe = NULL;
|
|
}
|
|
for (i = EVP_PKEY_asn1_get_count(); i-- > 0; ) {
|
|
ameth = EVP_PKEY_asn1_get0(i);
|
|
if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
|
|
continue;
|
|
if ((int)strlen(ameth->pem_str) == len
|
|
&& strncasecmp(ameth->pem_str, str, len) == 0)
|
|
return ameth;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
|
|
{
|
|
EVP_PKEY_ASN1_METHOD tmp = { 0, };
|
|
|
|
/*
|
|
* One of the following must be true:
|
|
*
|
|
* pem_str == NULL AND ASN1_PKEY_ALIAS is set
|
|
* pem_str != NULL AND ASN1_PKEY_ALIAS is clear
|
|
*
|
|
* Anything else is an error and may lead to a corrupt ASN1 method table
|
|
*/
|
|
if (!((ameth->pem_str == NULL
|
|
&& (ameth->pkey_flags & ASN1_PKEY_ALIAS) != 0)
|
|
|| (ameth->pem_str != NULL
|
|
&& (ameth->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
|
|
EVPerr(EVP_F_EVP_PKEY_ASN1_ADD0, ERR_R_PASSED_INVALID_ARGUMENT);
|
|
return 0;
|
|
}
|
|
|
|
if (app_methods == NULL) {
|
|
app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);
|
|
if (app_methods == NULL)
|
|
return 0;
|
|
}
|
|
|
|
tmp.pkey_id = ameth->pkey_id;
|
|
if (sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp) >= 0) {
|
|
EVPerr(EVP_F_EVP_PKEY_ASN1_ADD0,
|
|
EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED);
|
|
return 0;
|
|
}
|
|
|
|
if (!sk_EVP_PKEY_ASN1_METHOD_push(app_methods, ameth))
|
|
return 0;
|
|
sk_EVP_PKEY_ASN1_METHOD_sort(app_methods);
|
|
return 1;
|
|
}
|
|
|
|
int EVP_PKEY_asn1_add_alias(int to, int from)
|
|
{
|
|
EVP_PKEY_ASN1_METHOD *ameth;
|
|
ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL, NULL);
|
|
if (ameth == NULL)
|
|
return 0;
|
|
ameth->pkey_base_id = to;
|
|
if (!EVP_PKEY_asn1_add0(ameth)) {
|
|
EVP_PKEY_asn1_free(ameth);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id,
|
|
int *ppkey_flags, const char **pinfo,
|
|
const char **ppem_str,
|
|
const EVP_PKEY_ASN1_METHOD *ameth)
|
|
{
|
|
if (!ameth)
|
|
return 0;
|
|
if (ppkey_id)
|
|
*ppkey_id = ameth->pkey_id;
|
|
if (ppkey_base_id)
|
|
*ppkey_base_id = ameth->pkey_base_id;
|
|
if (ppkey_flags)
|
|
*ppkey_flags = ameth->pkey_flags;
|
|
if (pinfo)
|
|
*pinfo = ameth->info;
|
|
if (ppem_str)
|
|
*ppem_str = ameth->pem_str;
|
|
return 1;
|
|
}
|
|
|
|
const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
|
|
{
|
|
return pkey->ameth;
|
|
}
|
|
|
|
EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
|
|
const char *pem_str, const char *info)
|
|
{
|
|
EVP_PKEY_ASN1_METHOD *ameth = OPENSSL_zalloc(sizeof(*ameth));
|
|
|
|
if (ameth == NULL)
|
|
return NULL;
|
|
|
|
ameth->pkey_id = id;
|
|
ameth->pkey_base_id = id;
|
|
ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;
|
|
|
|
if (info) {
|
|
ameth->info = OPENSSL_strdup(info);
|
|
if (!ameth->info)
|
|
goto err;
|
|
}
|
|
|
|
if (pem_str) {
|
|
ameth->pem_str = OPENSSL_strdup(pem_str);
|
|
if (!ameth->pem_str)
|
|
goto err;
|
|
}
|
|
|
|
return ameth;
|
|
|
|
err:
|
|
EVP_PKEY_asn1_free(ameth);
|
|
return NULL;
|
|
|
|
}
|
|
|
|
void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
|
|
const EVP_PKEY_ASN1_METHOD *src)
|
|
{
|
|
|
|
dst->pub_decode = src->pub_decode;
|
|
dst->pub_encode = src->pub_encode;
|
|
dst->pub_cmp = src->pub_cmp;
|
|
dst->pub_print = src->pub_print;
|
|
|
|
dst->priv_decode = src->priv_decode;
|
|
dst->priv_encode = src->priv_encode;
|
|
dst->priv_print = src->priv_print;
|
|
|
|
dst->old_priv_encode = src->old_priv_encode;
|
|
dst->old_priv_decode = src->old_priv_decode;
|
|
|
|
dst->pkey_size = src->pkey_size;
|
|
dst->pkey_bits = src->pkey_bits;
|
|
|
|
dst->param_decode = src->param_decode;
|
|
dst->param_encode = src->param_encode;
|
|
dst->param_missing = src->param_missing;
|
|
dst->param_copy = src->param_copy;
|
|
dst->param_cmp = src->param_cmp;
|
|
dst->param_print = src->param_print;
|
|
|
|
dst->pkey_free = src->pkey_free;
|
|
dst->pkey_ctrl = src->pkey_ctrl;
|
|
|
|
dst->item_sign = src->item_sign;
|
|
dst->item_verify = src->item_verify;
|
|
|
|
dst->siginf_set = src->siginf_set;
|
|
|
|
dst->pkey_check = src->pkey_check;
|
|
|
|
}
|
|
|
|
void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
|
|
{
|
|
if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC)) {
|
|
OPENSSL_free(ameth->pem_str);
|
|
OPENSSL_free(ameth->info);
|
|
OPENSSL_free(ameth);
|
|
}
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pub_decode) (EVP_PKEY *pk,
|
|
X509_PUBKEY *pub),
|
|
int (*pub_encode) (X509_PUBKEY *pub,
|
|
const EVP_PKEY *pk),
|
|
int (*pub_cmp) (const EVP_PKEY *a,
|
|
const EVP_PKEY *b),
|
|
int (*pub_print) (BIO *out,
|
|
const EVP_PKEY *pkey,
|
|
int indent, ASN1_PCTX *pctx),
|
|
int (*pkey_size) (const EVP_PKEY *pk),
|
|
int (*pkey_bits) (const EVP_PKEY *pk))
|
|
{
|
|
ameth->pub_decode = pub_decode;
|
|
ameth->pub_encode = pub_encode;
|
|
ameth->pub_cmp = pub_cmp;
|
|
ameth->pub_print = pub_print;
|
|
ameth->pkey_size = pkey_size;
|
|
ameth->pkey_bits = pkey_bits;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*priv_decode) (EVP_PKEY *pk,
|
|
const PKCS8_PRIV_KEY_INFO
|
|
*p8inf),
|
|
int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
|
|
const EVP_PKEY *pk),
|
|
int (*priv_print) (BIO *out,
|
|
const EVP_PKEY *pkey,
|
|
int indent,
|
|
ASN1_PCTX *pctx))
|
|
{
|
|
ameth->priv_decode = priv_decode;
|
|
ameth->priv_encode = priv_encode;
|
|
ameth->priv_print = priv_print;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*param_decode) (EVP_PKEY *pkey,
|
|
const unsigned char **pder,
|
|
int derlen),
|
|
int (*param_encode) (const EVP_PKEY *pkey,
|
|
unsigned char **pder),
|
|
int (*param_missing) (const EVP_PKEY *pk),
|
|
int (*param_copy) (EVP_PKEY *to,
|
|
const EVP_PKEY *from),
|
|
int (*param_cmp) (const EVP_PKEY *a,
|
|
const EVP_PKEY *b),
|
|
int (*param_print) (BIO *out,
|
|
const EVP_PKEY *pkey,
|
|
int indent, ASN1_PCTX *pctx))
|
|
{
|
|
ameth->param_decode = param_decode;
|
|
ameth->param_encode = param_encode;
|
|
ameth->param_missing = param_missing;
|
|
ameth->param_copy = param_copy;
|
|
ameth->param_cmp = param_cmp;
|
|
ameth->param_print = param_print;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
|
|
void (*pkey_free) (EVP_PKEY *pkey))
|
|
{
|
|
ameth->pkey_free = pkey_free;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
|
|
long arg1, void *arg2))
|
|
{
|
|
ameth->pkey_ctrl = pkey_ctrl;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pkey_security_bits) (const EVP_PKEY
|
|
*pk))
|
|
{
|
|
ameth->pkey_security_bits = pkey_security_bits;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*item_verify) (EVP_MD_CTX *ctx,
|
|
const ASN1_ITEM *it,
|
|
void *asn,
|
|
X509_ALGOR *a,
|
|
ASN1_BIT_STRING *sig,
|
|
EVP_PKEY *pkey),
|
|
int (*item_sign) (EVP_MD_CTX *ctx,
|
|
const ASN1_ITEM *it,
|
|
void *asn,
|
|
X509_ALGOR *alg1,
|
|
X509_ALGOR *alg2,
|
|
ASN1_BIT_STRING *sig))
|
|
{
|
|
ameth->item_sign = item_sign;
|
|
ameth->item_verify = item_verify;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_siginf(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*siginf_set) (X509_SIG_INFO *siginf,
|
|
const X509_ALGOR *alg,
|
|
const ASN1_STRING *sig))
|
|
{
|
|
ameth->siginf_set = siginf_set;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pkey_check) (const EVP_PKEY *pk))
|
|
{
|
|
ameth->pkey_check = pkey_check;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pkey_pub_check) (const EVP_PKEY *pk))
|
|
{
|
|
ameth->pkey_public_check = pkey_pub_check;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*pkey_param_check) (const EVP_PKEY *pk))
|
|
{
|
|
ameth->pkey_param_check = pkey_param_check;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_set_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*set_priv_key) (EVP_PKEY *pk,
|
|
const unsigned char
|
|
*priv,
|
|
size_t len))
|
|
{
|
|
ameth->set_priv_key = set_priv_key;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_set_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*set_pub_key) (EVP_PKEY *pk,
|
|
const unsigned char *pub,
|
|
size_t len))
|
|
{
|
|
ameth->set_pub_key = set_pub_key;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*get_priv_key) (const EVP_PKEY *pk,
|
|
unsigned char *priv,
|
|
size_t *len))
|
|
{
|
|
ameth->get_priv_key = get_priv_key;
|
|
}
|
|
|
|
void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
|
|
int (*get_pub_key) (const EVP_PKEY *pk,
|
|
unsigned char *pub,
|
|
size_t *len))
|
|
{
|
|
ameth->get_pub_key = get_pub_key;
|
|
}
|