mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +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)
71 lines
1.8 KiB
C
71 lines
1.8 KiB
C
/*
|
|
* Copyright 1995-2020 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 "internal/cryptlib.h"
|
|
|
|
#include <stdio.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/rsa.h>
|
|
|
|
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
|
|
const unsigned char *ek, int ekl, const unsigned char *iv,
|
|
EVP_PKEY *priv)
|
|
{
|
|
unsigned char *key = NULL;
|
|
size_t keylen = 0;
|
|
int ret = 0;
|
|
EVP_PKEY_CTX *pctx = NULL;
|
|
|
|
if (type) {
|
|
EVP_CIPHER_CTX_reset(ctx);
|
|
if (!EVP_DecryptInit_ex(ctx, type, NULL, NULL, NULL))
|
|
goto err;
|
|
}
|
|
|
|
if (priv == NULL)
|
|
return 1;
|
|
|
|
if ((pctx = EVP_PKEY_CTX_new(priv, NULL)) == NULL) {
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
|
|
goto err;
|
|
}
|
|
|
|
if (EVP_PKEY_decrypt_init(pctx) <= 0
|
|
|| EVP_PKEY_decrypt(pctx, NULL, &keylen, ek, ekl) <= 0)
|
|
goto err;
|
|
|
|
if ((key = OPENSSL_malloc(keylen)) == NULL)
|
|
goto err;
|
|
|
|
if (EVP_PKEY_decrypt(pctx, key, &keylen, ek, ekl) <= 0)
|
|
goto err;
|
|
|
|
if (EVP_CIPHER_CTX_set_key_length(ctx, keylen) <= 0
|
|
|| !EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv))
|
|
goto err;
|
|
|
|
ret = 1;
|
|
err:
|
|
EVP_PKEY_CTX_free(pctx);
|
|
OPENSSL_clear_free(key, keylen);
|
|
return ret;
|
|
}
|
|
|
|
int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
|
|
{
|
|
int i;
|
|
|
|
i = EVP_DecryptFinal_ex(ctx, out, outl);
|
|
if (i)
|
|
i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
|
|
return i;
|
|
}
|