From 3ceb42d62047d438cd7b6b6a201682452faf30fc Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 18 Nov 2022 14:45:10 +0000
Subject: 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
---
 src/lib/libcrypto/evp/evp_locl.h | 4 ++--
 src/lib/libcrypto/evp/p_lib.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/libcrypto/evp')

diff --git a/src/lib/libcrypto/evp/evp_locl.h b/src/lib/libcrypto/evp/evp_locl.h
index 37fc55eb9c..2bfcc6448e 100644
--- a/src/lib/libcrypto/evp/evp_locl.h
+++ b/src/lib/libcrypto/evp/evp_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_locl.h,v 1.30 2022/11/10 16:37:52 jsing Exp $ */
+/* $OpenBSD: evp_locl.h,v 1.31 2022/11/18 14:45:10 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -93,7 +93,7 @@ struct evp_pkey_st {
 	const EVP_PKEY_ASN1_METHOD *ameth;
 	ENGINE *engine;
 	union	{
-		char *ptr;
+		void *ptr;
 #ifndef OPENSSL_NO_RSA
 		struct rsa_st *rsa;	/* RSA */
 #endif
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index 2e0830b96e..ec3949b4c1 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_lib.c,v 1.30 2022/11/10 14:46:44 jsing Exp $ */
+/* $OpenBSD: p_lib.c,v 1.31 2022/11/18 14:45:10 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,7 +388,7 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
 		goto err;
 	}
 
-	ret->pkey.ptr = (char *)cmctx;
+	ret->pkey.ptr = cmctx;
 
 	return ret;
 
-- 
cgit v1.2.3-55-g6feb