2aa2beb06c
o2i_ECPublicKey() requires an EC_KEY structure filled with an EC_GROUP. o2i_ECPublicKey() is called by d2i_PublicKey(). In order to fulfill the o2i_ECPublicKey()'s requirement, d2i_PublicKey() needs to be called with an EVP_PKEY with an EC_KEY containing an EC_GROUP. However, the call to EVP_PKEY_set_type() frees any existing key structure inside the EVP_PKEY, thus freeing the EC_KEY with the EC_GROUP that o2i_ECPublicKey() needs. This means you can't d2i_PublicKey() for an EC key... The fix is to check to see if the type is already set appropriately, and if so, not call EVP_PKEY_set_type(). Reviewed-by: Paul Yang <yang.yang@baishancloud.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8168)
77 lines
2 KiB
C
77 lines
2 KiB
C
/*
|
|
* Copyright 1995-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 "internal/cryptlib.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/rsa.h>
|
|
#include <openssl/dsa.h>
|
|
#include <openssl/ec.h>
|
|
|
|
#include "internal/evp_int.h"
|
|
|
|
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
|
|
long length)
|
|
{
|
|
EVP_PKEY *ret;
|
|
|
|
if ((a == NULL) || (*a == NULL)) {
|
|
if ((ret = EVP_PKEY_new()) == NULL) {
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
|
|
return NULL;
|
|
}
|
|
} else
|
|
ret = *a;
|
|
|
|
if (type != EVP_PKEY_id(ret) && !EVP_PKEY_set_type(ret, type)) {
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
|
|
goto err;
|
|
}
|
|
|
|
switch (EVP_PKEY_id(ret)) {
|
|
#ifndef OPENSSL_NO_RSA
|
|
case EVP_PKEY_RSA:
|
|
if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) {
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
#ifndef OPENSSL_NO_DSA
|
|
case EVP_PKEY_DSA:
|
|
/* TMP UGLY CAST */
|
|
if (!d2i_DSAPublicKey(&ret->pkey.dsa, pp, length)) {
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
#ifndef OPENSSL_NO_EC
|
|
case EVP_PKEY_EC:
|
|
if (!o2i_ECPublicKey(&ret->pkey.ec, pp, length)) {
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
default:
|
|
ASN1err(ASN1_F_D2I_PUBLICKEY, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
|
|
goto err;
|
|
}
|
|
if (a != NULL)
|
|
(*a) = ret;
|
|
return ret;
|
|
err:
|
|
if (a == NULL || *a != ret)
|
|
EVP_PKEY_free(ret);
|
|
return NULL;
|
|
}
|