From: Samuli Seppänen <samuli@openvpn.net>
Date: Fri, 17 Jun 2011 09:18:02 +0000 (+0300)
Subject: Fix a build-ca issue on Windows
X-Git-Tag: v2.3-alpha1~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38108434db7b2d574133dd645d01df03848532d6;p=thirdparty%2Fopenvpn.git

Fix a build-ca issue on Windows

Fixes Trac ticket #125

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
---

diff --git a/easy-rsa/Windows/init-config.bat b/easy-rsa/Windows/init-config.bat
index 048d55853..12e6d78e1 100755
--- a/easy-rsa/Windows/init-config.bat
+++ b/easy-rsa/Windows/init-config.bat
@@ -1,2 +1 @@
 copy vars.bat.sample vars.bat
-copy openssl.cnf.sample openssl.cnf
diff --git a/win/openvpn.nsi b/win/openvpn.nsi
index d3f80d0c9..d667d7602 100755
--- a/win/openvpn.nsi
+++ b/win/openvpn.nsi
@@ -272,8 +272,9 @@ Section "${PRODUCT_NAME} RSA Certificate Management Scripts" SecOpenVPNEasyRSA
 
   # FIXME: the easy-rsa directory would need cleaning up
 
-  # Original nsi script looked for openssl.cnf.sample
-  File "${EASYRSA}\2.0\openssl.cnf"
+  # Original nsi script looked for ${EASYRSA}\2.0\openssl.cnf.sample. A newer
+  # openssl.cnf is needed on OpenVPN 2.2+.
+  File "${EASYRSA}\Windows\openssl.cnf"
 
   File "${EASYRSA}\Windows\vars.bat.sample"