Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FBDF9A33 for ; Mon, 19 Sep 2011 10:49:08 +0000 (UTC) Received: (qmail 20628 invoked by uid 500); 19 Sep 2011 10:49:07 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 20526 invoked by uid 500); 19 Sep 2011 10:49:07 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 20517 invoked by uid 99); 19 Sep 2011 10:49:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 10:49:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 10:49:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7E15238888F; Mon, 19 Sep 2011 10:48:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172562 - /httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Date: Mon, 19 Sep 2011 10:48:45 -0000 To: cvs@httpd.apache.org From: druggeri@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110919104845.D7E15238888F@eris.apache.org> Author: druggeri Date: Mon Sep 19 10:48:45 2011 New Revision: 1172562 URL: http://svn.apache.org/viewvc?rev=1172562&view=rev Log: Style cleanup Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1172562&r1=1172561&r2=1172562&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Mon Sep 19 10:48:45 2011 @@ -1189,7 +1189,7 @@ static void ssl_init_proxy_certs(server_ X509_NAME_oneline(name, cert_cn, sizeof(cert_cn)); X509_STORE_CTX_init(sctx, store, inf->x509, NULL); - res=X509_verify_cert(sctx); + res = X509_verify_cert(sctx); chain = X509_STORE_CTX_get1_chain(sctx); if (res == 1) { @@ -1201,13 +1201,13 @@ static void ssl_init_proxy_certs(server_ X509_free(sk_X509_shift(chain)); } else { - int n=X509_STORE_CTX_get_error(sctx); + int err = X509_STORE_CTX_get_error(sctx); ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "SSL proxy client cert chain verification failed for %s: %s", - cert_cn, X509_verify_cert_error_string(n)); + cert_cn, X509_verify_cert_error_string(err)); } ERR_clear_error(); - i=sk_X509_num(chain); + i = sk_X509_num(chain); pkp->ca_certs[n] = chain; if (i == 0 || (res != 1 && i == 1) ) { @@ -1217,7 +1217,7 @@ static void ssl_init_proxy_certs(server_ i = 0; pkp->ca_certs[n] = NULL; } - + X509_STORE_CTX_cleanup(sctx); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,