Blob Blame History Raw
diff -up tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslcontext.c
--- tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl	2008-01-01 18:33:12.000000000 +0100
+++ tomcat-native-1.1.16-src/jni/native/src/sslcontext.c	2009-08-26 16:24:44.000000000 +0200
@@ -366,10 +366,10 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
         if (ca_certs == NULL) {
             SSL_load_client_CA_file(J2S(file));
             if (ca_certs != NULL)
-                SSL_CTX_set_client_CA_list(c->ctx, (STACK *)ca_certs);
+                SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
         }
         else {
-            if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs, J2S(file)))
+            if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
                 ca_certs = NULL;
         }
         if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
diff -up tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslutils.c
--- tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl	2006-11-25 11:22:33.000000000 +0100
+++ tomcat-native-1.1.16-src/jni/native/src/sslutils.c	2009-08-26 14:50:58.000000000 +0200
@@ -424,7 +424,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
     X509 *x509;
     unsigned long err;
     int n;
-    STACK *extra_certs;
+    STACK_OF(X509) *extra_certs;
 
     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
         return -1;
@@ -443,7 +443,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
     /* free a perhaps already configured extra chain */
     extra_certs = SSL_CTX_get_extra_certs(ctx);
     if (extra_certs != NULL) {
-        sk_X509_pop_free((STACK_OF(X509) *)extra_certs, X509_free);
+        sk_X509_pop_free(extra_certs, X509_free);
         SSL_CTX_set_extra_certs(ctx,NULL);
     }
     /* create new extra chain by loading the certs */