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)
50 lines
1.2 KiB
C
50 lines
1.2 KiB
C
/*
|
|
* Copyright 1995-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/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pem.h>
|
|
|
|
int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
|
|
{
|
|
return EVP_DigestInit_ex(ctx, type, NULL);
|
|
}
|
|
|
|
int PEM_SignUpdate(EVP_MD_CTX *ctx,
|
|
const unsigned char *data, unsigned int count)
|
|
{
|
|
return EVP_DigestUpdate(ctx, data, count);
|
|
}
|
|
|
|
int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
|
|
unsigned int *siglen, EVP_PKEY *pkey)
|
|
{
|
|
unsigned char *m;
|
|
int i, ret = 0;
|
|
unsigned int m_len;
|
|
|
|
m = OPENSSL_malloc(EVP_PKEY_get_size(pkey));
|
|
if (m == NULL)
|
|
goto err;
|
|
|
|
if (EVP_SignFinal(ctx, m, &m_len, pkey) <= 0)
|
|
goto err;
|
|
|
|
i = EVP_EncodeBlock(sigret, m, m_len);
|
|
*siglen = i;
|
|
ret = 1;
|
|
err:
|
|
/* ctx has been zeroed by EVP_SignFinal() */
|
|
OPENSSL_free(m);
|
|
return ret;
|
|
}
|