aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Seppänen <samuli@openvpn.net>2011-06-17 12:18:02 +0300
committerDavid Sommerseth <davids@redhat.com>2011-06-20 11:01:04 +0200
commit38108434db7b2d574133dd645d01df03848532d6 (patch)
tree2d13c420f6f7248860b92f085bd1b15ba349f4bb
parentRemove support for Linux 2.2 configuration fallback (diff)
downloadopenvpn-38108434db7b2d574133dd645d01df03848532d6.tar.xz
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>
-rwxr-xr-xeasy-rsa/Windows/init-config.bat1
-rwxr-xr-xwin/openvpn.nsi5
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..d667d76 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"