From: Joe Orton <jorton@apache.org>
Date: Thu, 4 Aug 2011 08:04:20 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_dh.c: Fix indent args so the code
X-Git-Tag: 2.3.15~417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab062bfbab08965fb1b7b407c9dfb71c209e04fb;p=apache

* modules/ssl/ssl_engine_dh.c: Fix indent args so the code
  regeneration modifies the OpenSSL output correctly.


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

diff --git a/modules/ssl/ssl_engine_dh.c b/modules/ssl/ssl_engine_dh.c
index 91d2df472d..0239924b37 100644
--- a/modules/ssl/ssl_engine_dh.c
+++ b/modules/ssl/ssl_engine_dh.c
@@ -175,12 +175,14 @@ close(FP);
 $dhinfo =~ s|^|** |mg;
 $dhinfo = "\n\/\*\n$dhinfo\*\/\n\n";
 
+my $indent_args = "-i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1";
+
 #   generate C source from DH params
 my $dhsource = '';
-open(FP, "openssl dh -noout -C -in dh512.pem | indent | expand |") || die;
+open(FP, "openssl dh -noout -C -in dh512.pem | indent $indent_args | expand |") || die;
 $dhsource .= $_ while (<FP>);
 close(FP);
-open(FP, "openssl dh -noout -C -in dh1024.pem | indent | expand |") || die;
+open(FP, "openssl dh -noout -C -in dh1024.pem | indent $indent_args | expand |") || die;
 $dhsource .= $_ while (<FP>);
 close(FP);
 $dhsource =~ s|(DH\s+\*get_dh)(\d+)[^}]*\n}|static $1$2(void)