Commit 4701a6f4 authored by Kaspar Brand's avatar Kaspar Brand
Browse files

logging adjustments: 

- consistently call ssl_log_ssl_error after ap_log_error etc.
- ssl_init_ConfigureServer: add vhost_id to log message


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

modules/ssl/ssl_engine_init.c

+1 −1
Changes for modules/ssl/ssl_engine_init.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ void ssl_init_ConfigureServer(server_rec *s, 
     */

    if ((sc->enabled == SSL_ENABLED_TRUE) || (sc->enabled == SSL_ENABLED_OPTIONAL)) {

        ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(01914)

                     "Configuring server for SSL protocol");

                     "Configuring server %s for SSL protocol", sc->vhost_id);

        ssl_init_server_ctx(s, p, ptemp, sc);

    }

modules/ssl/ssl_engine_ocsp.c

+5 −5
Changes for modules/ssl/ssl_engine_ocsp.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ static OCSP_REQUEST *create_request(X509_STORE_CTX *ctx, X509 *cert, 


    *certid = OCSP_cert_to_id(NULL, cert, ctx->current_issuer);

    if (!*certid || !OCSP_request_add0_id(req, *certid)) {

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01921)

                     "could not retrieve certificate id");

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

        return NULL;

    }
@@ -164,9 +164,9 @@ static int verify_ocsp_status(X509 *cert, X509_STORE_CTX *ctx, conn_rec *c, 
    if (rc == V_OCSP_CERTSTATUS_GOOD) {

        basicResponse = OCSP_response_get1_basic(response);

        if (!basicResponse) {

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(01923)

                          "could not retrieve OCSP basic response");

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            rc = V_OCSP_CERTSTATUS_UNKNOWN;

        }

    }
@@ -182,9 +182,9 @@ static int verify_ocsp_status(X509 *cert, X509_STORE_CTX *ctx, conn_rec *c, 
    if (rc == V_OCSP_CERTSTATUS_GOOD) {

        /* TODO: allow flags configuration. */

        if (OCSP_basic_verify(basicResponse, NULL, ctx->ctx, 0) != 1) {

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01925)

                        "failed to verify the OCSP response");

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            rc = V_OCSP_CERTSTATUS_UNKNOWN;

        }

    }
@@ -196,9 +196,9 @@ static int verify_ocsp_status(X509 *cert, X509_STORE_CTX *ctx, conn_rec *c, 
        rc = OCSP_resp_find_status(basicResponse, certID, &status,

                                   &reason, NULL, &thisup, &nextup);

        if (rc != 1) {

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            ssl_log_cxerror(SSLLOG_MARK, APLOG_ERR, 0, c, cert, APLOGNO(02272)

                            "failed to retrieve OCSP response status");

            ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

            rc = V_OCSP_CERTSTATUS_UNKNOWN;

        }

        else {
@@ -216,9 +216,9 @@ static int verify_ocsp_status(X509 *cert, X509_STORE_CTX *ctx, conn_rec *c, 
            int vrc  = OCSP_check_validity(thisup, nextup, resptime_skew,

                                           sc->server->ocsp_resp_maxage);

            if (vrc != 1) {

                ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

                ssl_log_cxerror(SSLLOG_MARK, APLOG_ERR, 0, c, cert, APLOGNO(02273)

                                "OCSP response outside validity period");

                ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);

                rc = V_OCSP_CERTSTATUS_UNKNOWN;

            }

        }

modules/ssl/ssl_util_ocsp.c

+2 −2
Changes for modules/ssl/ssl_util_ocsp.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -262,9 +262,9 @@ static OCSP_RESPONSE *read_response(apr_socket_t *sd, BIO *bio, conn_rec *c, 
     * bio. */

    response = d2i_OCSP_RESPONSE_bio(bio, NULL);

    if (response == NULL) {

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, mySrvFromConn(c));

        ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(01988)

                      "failed to decode OCSP response data");

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, mySrvFromConn(c));

    }



    return response;
@@ -281,9 +281,9 @@ OCSP_RESPONSE *modssl_dispatch_ocsp_request(const apr_uri_t *uri, 


    bio = serialize_request(request, uri);

    if (bio == NULL) {

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, mySrvFromConn(c));

        ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(01989)

                      "could not serialize OCSP request");

        ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, mySrvFromConn(c));

        return NULL;

    }