mirror of
https://github.com/openssl/openssl.git
synced 2025-02-11 14:22: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)
64 lines
1.9 KiB
C
64 lines
1.9 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 "crypto/evp.h"
|
|
|
|
int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
|
|
unsigned int siglen, EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
|
|
const char *propq)
|
|
{
|
|
unsigned char m[EVP_MAX_MD_SIZE];
|
|
unsigned int m_len = 0;
|
|
int i = 0;
|
|
EVP_PKEY_CTX *pkctx = NULL;
|
|
|
|
if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_FINALISE)) {
|
|
if (!EVP_DigestFinal_ex(ctx, m, &m_len))
|
|
goto err;
|
|
} else {
|
|
int rv = 0;
|
|
EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_new();
|
|
|
|
if (tmp_ctx == NULL) {
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
|
|
return 0;
|
|
}
|
|
rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
|
|
if (rv)
|
|
rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
|
|
EVP_MD_CTX_free(tmp_ctx);
|
|
if (!rv)
|
|
return 0;
|
|
}
|
|
|
|
i = -1;
|
|
pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq);
|
|
if (pkctx == NULL)
|
|
goto err;
|
|
if (EVP_PKEY_verify_init(pkctx) <= 0)
|
|
goto err;
|
|
if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_get0_md(ctx)) <= 0)
|
|
goto err;
|
|
i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
|
|
err:
|
|
EVP_PKEY_CTX_free(pkctx);
|
|
return i;
|
|
}
|
|
|
|
int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
|
|
unsigned int siglen, EVP_PKEY *pkey)
|
|
{
|
|
return EVP_VerifyFinal_ex(ctx, sigbuf, siglen, pkey, NULL, NULL);
|
|
}
|