generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

secureserver.pl: make OpenSSL CApath and cert absolute path values

Browse Source 
Recent stunnel versions (5.08) seem to have trouble with relative
paths on Windows. This turns the relative paths into absolute ones.
This commit is contained in:
Marc Hoersken
2014-12-19 17:16:19 +01:00
parent a390329f60
commit 3b7bf29385
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/secureserver.pl
View File

@@ -33,6 +33,7 @@ BEGIN {
use strict; use strict;
use warnings; use warnings;
use Cwd; use Cwd;
use Cwd 'abs_path';
use serverhelp qw( use serverhelp qw(
server_pidfilename server_pidfilename
@@ -62,6 +63,7 @@ my $ipvnum = 4; # default IP version of stunneled server
my $idnum = 1; # dafault stunneled server instance number my $idnum = 1; # dafault stunneled server instance number
my $proto = 'https'; # default secure server protocol my $proto = 'https'; # default secure server protocol
my $conffile; # stunnel configuration file my $conffile; # stunnel configuration file
my $capath; # certificate chain PEM folder
my $certfile; # certificate chain PEM file my $certfile; # certificate chain PEM file
#*************************************************************************** #***************************************************************************
@@ -178,7 +180,9 @@ if(!$logfile) {
$conffile = "$path/stunnel.conf"; $conffile = "$path/stunnel.conf";
$capath = abs_path($path);
$certfile = "$srcdir/". ($stuncert?"certs/$stuncert":"stunnel.pem"); $certfile = "$srcdir/". ($stuncert?"certs/$stuncert":"stunnel.pem");
$certfile = abs_path($certfile);
my $ssltext = uc($proto) ." SSL/TLS:"; my $ssltext = uc($proto) ." SSL/TLS:";
@@ -254,7 +258,7 @@ if($stunnel_version >= 400) {
# stunnel configuration file # stunnel configuration file
if(open(STUNCONF, ">$conffile")) { if(open(STUNCONF, ">$conffile")) {
print STUNCONF " print STUNCONF "
CApath = $path CApath = $capath
cert = $certfile cert = $certfile
debug = $loglevel debug = $loglevel
socket = $socketopt"; socket = $socketopt";
@@ -285,7 +289,7 @@ if($stunnel_version >= 400) {
if($verbose) { if($verbose) {
print uc($proto) ." server (stunnel $ver_major.$ver_minor)\n"; print uc($proto) ." server (stunnel $ver_major.$ver_minor)\n";
print "cmd: $cmd\n"; print "cmd: $cmd\n";
print "CApath = $path\n"; print "CApath = $capath\n";
print "cert = $certfile\n"; print "cert = $certfile\n";
print "pid = $pidfile\n"; print "pid = $pidfile\n";
print "debug = $loglevel\n"; print "debug = $loglevel\n";