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)
114 lines
2.6 KiB
C
114 lines
2.6 KiB
C
/*
|
|
* Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
* Copyright 2017 BaishanCloud. 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 <openssl/bn.h>
|
|
#include <openssl/err.h>
|
|
#include "rsa_local.h"
|
|
|
|
void ossl_rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo)
|
|
{
|
|
/* free pp and pinfo only */
|
|
BN_clear_free(pinfo->pp);
|
|
OPENSSL_free(pinfo);
|
|
}
|
|
|
|
void ossl_rsa_multip_info_free(RSA_PRIME_INFO *pinfo)
|
|
{
|
|
/* free a RSA_PRIME_INFO structure */
|
|
BN_clear_free(pinfo->r);
|
|
BN_clear_free(pinfo->d);
|
|
BN_clear_free(pinfo->t);
|
|
ossl_rsa_multip_info_free_ex(pinfo);
|
|
}
|
|
|
|
RSA_PRIME_INFO *ossl_rsa_multip_info_new(void)
|
|
{
|
|
RSA_PRIME_INFO *pinfo;
|
|
|
|
/* create a RSA_PRIME_INFO structure */
|
|
if ((pinfo = OPENSSL_zalloc(sizeof(RSA_PRIME_INFO))) == NULL)
|
|
return NULL;
|
|
if ((pinfo->r = BN_secure_new()) == NULL)
|
|
goto err;
|
|
if ((pinfo->d = BN_secure_new()) == NULL)
|
|
goto err;
|
|
if ((pinfo->t = BN_secure_new()) == NULL)
|
|
goto err;
|
|
if ((pinfo->pp = BN_secure_new()) == NULL)
|
|
goto err;
|
|
|
|
return pinfo;
|
|
|
|
err:
|
|
BN_free(pinfo->r);
|
|
BN_free(pinfo->d);
|
|
BN_free(pinfo->t);
|
|
BN_free(pinfo->pp);
|
|
OPENSSL_free(pinfo);
|
|
return NULL;
|
|
}
|
|
|
|
/* Refill products of primes */
|
|
int ossl_rsa_multip_calc_product(RSA *rsa)
|
|
{
|
|
RSA_PRIME_INFO *pinfo;
|
|
BIGNUM *p1 = NULL, *p2 = NULL;
|
|
BN_CTX *ctx = NULL;
|
|
int i, rv = 0, ex_primes;
|
|
|
|
if ((ex_primes = sk_RSA_PRIME_INFO_num(rsa->prime_infos)) <= 0) {
|
|
/* invalid */
|
|
goto err;
|
|
}
|
|
|
|
if ((ctx = BN_CTX_new()) == NULL)
|
|
goto err;
|
|
|
|
/* calculate pinfo->pp = p * q for first 'extra' prime */
|
|
p1 = rsa->p;
|
|
p2 = rsa->q;
|
|
|
|
for (i = 0; i < ex_primes; i++) {
|
|
pinfo = sk_RSA_PRIME_INFO_value(rsa->prime_infos, i);
|
|
if (pinfo->pp == NULL) {
|
|
pinfo->pp = BN_secure_new();
|
|
if (pinfo->pp == NULL)
|
|
goto err;
|
|
}
|
|
if (!BN_mul(pinfo->pp, p1, p2, ctx))
|
|
goto err;
|
|
/* save previous one */
|
|
p1 = pinfo->pp;
|
|
p2 = pinfo->r;
|
|
}
|
|
|
|
rv = 1;
|
|
err:
|
|
BN_CTX_free(ctx);
|
|
return rv;
|
|
}
|
|
|
|
int ossl_rsa_multip_cap(int bits)
|
|
{
|
|
int cap = 5;
|
|
|
|
if (bits < 1024)
|
|
cap = 2;
|
|
else if (bits < 4096)
|
|
cap = 3;
|
|
else if (bits < 8192)
|
|
cap = 4;
|
|
|
|
if (cap > RSA_MAX_PRIME_NUM)
|
|
cap = RSA_MAX_PRIME_NUM;
|
|
|
|
return cap;
|
|
}
|