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)
149 lines
4 KiB
C
149 lines
4 KiB
C
/*
|
|
* Copyright 1999-2016 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 <stdlib.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/x509.h>
|
|
#include <openssl/rand.h>
|
|
#include "crypto/asn1.h"
|
|
#include "crypto/evp.h"
|
|
#include "crypto/x509.h"
|
|
|
|
/* Extract a private key from a PKCS8 structure */
|
|
|
|
EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8)
|
|
{
|
|
EVP_PKEY *pkey = NULL;
|
|
const ASN1_OBJECT *algoid;
|
|
char obj_tmp[80];
|
|
|
|
if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8))
|
|
return NULL;
|
|
|
|
if ((pkey = EVP_PKEY_new()) == NULL) {
|
|
EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(algoid))) {
|
|
EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
|
|
i2t_ASN1_OBJECT(obj_tmp, 80, algoid);
|
|
ERR_add_error_data(2, "TYPE=", obj_tmp);
|
|
goto error;
|
|
}
|
|
|
|
if (pkey->ameth->priv_decode) {
|
|
if (!pkey->ameth->priv_decode(pkey, p8)) {
|
|
EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_PRIVATE_KEY_DECODE_ERROR);
|
|
goto error;
|
|
}
|
|
} else {
|
|
EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_METHOD_NOT_SUPPORTED);
|
|
goto error;
|
|
}
|
|
|
|
return pkey;
|
|
|
|
error:
|
|
EVP_PKEY_free(pkey);
|
|
return NULL;
|
|
}
|
|
|
|
/* Turn a private key into a PKCS8 structure */
|
|
|
|
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
|
|
{
|
|
PKCS8_PRIV_KEY_INFO *p8 = PKCS8_PRIV_KEY_INFO_new();
|
|
if (p8 == NULL) {
|
|
EVPerr(EVP_F_EVP_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
if (pkey->ameth) {
|
|
if (pkey->ameth->priv_encode) {
|
|
if (!pkey->ameth->priv_encode(p8, pkey)) {
|
|
EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_PRIVATE_KEY_ENCODE_ERROR);
|
|
goto error;
|
|
}
|
|
} else {
|
|
EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_METHOD_NOT_SUPPORTED);
|
|
goto error;
|
|
}
|
|
} else {
|
|
EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
|
|
goto error;
|
|
}
|
|
return p8;
|
|
error:
|
|
PKCS8_PRIV_KEY_INFO_free(p8);
|
|
return NULL;
|
|
}
|
|
|
|
/* EVP_PKEY attribute functions */
|
|
|
|
int EVP_PKEY_get_attr_count(const EVP_PKEY *key)
|
|
{
|
|
return X509at_get_attr_count(key->attributes);
|
|
}
|
|
|
|
int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos)
|
|
{
|
|
return X509at_get_attr_by_NID(key->attributes, nid, lastpos);
|
|
}
|
|
|
|
int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
|
|
int lastpos)
|
|
{
|
|
return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
|
|
}
|
|
|
|
X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc)
|
|
{
|
|
return X509at_get_attr(key->attributes, loc);
|
|
}
|
|
|
|
X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc)
|
|
{
|
|
return X509at_delete_attr(key->attributes, loc);
|
|
}
|
|
|
|
int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
|
|
{
|
|
if (X509at_add1_attr(&key->attributes, attr))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
|
|
const ASN1_OBJECT *obj, int type,
|
|
const unsigned char *bytes, int len)
|
|
{
|
|
if (X509at_add1_attr_by_OBJ(&key->attributes, obj, type, bytes, len))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
|
|
int nid, int type,
|
|
const unsigned char *bytes, int len)
|
|
{
|
|
if (X509at_add1_attr_by_NID(&key->attributes, nid, type, bytes, len))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
|
|
const char *attrname, int type,
|
|
const unsigned char *bytes, int len)
|
|
{
|
|
if (X509at_add1_attr_by_txt(&key->attributes, attrname, type, bytes, len))
|
|
return 1;
|
|
return 0;
|
|
}
|