From: Ben Laurie <ben@openssl.org>
Date: Sun, 30 May 1999 14:13:19 +0000 (+0000)
Subject: More safe stack.
X-Git-Tag: OpenSSL_0_9_4~284
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=838d25a1ec0011fde245a22ac1cf6cddc518ddfb;p=oweals%2Fopenssl.git

More safe stack.
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 8983cf97fa..4f41f23638 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1025,7 +1025,7 @@ long SSL_get_default_timeout(SSL *s);
 int SSL_library_init(void );
 
 char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
-STACK *SSL_dup_CA_list(STACK *sk);
+STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
 
 SSL *SSL_dup(SSL *ssl);
 
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 9a8a8cc816..ec2eb6139d 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -452,19 +452,19 @@ static void set_client_CA_list(STACK_OF(X509_NAME) **ca_list,STACK_OF(X509_NAME)
 	*ca_list=list;
 	}
 
-STACK *SSL_dup_CA_list(STACK *sk)
+STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk)
 	{
 	int i;
-	STACK *ret;
+	STACK_OF(X509_NAME) *ret;
 	X509_NAME *name;
 
-	ret=sk_new_null();
-	for (i=0; i<sk_num(sk); i++)
+	ret=sk_X509_NAME_new_null();
+	for (i=0; i<sk_X509_NAME_num(sk); i++)
 		{
-		name=X509_NAME_dup((X509_NAME *)sk_value(sk,i));
-		if ((name == NULL) || !sk_push(ret,(char *)name))
+		name=X509_NAME_dup(sk_X509_NAME_value(sk,i));
+		if ((name == NULL) || !sk_X509_NAME_push(ret,name))
 			{
-			sk_pop_free(ret,X509_NAME_free);
+			sk_X509_NAME_pop_free(ret,X509_NAME_free);
 			return(NULL);
 			}
 		}