crypto: Fixes to make privkey_to_pubkey behave similar to other functions

1 files changed, 26 insertions, 14 deletions

diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index dc93259a70..5967331d8e 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -432,23 +432,31 @@ pub_encrypt_priv_decrypt_rsa_pwd(Config) ->
 get_pub_from_priv_key_rsa(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "rsa_private_key.pem")},
-    Pub = crypto:privkey_to_pubkey(rsa, Priv),
-    ct:log("rsa Pub = ~p",[Pub]),
-    sign_verify(rsa, sha, Priv, Pub).
+    try crypto:privkey_to_pubkey(rsa, Priv) of
+        Pub ->
+            ct:log("rsa Pub = ~p",[Pub]),
+            sign_verify(rsa, sha, Priv, Pub)
+    catch
+        error:notsup -> {skip, "RSA not implemented"}
+    end.
 
 get_pub_from_priv_key_rsa_pwd(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "rsa_private_key_pwd.pem"),
              password => "password"},
-    Pub = crypto:privkey_to_pubkey(rsa, Priv),
-    ct:log("rsa Pub = ~p",[Pub]),
-    sign_verify(rsa, sha, Priv, Pub).
+    try crypto:privkey_to_pubkey(rsa, Priv) of
+        Pub ->
+            ct:log("rsa Pub = ~p",[Pub]),
+            sign_verify(rsa, sha, Priv, Pub)
+    catch
+        error:notsup -> {skip, "RSA not supported"}
+    end.
 
 get_pub_from_priv_key_rsa_pwd_no_pwd(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "rsa_private_key_pwd.pem")},
     try crypto:privkey_to_pubkey(rsa, Priv) of
-        _ -> {fail, "PWD prot pubkey fetch succeded with no pwd!"}
+        _ -> {fail, "PWD prot pubkey fetch succeded although no pwd!"}
     catch
         error:badarg -> ok
     end.
@@ -466,19 +474,23 @@ get_pub_from_priv_key_rsa_pwd_bad_pwd(Config) ->
 get_pub_from_priv_key_dsa(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "dsa_private_key.pem")},
-    Pub = crypto:privkey_to_pubkey(dss, Priv),
-    ct:log("dsa Pub = ~p",[Pub]),
-    sign_verify(dss, sha, Priv, Pub).
+    try crypto:privkey_to_pubkey(dss, Priv) of
+        Pub ->
+            ct:log("dsa Pub = ~p",[Pub]),
+            sign_verify(dss, sha, Priv, Pub)
+    catch
+        error:notsup -> {skip, "DSA not supported"}
+    end.
 
 get_pub_from_priv_key_ecdsa(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "ecdsa_private_key.pem")},
-    Pub = crypto:privkey_to_pubkey(ecdsa, Priv),
-    case Pub of
-        notsup -> {skip, "ECDSA not implemented"};
-        _ ->
+    try crypto:privkey_to_pubkey(ecdsa, Priv) of
+        Pub ->
             ct:log("ecdsa Pub = ~p",[Pub]),
             sign_verify(ecdsa, sha, Priv, Pub)
+    catch
+        error:notsup -> {skip, "ECDSA not supported"}
     end.
     
 %%%================================================================