mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +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)
42 lines
1.2 KiB
C
42 lines
1.2 KiB
C
/*
|
|
* Copyright 2015-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
|
|
*/
|
|
|
|
/*
|
|
* MD5 and SHA-1 low level APIs are deprecated for public use, but still ok for
|
|
* internal use. The prov/md5_sha1.h include requires this, but this must
|
|
* be the first include loaded.
|
|
*/
|
|
#include "internal/deprecated.h"
|
|
|
|
#include "crypto/evp.h"
|
|
#include "prov/md5_sha1.h" /* diverse MD5_SHA1 macros */
|
|
#include "legacy_meth.h"
|
|
|
|
IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, ossl_md5_sha1)
|
|
static int md5_sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int mslen, void *ms)
|
|
{
|
|
return ossl_md5_sha1_ctrl(EVP_MD_CTX_md_data(ctx), cmd, mslen, ms);
|
|
}
|
|
|
|
static const EVP_MD md5_sha1_md = {
|
|
NID_md5_sha1,
|
|
NID_md5_sha1,
|
|
MD5_SHA1_DIGEST_LENGTH,
|
|
0,
|
|
EVP_ORIG_GLOBAL,
|
|
LEGACY_EVP_MD_METH_TABLE(md5_sha1_int_init, md5_sha1_int_update,
|
|
md5_sha1_int_final, md5_sha1_int_ctrl,
|
|
MD5_SHA1_CBLOCK),
|
|
};
|
|
|
|
const EVP_MD *EVP_md5_sha1(void)
|
|
{
|
|
return &md5_sha1_md;
|
|
}
|