mirror of
https://github.com/openssl/openssl.git
synced 2024-11-30 21:44:16 +08:00
f6c95e46c0
Add a "where did this EVP_{CIPHER,MD} come from" flag: global, via fetch,
or via EVP_{CIPHER,MD}_meth_new. Update EVP_{CIPHER,MD}_free to handle all
three origins. The flag is deliberately right before some function pointers,
so that compile-time failures (int/pointer) will occur, as opposed to
taking a bit in the existing "flags" field. The "global variable" flag
is non-zero, so the default case of using OPENSSL_zalloc (for provider
ciphers), will do the right thing. Ref-counting is a no-op for
Make up_ref no-op for global MD and CIPHER objects
Deprecate EVP_MD_CTX_md(). Added EVP_MD_CTX_get0_md() (same semantics as
the deprecated function) and EVP_MD_CTX_get1_md(). Likewise, deprecate
EVP_CIPHER_CTX_cipher() in favor of EVP_CIPHER_CTX_get0_cipher(), and add
EVP_CIPHER_CTX_get1_CIPHER().
Refactor EVP_MD_free() and EVP_MD_meth_free() to call new common
evp_md_free_int() function.
Refactor EVP_CIPHER_free() and EVP_CIPHER_meth_free() to call new common
evp_cipher_free_int() function.
Also change some flags tests to explicit test == or != zero. E.g.,
if (flags & x) --> if ((flags & x) != 0)
if (!(flags & x)) --> if ((flags & x) == 0)
Only done for those lines where "get0_cipher" calls were made.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14193)
70 lines
2.0 KiB
C
70 lines
2.0 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 <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/evp.h"
|
|
|
|
int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
|
|
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;
|
|
size_t sltmp;
|
|
EVP_PKEY_CTX *pkctx = NULL;
|
|
|
|
*siglen = 0;
|
|
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_MALLOC_FAILURE);
|
|
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;
|
|
}
|
|
|
|
sltmp = (size_t)EVP_PKEY_size(pkey);
|
|
i = 0;
|
|
pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq);
|
|
if (pkctx == NULL)
|
|
goto err;
|
|
if (EVP_PKEY_sign_init(pkctx) <= 0)
|
|
goto err;
|
|
if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_get0_md(ctx)) <= 0)
|
|
goto err;
|
|
if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0)
|
|
goto err;
|
|
*siglen = sltmp;
|
|
i = 1;
|
|
err:
|
|
EVP_PKEY_CTX_free(pkctx);
|
|
return i;
|
|
}
|
|
|
|
int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
|
|
unsigned int *siglen, EVP_PKEY *pkey)
|
|
{
|
|
return EVP_SignFinal_ex(ctx, sigret, siglen, pkey, NULL, NULL);
|
|
}
|