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)
76 lines
2.0 KiB
C
76 lines
2.0 KiB
C
/*
|
|
* Copyright 1999-2021 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/x509.h>
|
|
|
|
int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
|
|
{
|
|
if ((x == NULL) || (x->spkac == NULL))
|
|
return 0;
|
|
return X509_PUBKEY_set(&(x->spkac->pubkey), pkey);
|
|
}
|
|
|
|
EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
|
|
{
|
|
if ((x == NULL) || (x->spkac == NULL))
|
|
return NULL;
|
|
return X509_PUBKEY_get(x->spkac->pubkey);
|
|
}
|
|
|
|
/* Load a Netscape SPKI from a base64 encoded string */
|
|
|
|
NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len)
|
|
{
|
|
unsigned char *spki_der;
|
|
const unsigned char *p;
|
|
int spki_len;
|
|
NETSCAPE_SPKI *spki;
|
|
if (len <= 0)
|
|
len = strlen(str);
|
|
if ((spki_der = OPENSSL_malloc(len + 1)) == NULL)
|
|
return NULL;
|
|
spki_len = EVP_DecodeBlock(spki_der, (const unsigned char *)str, len);
|
|
if (spki_len < 0) {
|
|
ERR_raise(ERR_LIB_X509, X509_R_BASE64_DECODE_ERROR);
|
|
OPENSSL_free(spki_der);
|
|
return NULL;
|
|
}
|
|
p = spki_der;
|
|
spki = d2i_NETSCAPE_SPKI(NULL, &p, spki_len);
|
|
OPENSSL_free(spki_der);
|
|
return spki;
|
|
}
|
|
|
|
/* Generate a base64 encoded string from an SPKI */
|
|
|
|
char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
|
|
{
|
|
unsigned char *der_spki, *p;
|
|
char *b64_str;
|
|
int der_len;
|
|
|
|
der_len = i2d_NETSCAPE_SPKI(spki, NULL);
|
|
if (der_len <= 0)
|
|
return NULL;
|
|
der_spki = OPENSSL_malloc(der_len);
|
|
b64_str = OPENSSL_malloc(der_len * 2);
|
|
if (der_spki == NULL || b64_str == NULL) {
|
|
OPENSSL_free(der_spki);
|
|
OPENSSL_free(b64_str);
|
|
return NULL;
|
|
}
|
|
p = der_spki;
|
|
i2d_NETSCAPE_SPKI(spki, &p);
|
|
EVP_EncodeBlock((unsigned char *)b64_str, der_spki, der_len);
|
|
OPENSSL_free(der_spki);
|
|
return b64_str;
|
|
}
|