Author: mturk Date: Tue Dec 15 09:46:09 2009 New Revision: 890720 URL: http://svn.apache.org/viewvc?rev=890720&view=rev Log: Axe using STACK directly. The API uses STACK_OF...
Modified: tomcat/native/trunk/native/src/sslcontext.c tomcat/native/trunk/native/src/sslinfo.c tomcat/native/trunk/native/src/sslutils.c Modified: tomcat/native/trunk/native/src/sslcontext.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=890720&r1=890719&r2=890720&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslcontext.c (original) +++ tomcat/native/trunk/native/src/sslcontext.c Tue Dec 15 09:46:09 2009 @@ -367,10 +367,10 @@ 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) { Modified: tomcat/native/trunk/native/src/sslinfo.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=890720&r1=890719&r2=890720&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslinfo.c (original) +++ tomcat/native/trunk/native/src/sslinfo.c Tue Dec 15 09:46:09 2009 @@ -318,7 +318,7 @@ break; case SSL_INFO_CIPHER_DESCRIPTION: { - SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); + const SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); if (cipher) { char buf[256]; char *desc = SSL_CIPHER_description(cipher, buf, 256); @@ -513,7 +513,7 @@ { int usekeysize = 0; int algkeysize = 0; - SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); + const SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); if (cipher) { usekeysize = SSL_CIPHER_get_bits(cipher, &algkeysize); if (what == SSL_INFO_CIPHER_USEKEYSIZE) Modified: tomcat/native/trunk/native/src/sslutils.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=890720&r1=890719&r2=890720&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslutils.c (original) +++ tomcat/native/trunk/native/src/sslutils.c Tue Dec 15 09:46:09 2009 @@ -424,7 +424,7 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org