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

Layout and compiler warning.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424735 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ben Laurie
2006-07-23 13:17:28 +00:00
parent 892785ce39
commit 20c7ffc756
4 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/ssl/ssl_util.c
View File

@@ -268,44 +268,46 @@ const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
STACK_OF(X509) *ssl_read_pkcs7(server_rec *s,const char *pkcs7)
{
PKCS7 *p7;
STACK_OF(X509) *certs;
STACK_OF(X509) *certs = NULL;
FILE *f;
f = fopen(pkcs7, "r");
if (!f) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Can't open %s", pkcs7);
ssl_die();
ssl_die();
}
p7 = PEM_read_PKCS7(f,NULL,NULL,NULL);
if (!p7) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
"Can't read PKCS7 object %s", pkcs7);
ssl_log_ssl_error(APLOG_MARK, APLOG_CRIT, s);
exit(1);
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
"Can't read PKCS7 object %s", pkcs7);
ssl_log_ssl_error(APLOG_MARK, APLOG_CRIT, s);
exit(1);
}
switch (OBJ_obj2nid(p7->type)) {
case NID_pkcs7_signed:
certs = p7->d.sign->cert;
break;
certs = p7->d.sign->cert;
break;
case NID_pkcs7_signedAndEnveloped:
certs = p7->d.signed_and_enveloped->cert;
break;
certs = p7->d.signed_and_enveloped->cert;
break;
default:
ap_log_error(APLOG_MARK, APLOG_CRIT|APLOG_NOERRNO, 0, s,
"Don't understand PKCS7 file %s", pkcs7);
ssl_die();
ap_log_error(APLOG_MARK, APLOG_CRIT|APLOG_NOERRNO, 0, s,
"Don't understand PKCS7 file %s", pkcs7);
ssl_die();
}
if (!certs) {
ap_log_error(APLOG_MARK, APLOG_CRIT|APLOG_NOERRNO, 0, s,
"No certificates in %s", pkcs7);
ssl_die();
ap_log_error(APLOG_MARK, APLOG_CRIT|APLOG_NOERRNO, 0, s,
"No certificates in %s", pkcs7);
ssl_die();
}
fclose(f);
return certs;
}