summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-06-22 18:09:25 +0200
committerRichard Levitte <levitte@openssl.org>2021-06-23 23:00:36 +0200
commit006de7670a12dff617e86a55b6db7c6e3b1f8fef (patch)
treeb0492fea1e11622a05a5aaeebe195eb4f333f005 /include
parent86ff7cf2a6cdf26f2ba7e64db6fe5c92c64bf9ac (diff)
downloadopenssl-new-006de7670a12dff617e86a55b6db7c6e3b1f8fef.tar.gz
EVP: Change the output size type of EVP_Q_digest() and EVP_Q_mac()
This makes them more consistent with other new interfaces. Fixes #15839 Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15861)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/evp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 50cf8eeb77..76fabd63ed 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -715,8 +715,8 @@ __owur int EVP_Digest(const void *data, size_t count,
unsigned char *md, unsigned int *size,
const EVP_MD *type, ENGINE *impl);
__owur int EVP_Q_digest(OSSL_LIB_CTX *libctx, const char *name,
- const char *propq, const void *data, size_t count,
- unsigned char *md, unsigned int *size);
+ const char *propq, const void *data, size_t datalen,
+ unsigned char *md, size_t *mdlen);
__owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
@@ -1216,7 +1216,7 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx, const char *name, const char *pro
const char *subalg, const OSSL_PARAM *params,
const void *key, size_t keylen,
const unsigned char *data, size_t datalen,
- unsigned char *out, size_t outsize, unsigned int *outlen);
+ unsigned char *out, size_t outsize, size_t *outlen);
int EVP_MAC_init(EVP_MAC_CTX *ctx, const unsigned char *key, size_t keylen,
const OSSL_PARAM params[]);
int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen);