--- loncom/lonssl.pm 2018/08/09 13:27:55 1.18 +++ loncom/lonssl.pm 2018/12/03 03:40:39 1.20 @@ -1,5 +1,5 @@ # -# $Id: lonssl.pm,v 1.18 2018/08/09 13:27:55 raeburn Exp $ +# $Id: lonssl.pm,v 1.20 2018/12/03 03:40:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -238,7 +238,7 @@ sub PromoteServerSocket { $sslargs{SSL_verify_mode} = Net::SSLeay::VERIFY_PEER(); if (($CRLFile ne '') && (-e $CRLFile)) { $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); @@ -411,17 +411,13 @@ sub has_badcert_file { } sub Read_Connect_Config { - my ($secureconf,$checkedcrl,$perlvarref) = @_; - return unless ((ref($secureconf) eq 'HASH') && (ref($checkedcrl) eq 'HASH')); + my ($secureconf,$perlvarref) = @_; + return unless (ref($secureconf) eq 'HASH'); unless (ref($perlvarref) eq 'HASH') { $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. foreach my $key (keys(%{$secureconf})) { delete($secureconf->{$key}); @@ -429,7 +425,7 @@ sub Read_Connect_Config { my $result; my $tablename = $perlvarref->{'lonTabDir'}."/connectionrules.tab"; - if (open(my $fh,"<$tablename")) { + if (open(my $fh,'<',$tablename)) { while (my $line = <$fh>) { chomp($line); my ($name,$value) = split(/=/,$line); @@ -452,7 +448,7 @@ sub Read_Host_Types { unless (ref($perlvarref) eq 'HASH') { $perlvarref = $perlvar; } - + # Clean out the old table first. foreach my $key (keys(%{$hosttypes})) { delete($hosttypes->{$key}); @@ -460,7 +456,7 @@ sub Read_Host_Types { my $result; my $tablename = $perlvarref->{'lonTabDir'}."/hosttypes.tab"; - if (open(my $fh,"<$tablename")) { + if (open(my $fh,'<',$tablename)) { while (my $line = <$fh>) { chomp($line); my ($name,$value) = split(/:/,$line);