mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
75e2c87765
If RAND_add wraps around, XOR with existing. Add test to drbgtest that does the wrap-around. Re-order seeding and stop after first success. Add RAND_poll_ex() Use the DF and therefore lower RANDOMNESS_NEEDED. Also, for child DRBG's, mix in the address as the personalization bits. Centralize the entropy callbacks, from drbg_lib to rand_lib. (Conceptually, entropy is part of the enclosing application.) Thanks to Dr. Matthias St Pierre for the suggestion. Various code cleanups: -Make state an enum; inline RANDerr calls. -Add RAND_POLL_RETRIES (thanks Pauli for the idea) -Remove most RAND_seed calls from rest of library -Rename DRBG_CTX to RAND_DRBG, etc. -Move some code from drbg_lib to drbg_rand; drbg_lib is now only the implementation of NIST DRBG. -Remove blocklength Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/4019)
150 lines
4.0 KiB
C
150 lines
4.0 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 "internal/asn1_int.h"
|
|
#include "internal/evp_int.h"
|
|
#include "internal/x509_int.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;
|
|
}
|