version 1.61, 2018/12/11 20:51:08
|
version 1.62, 2018/12/14 02:05:38
|
Line 176 host the remote lond is on. This host is
|
Line 176 host the remote lond is on. This host is
|
=cut |
=cut |
|
|
sub new { |
sub new { |
my ($class, $DnsName, $Port, $lonid, $deflonid) = @_; |
my ($class, $DnsName, $Port, $lonid, $deflonid, $loncaparev) = @_; |
|
|
if (!$ConfigRead) { |
if (!$ConfigRead) { |
ReadConfig(); |
ReadConfig(); |
$ConfigRead = 1; |
$ConfigRead = 1; |
} |
} |
&Debug(4,$class."::new( ".$DnsName.",".$Port.",".$lonid.",".$deflonid.")\n"); |
&Debug(4,$class."::new( ".$DnsName.",".$Port.",".$lonid.",".$deflonid.",".$loncaparev.")\n"); |
|
|
my ($conntype,$gotconninfo,$allowinsecure); |
my ($conntype,$gotconninfo,$allowinsecure); |
if ((ref($secureconf{'connto'}) eq 'HASH') && |
if ((ref($secureconf{'connto'}) eq 'HASH') && |
Line 212 sub new {
|
Line 212 sub new {
|
my $self = { Host => $DnsName, |
my $self = { Host => $DnsName, |
LoncapaHim => $lonid, |
LoncapaHim => $lonid, |
LoncapaDefid => $deflonid, |
LoncapaDefid => $deflonid, |
|
LoncapaRev => $loncaparev, |
Port => $Port, |
Port => $Port, |
State => "Initialized", |
State => "Initialized", |
AuthenticationMode => "", |
AuthenticationMode => "", |
Line 1068 sub ExchangeKeysViaSSL {
|
Line 1069 sub ExchangeKeysViaSSL {
|
my $socket = $self->{Socket}; |
my $socket = $self->{Socket}; |
my $peer = $self->{LoncapaHim}; |
my $peer = $self->{LoncapaHim}; |
my $peerdef = $self->{LoncapaDefid}; |
my $peerdef = $self->{LoncapaDefid}; |
|
my $loncaparev = $self->{LoncapaRev}; |
|
|
# Get our signed certificate, the certificate authority's |
# Get our signed certificate, the certificate authority's |
# certificate and our private key file. All of these |
# certificate and our private key file. All of these |
Line 1089 sub ExchangeKeysViaSSL {
|
Line 1091 sub ExchangeKeysViaSSL {
|
$SSLKey, |
$SSLKey, |
$peer, |
$peer, |
$peerdef, |
$peerdef, |
$CRLFile); |
$CRLFile, |
|
$loncaparev); |
if(defined $SSLSocket) { |
if(defined $SSLSocket) { |
my $key = <$SSLSocket>; |
my $key = <$SSLSocket>; |
lonssl::Close($SSLSocket); |
lonssl::Close($SSLSocket); |