version 1.60, 2018/12/11 12:24:56
|
version 1.61, 2018/12/11 20:51:08
|
Line 288 sub new {
|
Line 288 sub new {
|
my ($ca, $cert) = lonssl::CertificateFile; |
my ($ca, $cert) = lonssl::CertificateFile; |
my $sslkeyfile = lonssl::KeyFile; |
my $sslkeyfile = lonssl::KeyFile; |
my $badcertfile = lonssl::has_badcert_file($self->{LoncapaHim}); |
my $badcertfile = lonssl::has_badcert_file($self->{LoncapaHim}); |
|
my ($loncaparev) = ($perlvar{'lonVersion'} =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/); |
|
|
if (($conntype ne 'no') && (defined($ca)) && (defined($cert)) && (defined($sslkeyfile)) && |
if (($conntype ne 'no') && (defined($ca)) && (defined($cert)) && (defined($sslkeyfile)) && |
(!exists($badcerts{$self->{LoncapaHim}})) && !$badcertfile) { |
(!exists($badcerts{$self->{LoncapaHim}})) && !$badcertfile) { |
$self->{AuthenticationMode} = "ssl"; |
$self->{AuthenticationMode} = "ssl"; |
$self->{TransactionRequest} = "init:ssl:$perlvar{'lonVersion'}\n"; |
$self->{TransactionRequest} = "init:ssl:$loncaparev\n"; |
} elsif ($self->{InsecureOK}) { |
} elsif ($self->{InsecureOK}) { |
# Allowed to do insecure: |
# Allowed to do insecure: |
$self->{AuthenticationMode} = "insecure"; |
$self->{AuthenticationMode} = "insecure"; |
$self->{TransactionRequest} = "init::$perlvar{'lonVersion'}\n"; |
$self->{TransactionRequest} = "init::$loncaparev\n"; |
} else { |
} else { |
# Not allowed to do insecure... |
# Not allowed to do insecure... |
$socket->close; |
$socket->close; |