mirror of
https://github.com/openssl/openssl.git
synced 2025-01-06 13:26:43 +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)
59 lines
1.5 KiB
C
59 lines
1.5 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/pkcs12.h>
|
|
#include "crypto/pkcs7.h"
|
|
#include "p12_local.h"
|
|
|
|
/* Initialise a PKCS12 structure to take data */
|
|
|
|
PKCS12 *PKCS12_init_ex(int mode, OSSL_LIB_CTX *ctx, const char *propq)
|
|
{
|
|
PKCS12 *pkcs12;
|
|
|
|
if ((pkcs12 = PKCS12_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
if (!ASN1_INTEGER_set(pkcs12->version, 3))
|
|
goto err;
|
|
pkcs12->authsafes->type = OBJ_nid2obj(mode);
|
|
|
|
ossl_pkcs7_set0_libctx(pkcs12->authsafes, ctx);
|
|
if (!ossl_pkcs7_set1_propq(pkcs12->authsafes, propq)) {
|
|
ERR_raise(ERR_LIB_PKCS12, ERR_R_PKCS7_LIB);
|
|
goto err;
|
|
}
|
|
|
|
switch (mode) {
|
|
case NID_pkcs7_data:
|
|
if ((pkcs12->authsafes->d.data = ASN1_OCTET_STRING_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
default:
|
|
ERR_raise(ERR_LIB_PKCS12, PKCS12_R_UNSUPPORTED_PKCS12_MODE);
|
|
goto err;
|
|
}
|
|
return pkcs12;
|
|
|
|
err:
|
|
PKCS12_free(pkcs12);
|
|
return NULL;
|
|
}
|
|
|
|
PKCS12 *PKCS12_init(int mode)
|
|
{
|
|
return PKCS12_init_ex(mode, NULL, NULL);
|
|
}
|
|
|