httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r111241 - /httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
Date Wed, 08 Dec 2004 09:43:22 GMT
Author: jorton
Date: Wed Dec  8 01:43:21 2004
New Revision: 111241

URL: http://svn.apache.org/viewcvs?view=rev&rev=111241
Log:
* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify): Use
X509_STORE_CTX_get_ex_data() and SSL_get_ex_data_X509_STORE_CTX_idx()
to use the correct ex_data index from the context in pathological
cases where SSL_get_ex_data_X509_STORE_CTX_idx() does not return 0.

PR: 32529

Modified:
   httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?view=diff&rev=111241&p1=httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c&r1=111240&p2=httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c&r2=111241
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c	(original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c	Wed Dec  8 01:43:21 2004
@@ -1203,7 +1203,8 @@
 int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx)
 {
     /* Get Apache context back through OpenSSL context */
-    SSL *ssl            = (SSL *)X509_STORE_CTX_get_app_data(ctx);
+    SSL *ssl = X509_STORE_CTX_get_ex_data(ctx,
+                                          SSL_get_ex_data_X509_STORE_CTX_idx());
     conn_rec *conn      = (conn_rec *)SSL_get_app_data(ssl);
     server_rec *s       = conn->base_server;
     request_rec *r      = (request_rec *)SSL_get_app_data2(ssl);

Mime
View raw message