svn commit: r1153773 - /httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c

[jo...@apache.org]

Author: jorton
Date: Thu Aug  4 08:04:20 2011
New Revision: 1153773

URL: http://svn.apache.org/viewvc?rev=1153773&view=rev
Log:
* modules/ssl/ssl_engine_dh.c: Fix indent args so the code
  regeneration modifies the OpenSSL output correctly.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c?rev=1153773&r1=1153772&r2=1153773&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_dh.c Thu Aug  4 08:04:20 2011
@@ -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)