Commit a9eb8045 authored by Ben Laurie's avatar Ben Laurie
Browse files

Layout and compiler warning. 


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

modules/ssl/ssl_engine_pphrase.c

+26 −23
Original line number Diff line number Diff line
@@ -199,13 +199,15 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
                 && (sc->server->pks->cert_files[i] != NULL

                     || sc->server->pkcs7); i++) {

            if (sc->server->pkcs7) {

		STACK_OF(X509) *certs = ssl_read_pkcs7(pServ, sc->server->pkcs7);



                STACK_OF(X509) *certs = ssl_read_pkcs7(pServ,

                                                       sc->server->pkcs7);

                pX509Cert = sk_X509_value(certs, 0);

                i = SSL_AIDX_MAX;

            } else {

		apr_cpystrn(szPath, sc->server->pks->cert_files[i], sizeof(szPath));

		if ((rv = exists_and_readable(szPath, p, NULL)) != APR_SUCCESS) {

                apr_cpystrn(szPath, sc->server->pks->cert_files[i],

                            sizeof(szPath));

                if ((rv = exists_and_readable(szPath, p, NULL))

                    != APR_SUCCESS) {

                    ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,

                                 "Init: Can't open server certificate file %s",

                                 szPath);
@@ -213,7 +215,8 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
                }

                if ((pX509Cert = SSL_read_X509(szPath, NULL, NULL)) == NULL) {

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,

				 "Init: Unable to read server certificate from file %s", szPath);

                                 "Init: Unable to read server certificate from"

                                 " file %s", szPath);

                    ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s);

                    ssl_die();

                }

modules/ssl/ssl_util.c

+18 −16
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ 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");
@@ -306,6 +306,8 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s,const char *pkcs7) 
        ssl_die();

    }



    fclose(f);



    return certs;

}

modules/ssl/mod_ssl.c

+2 −2

File changed.

Contains only whitespace changes.

modules/ssl/ssl_engine_init.c

+4 −4

File changed.

Contains only whitespace changes.