Merge remote-tracking branch 'myself/dgud/public_key/cacerts-sunos/OT…

…P-18814' into maint * myself/dgud/public_key/cacerts-sunos/OTP-18814: Add OmniOS (illumos) cacert directories
bjorng · Oct 19, 2023 · 15286ce · 15286ce
2 parents 395b237 + 52e1e16
commit 15286ce
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/public_key/src/pubkey_os_cacerts.erl b/lib/public_key/src/pubkey_os_cacerts.erl
@@ -54,7 +54,7 @@ load() ->
         {unix, netbsd} ->
             load_from_file(bsd_paths());
         {unix, sunos} ->
-            load_from_files(sunos_path());
+            load_from_files(sunos_paths());
         {win32, _} ->
             load_win32();
 	{unix, darwin} ->
@@ -161,8 +161,10 @@ bsd_paths() ->
      "/etc/openssl/certs/ca-certificates.crt"
     ].
 
-sunos_path() ->
-    "/etc/certs/CA/".
+sunos_paths() ->
+    ["/etc/certs/CA/", %% Oracle Solaris, some older illumos distros
+     "/etc/ssl/cacert.pem" %% OmniOS
+    ].
 
 run_cmd(Cmd, Args) ->
     Opts = [binary, exit_status, stderr_to_stdout],