More safe stack.

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 8983cf97fa600ffe9bf76e5e9d91733179f62da4..4f41f23638d64358373b7ba30a776bfbd00c10f8 100644 (file)
--- 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);
 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);
 
 
 SSL *SSL_dup(SSL *ssl);
 

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 9a8a8cc81666ffdd75917f06fff7b03469d4d47a..ec2eb6139d3f68a147130c8a68e3192285628f52 100644 (file)
--- 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;
        }
 
        *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;
        {
        int i;

-       STACK *ret;
+       STACK_OF(X509_NAME) *ret;

        X509_NAME *name;
 
        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);
                        }
                }
                        return(NULL);
                        }
                }