Add Unix/Linux keystore support

eduardomozart · web-flow · commit 7dd35dba4f4a · 2025-01-17T13:58:58.000-03:00
diff --git a/lib/GLPI/Agent/HTTP/Client.pm b/lib/GLPI/Agent/HTTP/Client.pm
@@ -692,6 +692,13 @@ sub _KeyChain_or_KeyStore_Export {
         }
     }
 
+    # Like Mozilla::CA, but using certs from /etc/ssl/certs
+    if ($OSNAME !~ /^darwin|MSWin32$/) {
+        my $cacert = "/etc/ssl/certs/ca-certificates.crt";
+        push @certs, IO::Socket::SSL::Utils::PEM_file2certs($cacert)
+            if -e $cacert;
+    }
+
     # Always include default CA file from Mozilla::CA
     if (Mozilla::CA->require()) {
         my $cacert = Mozilla::CA::SSL_ca_file();

Original file line number	Diff line number	Diff line change
`@@ -692,6 +692,13 @@ sub _KeyChain_or_KeyStore_Export {`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`
	`695`	`+ # Like Mozilla::CA, but using certs from /etc/ssl/certs`
	`696`	`+ if ($OSNAME !~ /^darwin\|MSWin32$/) {`
	`697`	`+ my $cacert = "/etc/ssl/certs/ca-certificates.crt";`
	`698`	`+ push @certs, IO::Socket::SSL::Utils::PEM_file2certs($cacert)`
	`699`	`+ if -e $cacert;`
	`700`	`+ }`
	`701`	`+`
`695`	`702`	`# Always include default CA file from Mozilla::CA`
`696`	`703`	`if (Mozilla::CA->require()) {`
`697`	`704`	`my $cacert = Mozilla::CA::SSL_ca_file();`