cacert/cats
9
0
Fork 0
mirror of https://github.com/CAcertOrg/cats.git synced 2024-11-22 05:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release' into testserver

Browse source
This commit is contained in:
Bernhard Fröhlich 2015-11-27 21:55:20 +01:00
commit 030fdc9726
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
functions/UploadResults.pl
View file

@ -3,8 +3,9 @@ use Socket;
use Net::SSLeay qw(die_now die_if_ssl_error) ;
use DBI;
my $CertFile = "cert_200808.pem";
my $KeyFile = "key_200808.pem";
# Be sure the CertFile includes a key chain if you are using class 3 certificates
my $CertFile;
my $KeyFile;
my $CAfile = "CAcert_roots.pem";
my $TargetHost="secure.cacert.org";
my $TargetScript="cats/cats_import.php";
@ -57,7 +58,7 @@ sub SendRecord($$$$$$)
die_if_ssl_error("ssl_read_CRLF");
if (!$CurLine) {
print "ssl_read_CRLF returns nothing\n";
return "BREAK";
return (1, "BREAK");
}
if (CurLine =~ /^HTTP\/[0-9.]+ (\d+) (.+)/i) {
$HTTPResult = $1;
@ -205,8 +206,11 @@ do {
# Set accepted CAs
Net::SSLeay::CTX_load_verify_locations($ctx, $CAfile, 0);
# Add client vertificate
Net::SSLeay::set_cert_and_key($ctx, $CertFile, $KeyFile);
# Add client certificate
# set_cert_and_key does not load a chain file, so use the low-level functions
#Net::SSLeay::set_cert_and_key($ctx, $CertFile, $KeyFile);
Net::SSLeay::CTX_use_certificate_chain_file($ctx, $CertFile);
Net::SSLeay::CTX_use_PrivateKey_file($ctx, $KeyFile, &Net::SSLeay::FILETYPE_PEM);
$ssl = Net::SSLeay::new($ctx) or die_now("Failed to create SSL $!");
Net::SSLeay::set_fd($ssl, fileno(S)); # Must use fileno