mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21: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)
139 lines
5.0 KiB
C
139 lines
5.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/pkcs12.h>
|
|
#include <openssl/bn.h>
|
|
#include <openssl/trace.h>
|
|
#include <openssl/kdf.h>
|
|
#include <openssl/core_names.h>
|
|
#include "internal/provider.h"
|
|
|
|
int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type,
|
|
OSSL_LIB_CTX *ctx, const char *propq)
|
|
{
|
|
int ret;
|
|
unsigned char *unipass;
|
|
int uniplen;
|
|
|
|
if (pass == NULL) {
|
|
unipass = NULL;
|
|
uniplen = 0;
|
|
} else if (!OPENSSL_asc2uni(pass, passlen, &unipass, &uniplen)) {
|
|
ERR_raise(ERR_LIB_PKCS12, ERR_R_PKCS12_LIB);
|
|
return 0;
|
|
}
|
|
ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
|
|
n, out, md_type, ctx, propq);
|
|
OPENSSL_clear_free(unipass, uniplen);
|
|
return ret > 0;
|
|
}
|
|
|
|
int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type)
|
|
{
|
|
return PKCS12_key_gen_asc_ex(pass, passlen, salt, saltlen, id, iter, n,
|
|
out, md_type, NULL, NULL);
|
|
}
|
|
|
|
int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type,
|
|
OSSL_LIB_CTX *ctx, const char *propq)
|
|
{
|
|
int ret;
|
|
unsigned char *unipass;
|
|
int uniplen;
|
|
|
|
if (pass == NULL) {
|
|
unipass = NULL;
|
|
uniplen = 0;
|
|
} else if (!OPENSSL_utf82uni(pass, passlen, &unipass, &uniplen)) {
|
|
ERR_raise(ERR_LIB_PKCS12, ERR_R_PKCS12_LIB);
|
|
return 0;
|
|
}
|
|
ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
|
|
n, out, md_type, ctx, propq);
|
|
OPENSSL_clear_free(unipass, uniplen);
|
|
return ret > 0;
|
|
}
|
|
|
|
int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type)
|
|
{
|
|
return PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, id, iter, n,
|
|
out, md_type, NULL, NULL);
|
|
}
|
|
|
|
int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type,
|
|
OSSL_LIB_CTX *libctx, const char *propq)
|
|
{
|
|
int res = 0;
|
|
EVP_KDF *kdf;
|
|
EVP_KDF_CTX *ctx;
|
|
OSSL_PARAM params[6], *p = params;
|
|
|
|
if (n <= 0)
|
|
return 0;
|
|
|
|
kdf = EVP_KDF_fetch(libctx, "PKCS12KDF", propq);
|
|
if (kdf == NULL)
|
|
return 0;
|
|
ctx = EVP_KDF_CTX_new(kdf);
|
|
EVP_KDF_free(kdf);
|
|
if (ctx == NULL)
|
|
return 0;
|
|
|
|
*p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
|
|
(char *)EVP_MD_get0_name(md_type),
|
|
0);
|
|
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
|
|
pass, passlen);
|
|
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
|
|
salt, saltlen);
|
|
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS12_ID, &id);
|
|
*p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
|
|
*p = OSSL_PARAM_construct_end();
|
|
|
|
OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
|
|
BIO_printf(trc_out, "PKCS12_key_gen_uni_ex(): ID %d, ITER %d\n", id, iter);
|
|
BIO_printf(trc_out, "Password (length %d):\n", passlen);
|
|
BIO_hex_string(trc_out, 0, passlen, pass, passlen);
|
|
BIO_printf(trc_out, "\n");
|
|
BIO_printf(trc_out, "Salt (length %d):\n", saltlen);
|
|
BIO_hex_string(trc_out, 0, saltlen, salt, saltlen);
|
|
BIO_printf(trc_out, "\n");
|
|
} OSSL_TRACE_END(PKCS12_KEYGEN);
|
|
|
|
if (EVP_KDF_derive(ctx, out, (size_t)n, params)) {
|
|
res = 1;
|
|
OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
|
|
BIO_printf(trc_out, "Output KEY (length %d)\n", n);
|
|
BIO_hex_string(trc_out, 0, n, out, n);
|
|
BIO_printf(trc_out, "\n");
|
|
} OSSL_TRACE_END(PKCS12_KEYGEN);
|
|
}
|
|
EVP_KDF_CTX_free(ctx);
|
|
return res;
|
|
}
|
|
|
|
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type)
|
|
{
|
|
return PKCS12_key_gen_uni_ex(pass, passlen, salt, saltlen, id, iter, n, out, md_type, NULL, NULL);
|
|
}
|