From 79d7554a7c66130b2c1392970da415393ba41c5c Mon Sep 17 00:00:00 2001
From: James McKenzie <git@madingley.org>
Date: Sun, 13 Oct 2019 01:41:06 +0100
Subject: fix up for fc30

---
 INF/ILO.pm | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'INF/ILO.pm')

diff --git a/INF/ILO.pm b/INF/ILO.pm
index 99da2ea..1bca34a 100644
--- a/INF/ILO.pm
+++ b/INF/ILO.pm
@@ -1,7 +1,5 @@
 #!/usr/bin/env perl 
 
-IO::Socket::SSL::set_ctx_defaults( SSL_verify_mode => SSL_VERIFY_NONE );
-
 package INF::ILO;
 
 use HTTP::Daemon::SSL;
@@ -18,6 +16,10 @@ use XML::Simple;
 use Data::Dumper;
 use JSON::PP;
 
+#IO::Socket::SSL::set_ctx_defaults( SSL_verify_mode => SSL_VERIFY_NONE );
+IO::Socket::SSL::set_ctx_defaults(
+    SSL_verify_mode => Net::SSLeay::VERIFY_NONE() );
+
 sub read_file($) {
     my ($name) = @_;
 
@@ -100,7 +102,6 @@ sub setup_port_proxy($$$$) {
     return $child;
 }
 
-
 sub proxy($$$) {
     my ( $self, $req, $res ) = @_;
 
@@ -213,7 +214,7 @@ sub view($) {
     }
     my $content = $res->content;
 
-    unless ( $content =~ /Netscape'\) \{(.*)}[\s\n]*else if/s ) {
+    unless ( $content =~ /Netscape'\) \{(.*)\}[\s\n]*else if/s ) {
         print STDERR "returned html doesn't look right\n";
         return -1;
     }
@@ -250,8 +251,21 @@ sub view($) {
     $SIG{TERM} = sub { kill 'TERM', ( @{ $self->{to_kill} } ); die; };
 
     system(
+        "echo",
         "appletviewer",
         "-J-Djava.security.manager",
+
+        #        "-J-Djava.security.debug=access,failure,policy",
+        "-J-Djava.security.policy=/usr/local/share/inf/ilo/mypolicy",
+        "-J-Djavax.net.ssl.trustStore=/usr/local/share/inf/ilo/server.jks",
+        $self->{proxy_url} . "/html/java_irc.html"
+    );
+
+    system(
+        "appletviewer",
+        "-J-Djava.security.manager",
+
+        #        "-J-Djava.security.debug=access,failure,policy",
         "-J-Djava.security.policy=/usr/local/share/inf/ilo/mypolicy",
         "-J-Djavax.net.ssl.trustStore=/usr/local/share/inf/ilo/server.jks",
         $self->{proxy_url} . "/html/java_irc.html"
@@ -404,7 +418,9 @@ sub new ($;$) {
     $self->{userid} = undef;
 
     $self->{ua}->ssl_opts(
-        SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE,
+
+        #	SSL_verify_mode => SSL_VERIFY_NONE,
+        SSL_verify_mode => Net::SSLeay::VERIFY_NONE(),
         verify_hostname => 0,
     );
 
@@ -416,7 +432,6 @@ sub new ($;$) {
         $self->{proxy_port} = $parm->{proxy_port};
     }
 
-
     my $local_port = int( rand(30000) ) + 30000;
 
     $self->{proxy_url} = 'https://127.0.0.1:' . $local_port;
@@ -425,9 +440,10 @@ sub new ($;$) {
         port         => $local_port,
         daemon_class => 'HTTP::Daemon::SSL',
         daemon_args  => [
-            LocalAddr     => '127.0.0.1',
-            SSL_key_file  => '/usr/local/share/inf/ilo/server.key',
-            SSL_cert_file => '/usr/local/share/inf/ilo/server.crt',
+            LocalAddr       => '127.0.0.1',
+            SSL_key_file    => '/usr/local/share/inf/ilo/server.key',
+            SSL_cert_file   => '/usr/local/share/inf/ilo/server.crt',
+            SSL_verify_mode => Net::SSLeay::VERIFY_NONE(),
         ],
     );
     $self->{server}->mount(
-- 
cgit v1.2.3