summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/hmac/hm_ameth.c
diff options
context:
space:
mode:
authortb <>2022-11-18 14:45:10 +0000
committertb <>2022-11-18 14:45:10 +0000
commit54b961b017cbfded9bc4892699ccbc35bebf5c6f (patch)
tree48e2b4585e54a8205c6dbeb0131ead3e7cfc4d15 /src/lib/libcrypto/hmac/hm_ameth.c
parent5673137f00930926e8191aab226a21afaea9ad31 (diff)
downloadopenbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.tar.gz
openbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.tar.bz2
openbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.zip
Change the pkey.ptr from char * to void *
Now that EVP_PKEY is opaque, there is no reason to keep the ptr member of the pkey union as a weird char pointer, a void pointer will do. This avoids a few stupid casts and simplifies an upcoming diff. ok jsing
Diffstat (limited to 'src/lib/libcrypto/hmac/hm_ameth.c')
-rw-r--r--src/lib/libcrypto/hmac/hm_ameth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/hmac/hm_ameth.c b/src/lib/libcrypto/hmac/hm_ameth.c
index 84bb5f0c07..86e42bdfab 100644
--- a/src/lib/libcrypto/hmac/hm_ameth.c
+++ b/src/lib/libcrypto/hmac/hm_ameth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hm_ameth.c,v 1.12 2021/12/12 21:30:14 tb Exp $ */ 1/* $OpenBSD: hm_ameth.c,v 1.13 2022/11/18 14:45:10 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2007. 3 * project 2007.
4 */ 4 */
@@ -82,7 +82,7 @@ hmac_size(const EVP_PKEY *pkey)
82static void 82static void
83hmac_key_free(EVP_PKEY *pkey) 83hmac_key_free(EVP_PKEY *pkey)
84{ 84{
85 ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr; 85 ASN1_OCTET_STRING *os = pkey->pkey.ptr;
86 86
87 if (os) { 87 if (os) {
88 if (os->data) 88 if (os->data)
@@ -132,7 +132,7 @@ static int
132old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder) 132old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
133{ 133{
134 int inc; 134 int inc;
135 ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr; 135 ASN1_OCTET_STRING *os = pkey->pkey.ptr;
136 136
137 if (pder) { 137 if (pder) {
138 if (!*pder) { 138 if (!*pder) {