Merge branch 'hans/crypto/fix_wrong_error_return_privkey_to_pubkey' into maint

* hans/crypto/fix_wrong_error_return_privkey_to_pubkey:
  crypto: engine_SUITE update
  crypto: fix pubkey_to_privkey

1 files changed, 48 insertions, 20 deletions

diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index 5967331d8e..06cce832ac 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -432,65 +432,93 @@ 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")},
-    try crypto:privkey_to_pubkey(rsa, Priv) of
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
         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"},
-    try crypto:privkey_to_pubkey(rsa, Priv) of
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
         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 although no pwd!"}
-    catch
-        error:badarg -> ok
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            ok;
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub -> 
+            ct:log("rsa Pub = ~p",[Pub]),
+            {fail, "PWD prot pubkey fetch succeded although no pwd!"}
     end.
 
 get_pub_from_priv_key_rsa_pwd_bad_pwd(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "rsa_private_key_pwd.pem"),
              password => "Bad password"},
-    try crypto:privkey_to_pubkey(rsa, Priv) of
-        _ -> {fail, "PWD prot pubkey fetch succeded with bad pwd!"}
-    catch
-        error:badarg -> ok
+    case crypto:privkey_to_pubkey(rsa, Priv) of
+        {error, not_found} ->
+            ok;
+        {error, notsup} ->
+            {skip, "RSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
+        Pub -> 
+            ct:log("rsa Pub = ~p",[Pub]),
+            {fail, "PWD prot pubkey fetch succeded with bad pwd!"}
     end.
 
 get_pub_from_priv_key_dsa(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "dsa_private_key.pem")},
-    try crypto:privkey_to_pubkey(dss, Priv) of
+    case crypto:privkey_to_pubkey(dss, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "DSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
         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")},
-    try crypto:privkey_to_pubkey(ecdsa, Priv) of
+    case crypto:privkey_to_pubkey(ecdsa, Priv) of
+        {error, not_found} ->
+            {fail, "Key not found"};
+        {error, notsup} ->
+            {skip, "ECDSA not supported"};
+        {error, Error} ->
+            {fail, {wrong_error,Error}};
         Pub ->
             ct:log("ecdsa Pub = ~p",[Pub]),
             sign_verify(ecdsa, sha, Priv, Pub)
-    catch
-        error:notsup -> {skip, "ECDSA not supported"}
     end.
     
 %%%================================================================