From: Richard Levitte <levitte@openssl.org>
Date: Thu, 27 Jan 2005 11:42:25 +0000 (+0000)
Subject: The first argument to load_iv should really be a char ** instead of an
X-Git-Tag: OpenSSL_0_9_7f~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0cae19f5efb6e425e054f995377bc25c5264b67c;p=oweals%2Fopenssl.git

The first argument to load_iv should really be a char ** instead of an
unsigned char **, since it points at text.

Thanks to Nils Larsch <nils.larsch@cybertrust.com> for pointing out
the inelegance of our code :-)
---

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 508346ef7a..529329f9f9 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -73,7 +73,7 @@ const char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
 
 #define MIN_LENGTH	4
 
-static int load_iv(unsigned char **fromp,unsigned char *to, int num);
+static int load_iv(char **fromp,unsigned char *to, int num);
 static int check_pem(const char *nm, const char *name);
 
 int PEM_def_callback(char *buf, int num, int w, void *key)
@@ -479,16 +479,16 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
 		PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_UNSUPPORTED_ENCRYPTION);
 		return(0);
 		}
-	if (!load_iv((unsigned char **)header_pp,&(cipher->iv[0]),enc->iv_len))
+	if (!load_iv(header_pp,&(cipher->iv[0]),enc->iv_len))
 		return(0);
 
 	return(1);
 	}
 
-static int load_iv(unsigned char **fromp, unsigned char *to, int num)
+static int load_iv(char **fromp, unsigned char *to, int num)
 	{
 	int v,i;
-	unsigned char *from;
+	char *from;
 
 	from= *fromp;
 	for (i=0; i<num; i++) to[i]=0;