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)
113 lines
3.0 KiB
C
113 lines
3.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/asn1t.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/rand.h>
|
|
|
|
/* PKCS#5 password based encryption structure */
|
|
|
|
ASN1_SEQUENCE(PBEPARAM) = {
|
|
ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
|
|
ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
|
|
} ASN1_SEQUENCE_END(PBEPARAM)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
|
|
|
|
/* Set an algorithm identifier for a PKCS#5 PBE algorithm */
|
|
|
|
int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
|
|
const unsigned char *salt, int saltlen,
|
|
OSSL_LIB_CTX *ctx)
|
|
{
|
|
PBEPARAM *pbe = NULL;
|
|
ASN1_STRING *pbe_str = NULL;
|
|
unsigned char *sstr = NULL;
|
|
|
|
pbe = PBEPARAM_new();
|
|
if (pbe == NULL) {
|
|
/* ERR_R_ASN1_LIB, because PBEPARAM_new() is defined in crypto/asn1 */
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
if (iter <= 0)
|
|
iter = PKCS5_DEFAULT_ITER;
|
|
if (!ASN1_INTEGER_set(pbe->iter, iter)) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
if (!saltlen)
|
|
saltlen = PKCS5_SALT_LEN;
|
|
if (saltlen < 0)
|
|
goto err;
|
|
|
|
sstr = OPENSSL_malloc(saltlen);
|
|
if (sstr == NULL)
|
|
goto err;
|
|
if (salt)
|
|
memcpy(sstr, salt, saltlen);
|
|
else if (RAND_bytes_ex(ctx, sstr, saltlen, 0) <= 0)
|
|
goto err;
|
|
|
|
ASN1_STRING_set0(pbe->salt, sstr, saltlen);
|
|
sstr = NULL;
|
|
|
|
if (!ASN1_item_pack(pbe, ASN1_ITEM_rptr(PBEPARAM), &pbe_str)) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
|
|
PBEPARAM_free(pbe);
|
|
pbe = NULL;
|
|
|
|
if (X509_ALGOR_set0(algor, OBJ_nid2obj(alg), V_ASN1_SEQUENCE, pbe_str))
|
|
return 1;
|
|
|
|
err:
|
|
OPENSSL_free(sstr);
|
|
PBEPARAM_free(pbe);
|
|
ASN1_STRING_free(pbe_str);
|
|
return 0;
|
|
}
|
|
|
|
int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
|
|
const unsigned char *salt, int saltlen)
|
|
{
|
|
return PKCS5_pbe_set0_algor_ex(algor, alg, iter, salt, saltlen, NULL);
|
|
}
|
|
|
|
/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
|
|
|
|
X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
|
|
const unsigned char *salt, int saltlen,
|
|
OSSL_LIB_CTX *ctx)
|
|
{
|
|
X509_ALGOR *ret;
|
|
ret = X509_ALGOR_new();
|
|
if (ret == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_X509_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
if (PKCS5_pbe_set0_algor_ex(ret, alg, iter, salt, saltlen, ctx))
|
|
return ret;
|
|
|
|
X509_ALGOR_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
|
|
const unsigned char *salt, int saltlen)
|
|
{
|
|
return PKCS5_pbe_set_ex(alg, iter, salt, saltlen, NULL);
|
|
}
|
|
|