0c994d54af
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9681)
77 lines
2 KiB
C
77 lines
2 KiB
C
/*
|
|
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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 "crypto/evp.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;
|
|
}
|