From bef35d38b7cc486e4c4a429c36326b26d4fbf2aa Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 23 Apr 2014 12:42:16 +0000
Subject: Casting from a const unsigned char ** to a const unsigned char **
 seems... unnecessary. Remove the temporary ugly casts - the comments even
 call them that!

ok guenther@
---
 src/lib/libcrypto/asn1/d2i_pu.c         | 12 ++++--------
 src/lib/libssl/src/crypto/asn1/d2i_pu.c | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/asn1/d2i_pu.c b/src/lib/libcrypto/asn1/d2i_pu.c
index 564f0945b5..d0c2cecd7d 100644
--- a/src/lib/libcrypto/asn1/d2i_pu.c
+++ b/src/lib/libcrypto/asn1/d2i_pu.c
@@ -93,9 +93,8 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 	switch (EVP_PKEY_id(ret)) {
 #ifndef OPENSSL_NO_RSA
 	case EVP_PKEY_RSA:
-		if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL,
-		    (const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
-		{
+		if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) ==
+		    NULL) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
@@ -103,9 +102,7 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 #endif
 #ifndef OPENSSL_NO_DSA
 	case EVP_PKEY_DSA:
-		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
-		    (const unsigned char **)pp,length)) /* TMP UGLY CAST */
-		{
+		if (!d2i_DSAPublicKey(&(ret->pkey.dsa), pp, length)) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
@@ -113,8 +110,7 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 #endif
 #ifndef OPENSSL_NO_EC
 	case EVP_PKEY_EC:
-		if (!o2i_ECPublicKey(&(ret->pkey.ec),
-		    (const unsigned char **)pp, length)) {
+		if (!o2i_ECPublicKey(&(ret->pkey.ec), pp, length)) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
diff --git a/src/lib/libssl/src/crypto/asn1/d2i_pu.c b/src/lib/libssl/src/crypto/asn1/d2i_pu.c
index 564f0945b5..d0c2cecd7d 100644
--- a/src/lib/libssl/src/crypto/asn1/d2i_pu.c
+++ b/src/lib/libssl/src/crypto/asn1/d2i_pu.c
@@ -93,9 +93,8 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 	switch (EVP_PKEY_id(ret)) {
 #ifndef OPENSSL_NO_RSA
 	case EVP_PKEY_RSA:
-		if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL,
-		    (const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
-		{
+		if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) ==
+		    NULL) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
@@ -103,9 +102,7 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 #endif
 #ifndef OPENSSL_NO_DSA
 	case EVP_PKEY_DSA:
-		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
-		    (const unsigned char **)pp,length)) /* TMP UGLY CAST */
-		{
+		if (!d2i_DSAPublicKey(&(ret->pkey.dsa), pp, length)) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
@@ -113,8 +110,7 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 #endif
 #ifndef OPENSSL_NO_EC
 	case EVP_PKEY_EC:
-		if (!o2i_ECPublicKey(&(ret->pkey.ec),
-		    (const unsigned char **)pp, length)) {
+		if (!o2i_ECPublicKey(&(ret->pkey.ec), pp, length)) {
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
 		}
-- 
cgit v1.2.3-55-g6feb