diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2018-12-19 00:36:40 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2019-06-06 17:41:42 +0200 |
| commit | 7ed66e2634e6cfbb16a1ef975572e79a479217a8 (patch) | |
| tree | cc09cf68cd6e72fe61d428842284a1f584a58a19 /crypto/blake2 | |
| parent | be5fc053ed40bb714944f93e2d35265d2096f71f (diff) | |
| download | openssl-7ed66e2634e6cfbb16a1ef975572e79a479217a8.zip openssl-7ed66e2634e6cfbb16a1ef975572e79a479217a8.tar.gz openssl-7ed66e2634e6cfbb16a1ef975572e79a479217a8.tar.bz2 | |
Change EVP_MAC method from copy to dup
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
GH: #7651
Diffstat (limited to 'crypto/blake2')
| -rw-r--r-- | crypto/blake2/blake2b_mac.c | 12 | ||||
| -rw-r--r-- | crypto/blake2/blake2s_mac.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/crypto/blake2/blake2b_mac.c b/crypto/blake2/blake2b_mac.c index b38e9b8..f6025b1 100644 --- a/crypto/blake2/blake2b_mac.c +++ b/crypto/blake2/blake2b_mac.c @@ -39,10 +39,16 @@ static void blake2b_mac_free(EVP_MAC_IMPL *macctx) } } -static int blake2b_mac_copy(EVP_MAC_IMPL *dst, EVP_MAC_IMPL *src) +static EVP_MAC_IMPL *blake2b_mac_dup(const EVP_MAC_IMPL *src) { + EVP_MAC_IMPL *dst; + + dst = OPENSSL_zalloc(sizeof(*dst)); + if (dst == NULL) + return NULL; + *dst = *src; - return 1; + return dst; } static int blake2b_mac_init(EVP_MAC_IMPL *macctx) @@ -177,7 +183,7 @@ static size_t blake2b_mac_size(EVP_MAC_IMPL *macctx) const EVP_MAC blake2b_mac_meth = { EVP_MAC_BLAKE2B, blake2b_mac_new, - blake2b_mac_copy, + blake2b_mac_dup, blake2b_mac_free, blake2b_mac_size, blake2b_mac_init, diff --git a/crypto/blake2/blake2s_mac.c b/crypto/blake2/blake2s_mac.c index 04dbf4e..9ce8db1 100644 --- a/crypto/blake2/blake2s_mac.c +++ b/crypto/blake2/blake2s_mac.c @@ -39,10 +39,16 @@ static void blake2s_mac_free(EVP_MAC_IMPL *macctx) } } -static int blake2s_mac_copy(EVP_MAC_IMPL *dst, EVP_MAC_IMPL *src) +static EVP_MAC_IMPL *blake2s_mac_dup(const EVP_MAC_IMPL *src) { + EVP_MAC_IMPL *dst; + + dst = OPENSSL_malloc(sizeof(*dst)); + if (dst == NULL) + return NULL; + *dst = *src; - return 1; + return dst; } static int blake2s_mac_init(EVP_MAC_IMPL *macctx) @@ -177,7 +183,7 @@ static size_t blake2s_mac_size(EVP_MAC_IMPL *macctx) const EVP_MAC blake2s_mac_meth = { EVP_MAC_BLAKE2S, blake2s_mac_new, - blake2s_mac_copy, + blake2s_mac_dup, blake2s_mac_free, blake2s_mac_size, blake2s_mac_init, |