version 1.18, 2018/08/09 13:27:55
|
version 1.20, 2018/12/03 03:40:39
|
Line 238 sub PromoteServerSocket {
|
Line 238 sub PromoteServerSocket {
|
$sslargs{SSL_verify_mode} = Net::SSLeay::VERIFY_PEER(); |
$sslargs{SSL_verify_mode} = Net::SSLeay::VERIFY_PEER(); |
if (($CRLFile ne '') && (-e $CRLFile)) { |
if (($CRLFile ne '') && (-e $CRLFile)) { |
$sslargs{SSL_check_crl} = 1; |
$sslargs{SSL_check_crl} = 1; |
$sslargs{SSL_crl_file} = $CRLFile; |
$sslargs{SSL_crl_file} = $CRLFile; |
} |
} |
} |
} |
my $client = IO::Socket::SSL->new_from_fd($dupfno,%sslargs); |
my $client = IO::Socket::SSL->new_from_fd($dupfno,%sslargs); |
Line 411 sub has_badcert_file {
|
Line 411 sub has_badcert_file {
|
} |
} |
|
|
sub Read_Connect_Config { |
sub Read_Connect_Config { |
my ($secureconf,$checkedcrl,$perlvarref) = @_; |
my ($secureconf,$perlvarref) = @_; |
return unless ((ref($secureconf) eq 'HASH') && (ref($checkedcrl) eq 'HASH')); |
return unless (ref($secureconf) eq 'HASH'); |
|
|
unless (ref($perlvarref) eq 'HASH') { |
unless (ref($perlvarref) eq 'HASH') { |
$perlvarref = $perlvar; |
$perlvarref = $perlvar; |
} |
} |
|
|
# Clear hash of clients for which Certificate Revocation List checked |
|
foreach my $key (keys(%{$checkedcrl})) { |
|
delete($checkedcrl->{$key}); |
|
} |
|
# Clean out the old table first. |
# Clean out the old table first. |
foreach my $key (keys(%{$secureconf})) { |
foreach my $key (keys(%{$secureconf})) { |
delete($secureconf->{$key}); |
delete($secureconf->{$key}); |
Line 429 sub Read_Connect_Config {
|
Line 425 sub Read_Connect_Config {
|
|
|
my $result; |
my $result; |
my $tablename = $perlvarref->{'lonTabDir'}."/connectionrules.tab"; |
my $tablename = $perlvarref->{'lonTabDir'}."/connectionrules.tab"; |
if (open(my $fh,"<$tablename")) { |
if (open(my $fh,'<',$tablename)) { |
while (my $line = <$fh>) { |
while (my $line = <$fh>) { |
chomp($line); |
chomp($line); |
my ($name,$value) = split(/=/,$line); |
my ($name,$value) = split(/=/,$line); |
Line 452 sub Read_Host_Types {
|
Line 448 sub Read_Host_Types {
|
unless (ref($perlvarref) eq 'HASH') { |
unless (ref($perlvarref) eq 'HASH') { |
$perlvarref = $perlvar; |
$perlvarref = $perlvar; |
} |
} |
|
|
# Clean out the old table first. |
# Clean out the old table first. |
foreach my $key (keys(%{$hosttypes})) { |
foreach my $key (keys(%{$hosttypes})) { |
delete($hosttypes->{$key}); |
delete($hosttypes->{$key}); |
Line 460 sub Read_Host_Types {
|
Line 456 sub Read_Host_Types {
|
|
|
my $result; |
my $result; |
my $tablename = $perlvarref->{'lonTabDir'}."/hosttypes.tab"; |
my $tablename = $perlvarref->{'lonTabDir'}."/hosttypes.tab"; |
if (open(my $fh,"<$tablename")) { |
if (open(my $fh,'<',$tablename)) { |
while (my $line = <$fh>) { |
while (my $line = <$fh>) { |
chomp($line); |
chomp($line); |
my ($name,$value) = split(/:/,$line); |
my ($name,$value) = split(/:/,$line); |