From ab062bfbab08965fb1b7b407c9dfb71c209e04fb Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 4 Aug 2011 08:04:20 +0000 Subject: [PATCH] * 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 --- modules/ssl/ssl_engine_dh.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 (); 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 (); close(FP); $dhsource =~ s|(DH\s+\*get_dh)(\d+)[^}]*\n}|static $1$2(void) -- 2.40.0