httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1677159 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_init.c ssl_util_ssl.c ssl_util_ssl.h
Date Fri, 01 May 2015 14:49:45 GMT
Author: stsp
Date: Fri May  1 14:49:45 2015
New Revision: 1677159

URL: http://svn.apache.org/r1677159
Log:
mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1677159&r1=1677158&r2=1677159&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Fri May  1 14:49:45 2015
@@ -1243,7 +1243,7 @@ static apr_status_t ssl_init_proxy_certs
     sk = sk_X509_INFO_new_null();
 
     if (pkp->cert_file) {
-        SSL_X509_INFO_load_file(ptemp, sk, pkp->cert_file);
+        modssl_X509_INFO_load_file(ptemp, sk, pkp->cert_file);
     }
 
     if (pkp->cert_path) {

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c?rev=1677159&r1=1677158&r2=1677159&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c Fri May  1 14:49:45 2015
@@ -417,9 +417,9 @@ BOOL modssl_X509_match_name(apr_pool_t *
 **  _________________________________________________________________
 */
 
-BOOL SSL_X509_INFO_load_file(apr_pool_t *ptemp,
-                             STACK_OF(X509_INFO) *sk,
-                             const char *filename)
+BOOL modssl_X509_INFO_load_file(apr_pool_t *ptemp,
+                                STACK_OF(X509_INFO) *sk,
+                                const char *filename)
 {
     BIO *in;
 
@@ -468,7 +468,7 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t
                                pathname, "/", dirent.name,
                                NULL);
 
-        if (SSL_X509_INFO_load_file(ptemp, sk, fullname)) {
+        if (modssl_X509_INFO_load_file(ptemp, sk, fullname)) {
             ok = TRUE;
         }
     }

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h?rev=1677159&r1=1677158&r2=1677159&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h Fri May  1 14:49:45 2015
@@ -67,7 +67,7 @@ char       *modssl_X509_NAME_ENTRY_to_st
 char       *modssl_X509_NAME_to_string(apr_pool_t *, X509_NAME *, int);
 BOOL        modssl_X509_getSAN(apr_pool_t *, X509 *, int, int, apr_array_header_t **);
 BOOL        modssl_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *);
-BOOL        SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
+BOOL        modssl_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
 BOOL        SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
 int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *);
 char       *SSL_SESSION_id2sz(unsigned char *, int, char *, int);



Mime
View raw message