[Openvpn-devel] [PATCH] Fix a build-ca issue on Windows

[samuli]

From: Samuli Seppänen <sam...@openvpn.net>

Fixes Trac ticket #125
---
 easy-rsa/Windows/init-config.bat |    1 -
 win/openvpn.nsi                  |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/easy-rsa/Windows/init-config.bat b/easy-rsa/Windows/init-config.bat
index 048d558..12e6d78 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 d3f80d0..82be118 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"

-- 
1.7.4.1