mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
e077455e9e
Since OPENSSL_malloc() and friends report ERR_R_MALLOC_FAILURE, and
at least handle the file name and line number they are called from,
there's no need to report ERR_R_MALLOC_FAILURE where they are called
directly, or when SSLfatal() and RLAYERfatal() is used, the reason
`ERR_R_MALLOC_FAILURE` is changed to `ERR_R_CRYPTO_LIB`.
There were a number of places where `ERR_R_MALLOC_FAILURE` was reported
even though it was a function from a different sub-system that was
called. Those places are changed to report ERR_R_{lib}_LIB, where
{lib} is the name of that sub-system.
Some of them are tricky to get right, as we have a lot of functions
that belong in the ASN1 sub-system, and all the `sk_` calls or from
the CRYPTO sub-system.
Some extra adaptation was necessary where there were custom OPENSSL_malloc()
wrappers, and some bugs are fixed alongside these changes.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19301)
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
/*
|
|
* Copyright 1995-2020 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/asn1.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/x509.h"
|
|
#include <openssl/objects.h>
|
|
#include <openssl/buffer.h>
|
|
|
|
X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
|
|
{
|
|
X509 *ret = NULL;
|
|
X509_CINF *xi = NULL;
|
|
const X509_NAME *xn;
|
|
EVP_PKEY *pubkey = NULL;
|
|
|
|
if ((ret = X509_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_X509, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
/* duplicate the request */
|
|
xi = &ret->cert_info;
|
|
|
|
if (sk_X509_ATTRIBUTE_num(r->req_info.attributes) != 0) {
|
|
if ((xi->version = ASN1_INTEGER_new()) == NULL)
|
|
goto err;
|
|
if (!ASN1_INTEGER_set(xi->version, 2))
|
|
goto err;
|
|
/*- xi->extensions=ri->attributes; <- bad, should not ever be done
|
|
ri->attributes=NULL; */
|
|
}
|
|
|
|
xn = X509_REQ_get_subject_name(r);
|
|
if (X509_set_subject_name(ret, xn) == 0)
|
|
goto err;
|
|
if (X509_set_issuer_name(ret, xn) == 0)
|
|
goto err;
|
|
|
|
if (X509_gmtime_adj(xi->validity.notBefore, 0) == NULL)
|
|
goto err;
|
|
if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) ==
|
|
NULL)
|
|
goto err;
|
|
|
|
pubkey = X509_REQ_get0_pubkey(r);
|
|
if (pubkey == NULL || !X509_set_pubkey(ret, pubkey))
|
|
goto err;
|
|
|
|
if (!X509_sign(ret, pkey, EVP_md5()))
|
|
goto err;
|
|
return ret;
|
|
|
|
err:
|
|
X509_free(ret);
|
|
return NULL;
|
|
}
|