mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename mac_key_* to ossl_mac_key_*

Browse Source 
mac_key_free(), mac_key_new(), mac_key_up_ref().

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13417)
This commit is contained in:
Pauli 2020-11-16 12:00:34 +10:00
parent 572e6df7db
commit 893d3df972
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/implementations/include/prov/macsignature.h
View File

@ -25,6 +25,6 @@ struct mac_key_st {
typedef struct mac_key_st MAC_KEY;
MAC_KEY *mac_key_new(OSSL_LIB_CTX *libctx, int cmac);
void mac_key_free(MAC_KEY *mackey);
int mac_key_up_ref(MAC_KEY *mackey);
MAC_KEY *ossl_mac_key_new(OSSL_LIB_CTX *libctx, int cmac);
void ossl_mac_key_free(MAC_KEY *mackey);
int ossl_mac_key_up_ref(MAC_KEY *mackey);

16
providers/implementations/keymgmt/mac_legacy_kmgmt.c
View File

@ -57,7 +57,7 @@ struct mac_gen_ctx {
PROV_CIPHER cipher;
};
MAC_KEY *mac_key_new(OSSL_LIB_CTX *libctx, int cmac)
MAC_KEY *ossl_mac_key_new(OSSL_LIB_CTX *libctx, int cmac)
{
MAC_KEY *mackey;
@ -80,7 +80,7 @@ MAC_KEY *mac_key_new(OSSL_LIB_CTX *libctx, int cmac)
return mackey;
}
void mac_key_free(MAC_KEY *mackey)
void ossl_mac_key_free(MAC_KEY *mackey)
{
int ref = 0;
@ -98,7 +98,7 @@ void mac_key_free(MAC_KEY *mackey)
OPENSSL_free(mackey);
}
int mac_key_up_ref(MAC_KEY *mackey)
int ossl_mac_key_up_ref(MAC_KEY *mackey)
{
int ref = 0;
@ -118,17 +118,17 @@ int mac_key_up_ref(MAC_KEY *mackey)
static void *mac_new(void *provctx)
{
return mac_key_new(PROV_LIBCTX_OF(provctx), 0);
return ossl_mac_key_new(PROV_LIBCTX_OF(provctx), 0);
}
static void *mac_new_cmac(void *provctx)
{
return mac_key_new(PROV_LIBCTX_OF(provctx), 1);
return ossl_mac_key_new(PROV_LIBCTX_OF(provctx), 1);
}
static void mac_free(void *mackey)
{
mac_key_free(mackey);
ossl_mac_key_free(mackey);
}
static int mac_has(const void *keydata, int selection)
@ -454,7 +454,7 @@ static void *mac_gen(void *genctx, OSSL_CALLBACK *cb, void *cbarg)
if (!ossl_prov_is_running() || gctx == NULL)
return NULL;
if ((key = mac_key_new(gctx->libctx, 0)) == NULL) {
if ((key = ossl_mac_key_new(gctx->libctx, 0)) == NULL) {
ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
return NULL;
}
@ -465,7 +465,7 @@ static void *mac_gen(void *genctx, OSSL_CALLBACK *cb, void *cbarg)
if (gctx->priv_key == NULL) {
ERR_raise(ERR_LIB_PROV, EVP_R_INVALID_KEY);
mac_key_free(key);
ossl_mac_key_free(key);
return NULL;
}

8
providers/implementations/signature/mac_legacy.c
View File

@ -98,10 +98,10 @@ static int mac_digest_sign_init(void *vpmacctx, const char *mdname, void *vkey)
if (!ossl_prov_is_running()
|| pmacctx == NULL
|| vkey == NULL
|| !mac_key_up_ref(vkey))
|| !ossl_mac_key_up_ref(vkey))
return 0;
mac_key_free(pmacctx->key);
ossl_mac_key_free(pmacctx->key);
pmacctx->key = vkey;
if (pmacctx->key->cipher.cipher != NULL)
@ -154,7 +154,7 @@ static void mac_freectx(void *vpmacctx)
OPENSSL_free(ctx->propq);
EVP_MAC_CTX_free(ctx->macctx);
mac_key_free(ctx->key);
ossl_mac_key_free(ctx->key);
OPENSSL_free(ctx);
}
@ -174,7 +174,7 @@ static void *mac_dupctx(void *vpmacctx)
dstctx->key = NULL;
dstctx->macctx = NULL;
if (srcctx->key != NULL && !mac_key_up_ref(srcctx->key))
if (srcctx->key != NULL && !ossl_mac_key_up_ref(srcctx->key))
goto err;
dstctx->key = srcctx->key;