www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677153 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Sperling
2015-05-01 14:34:38 +00:00
parent e3f338ec3d
commit 1e4c1e7fd2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_init.c
View File

@@ -1634,7 +1634,7 @@ static void ssl_init_PushCAList(STACK_OF(X509_NAME) *ca_list,
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02209) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02209)
"CA certificate: %s", "CA certificate: %s",
SSL_X509_NAME_to_string(ptemp, name, 0)); modssl_X509_NAME_to_string(ptemp, name, 0));
/* /*
* note that SSL_load_client_CA_file() checks for duplicates, * note that SSL_load_client_CA_file() checks for duplicates,

8
modules/ssl/ssl_engine_log.c
View File

@@ -141,8 +141,8 @@ static void ssl_log_cert_error(const char *file, int line, int level,
int maxdnlen = (HUGE_STRING_LEN - msglen - 300) / 2; int maxdnlen = (HUGE_STRING_LEN - msglen - 300) / 2;
BIO_puts(bio, " [subject: "); BIO_puts(bio, " [subject: ");
name = SSL_X509_NAME_to_string(p, X509_get_subject_name(cert), name = modssl_X509_NAME_to_string(p, X509_get_subject_name(cert),
maxdnlen); maxdnlen);
if (!strIsEmpty(name)) { if (!strIsEmpty(name)) {
BIO_puts(bio, name); BIO_puts(bio, name);
} else { } else {
@@ -150,8 +150,8 @@ static void ssl_log_cert_error(const char *file, int line, int level,
} }
BIO_puts(bio, " / issuer: "); BIO_puts(bio, " / issuer: ");
name = SSL_X509_NAME_to_string(p, X509_get_issuer_name(cert), name = modssl_X509_NAME_to_string(p, X509_get_issuer_name(cert),
maxdnlen); maxdnlen);
if (!strIsEmpty(name)) { if (!strIsEmpty(name)) {
BIO_puts(bio, name); BIO_puts(bio, name);
} else { } else {

2
modules/ssl/ssl_engine_vars.c
View File

@@ -807,7 +807,7 @@ static char *ssl_var_lookup_ssl_cert_rfc4523_cea(apr_pool_t *p, SSL *ssl)
char *decimal = BN_bn2dec(bn); char *decimal = BN_bn2dec(bn);
result = apr_pstrcat(p, "{ serialNumber ", decimal, result = apr_pstrcat(p, "{ serialNumber ", decimal,
", issuer rdnSequence:\"", ", issuer rdnSequence:\"",
SSL_X509_NAME_to_string(p, issuer, 0), "\" }", NULL); modssl_X509_NAME_to_string(p, issuer, 0), "\" }", NULL);
OPENSSL_free(decimal); OPENSSL_free(decimal);
BN_free(bn); BN_free(bn);
} }

2
modules/ssl/ssl_util_ssl.c
View File

@@ -224,7 +224,7 @@ char *modssl_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne)
* convert an X509_NAME to an RFC 2253 formatted string, optionally truncated * convert an X509_NAME to an RFC 2253 formatted string, optionally truncated
* to maxlen characters (specify a maxlen of 0 for no length limit) * to maxlen characters (specify a maxlen of 0 for no length limit)
*/ */
char *SSL_X509_NAME_to_string(apr_pool_t *p, X509_NAME *dn, int maxlen) char *modssl_X509_NAME_to_string(apr_pool_t *p, X509_NAME *dn, int maxlen)
{ {
char *result = NULL; char *result = NULL;
BIO *bio; BIO *bio;

2
modules/ssl/ssl_util_ssl.h
View File

@@ -64,7 +64,7 @@ EVP_PKEY *modssl_read_privatekey(const char *, EVP_PKEY **, pem_password_cb *,
int modssl_smart_shutdown(SSL *ssl); int modssl_smart_shutdown(SSL *ssl);
BOOL modssl_X509_getBC(X509 *, int *, int *); BOOL modssl_X509_getBC(X509 *, int *, int *);
char *modssl_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); char *modssl_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_getSAN(apr_pool_t *, X509 *, int, int, apr_array_header_t **);
BOOL SSL_X509_getIDs(apr_pool_t *, X509 *, apr_array_header_t **); BOOL SSL_X509_getIDs(apr_pool_t *, X509 *, apr_array_header_t **);
BOOL SSL_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *); BOOL SSL_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *);