]> granicus.if.org Git - apache/commitdiff
mod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
authorStefan Sperling <stsp@apache.org>
Fri, 1 May 2015 14:32:11 +0000 (14:32 +0000)
committerStefan Sperling <stsp@apache.org>
Fri, 1 May 2015 14:32:11 +0000 (14:32 +0000)
modssl_X509_NAME_ENTRY_to_string.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677151 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_vars.c
modules/ssl/ssl_util_ssl.c
modules/ssl/ssl_util_ssl.h

index b4e1800a144be6f1c33c8655a5f2f36f35aeac76..6d530a3e1e6bc09888ffaf0fcda81ce58f6fa777 100644 (file)
@@ -651,7 +651,7 @@ static char *ssl_var_lookup_ssl_cert_dn(apr_pool_t *p, X509_NAME *xsname, char *
                 n =OBJ_obj2nid((ASN1_OBJECT *)X509_NAME_ENTRY_get_object(xsne));
 
                 if (n == ssl_var_lookup_ssl_cert_dn_rec[i].nid && idx-- == 0) {
-                    result = SSL_X509_NAME_ENTRY_to_string(p, xsne);
+                    result = modssl_X509_NAME_ENTRY_to_string(p, xsne);
                     break;
                 }
             }
@@ -972,7 +972,7 @@ static void extract_dn(apr_table_t *t, apr_hash_t *nids, const char *pfx,
                  apr_hash_set(count, &nid, sizeof nid, dup);
                  key = apr_pstrcat(p, pfx, tag, NULL);
              }
-             value = SSL_X509_NAME_ENTRY_to_string(p, xsne);
+             value = modssl_X509_NAME_ENTRY_to_string(p, xsne);
              apr_table_setn(t, key, value);
          }
     }
index 4a335920db0aa6d1beeaf10d3ebe80342b157035..0844f5dbececd835faefb195b98d202010194df6 100644 (file)
@@ -213,7 +213,7 @@ static char *convert_asn1_to_utf8(apr_pool_t *p, ASN1_STRING *asn1str)
 }
 
 /* convert a NAME_ENTRY to UTF8 string */
-char *SSL_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne)
+char *modssl_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne)
 {
     char *result = convert_asn1_to_utf8(p, X509_NAME_ENTRY_get_data(xsne));
     ap_xlate_proto_from_ascii(result, len);
@@ -329,7 +329,7 @@ BOOL SSL_X509_getIDs(apr_pool_t *p, X509 *x509, apr_array_header_t **ids)
     subj = X509_get_subject_name(x509);
     while ((i = X509_NAME_get_index_by_NID(subj, NID_commonName, i)) != -1) {
         APR_ARRAY_PUSH(*ids, const char *) = 
-            SSL_X509_NAME_ENTRY_to_string(p, X509_NAME_get_entry(subj, i));
+            modssl_X509_NAME_ENTRY_to_string(p, X509_NAME_get_entry(subj, i));
     }
 
     return apr_is_empty_array(*ids) ? FALSE : TRUE;
index a30dfb5e4d001e77a515822d20d7f9e5638ee469..e9ade85dc3b16779c29901f3ddc4a7f30e362402 100644 (file)
@@ -63,7 +63,7 @@ void        modssl_set_app_data2(SSL *, void *);
 EVP_PKEY   *modssl_read_privatekey(const char *, EVP_PKEY **, pem_password_cb *, void *);
 int         modssl_smart_shutdown(SSL *ssl);
 BOOL        modssl_X509_getBC(X509 *, int *, int *);
-char       *SSL_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne);
+char       *modssl_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne);
 char       *SSL_X509_NAME_to_string(apr_pool_t *, X509_NAME *, int);
 BOOL        SSL_X509_getSAN(apr_pool_t *, X509 *, int, int, apr_array_header_t **);
 BOOL        SSL_X509_getIDs(apr_pool_t *, X509 *, apr_array_header_t **);