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

* Style police / style nitpicking. No functional changes.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424823 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2006-07-23 21:22:37 +00:00
parent bf18b7cbdf
commit 047d24699d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ssl/ssl_engine_init.c
View File

@@ -648,14 +648,14 @@ static void ssl_init_ctx_crl(server_rec *s,
} }
} }
static void ssl_init_ctx_pkcs7_cert_chain(server_rec *s,modssl_ctx_t *mctx) static void ssl_init_ctx_pkcs7_cert_chain(server_rec *s, modssl_ctx_t *mctx)
{ {
STACK_OF(X509) *certs=ssl_read_pkcs7(s, mctx->pkcs7); STACK_OF(X509) *certs = ssl_read_pkcs7(s, mctx->pkcs7);
int n; int n;
if (!mctx->ssl_ctx->extra_certs) if (!mctx->ssl_ctx->extra_certs)
for (n = 1; n < sk_X509_num(certs); ++n) for (n = 1; n < sk_X509_num(certs); ++n)
SSL_CTX_add_extra_chain_cert(mctx->ssl_ctx, sk_X509_value(certs, n)); SSL_CTX_add_extra_chain_cert(mctx->ssl_ctx, sk_X509_value(certs, n));
} }
static void ssl_init_ctx_cert_chain(server_rec *s, static void ssl_init_ctx_cert_chain(server_rec *s,

4
modules/ssl/ssl_util.c
View File

@@ -265,7 +265,7 @@ const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
return apr_pstrcat(p, id, ":", keystr, NULL); return apr_pstrcat(p, id, ":", keystr, NULL);
} }
STACK_OF(X509) *ssl_read_pkcs7(server_rec *s,const char *pkcs7) STACK_OF(X509) *ssl_read_pkcs7(server_rec *s, const char *pkcs7)
{ {
PKCS7 *p7; PKCS7 *p7;
STACK_OF(X509) *certs = NULL; STACK_OF(X509) *certs = NULL;
@@ -277,7 +277,7 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s,const char *pkcs7)
ssl_die(); ssl_die();
} }
p7 = PEM_read_PKCS7(f,NULL,NULL,NULL); p7 = PEM_read_PKCS7(f, NULL, NULL, NULL);
if (!p7) { if (!p7) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
"Can't read PKCS7 object %s", pkcs7); "Can't read PKCS7 object %s", pkcs7);