crypto: Fixes to make privkey_to_pubkey behave similar to other functions

3 files changed, 31 insertions, 15 deletions

diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 8e2d33c928..565bede7e8 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -628,6 +628,10 @@
 	<p>Fetches the corresponding public key from a private key stored in an Engine.
 	The key must be of the type indicated by the Type parameter.
 	</p>	
+	<p>	  
+	  May throw exception notsup in case there is 
+	  no engine support in the underlying OpenSSL implementation.
+	</p>
       </desc>
     </func>
 
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 0d39dcc76e..8e3d41c1e9 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1061,7 +1061,7 @@ ec_curve(X) ->
 
 
 privkey_to_pubkey(Alg, EngineMap) when Alg == rsa; Alg == dss; Alg == ecdsa ->
-    case privkey_to_pubkey_nif(Alg, format_pkey(Alg,EngineMap)) of
+    case notsup_to_error(privkey_to_pubkey_nif(Alg, format_pkey(Alg,EngineMap))) of
         [_|_]=L -> map_ensure_bin_as_int(L);
         X -> X
     end.
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.
     
 %%%================================================================