Merge branch 'maint'

5 files changed, 80 insertions, 19 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 72429c51fb..f05bfa10b3 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -4011,7 +4011,7 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
             return PKEY_BADARG;
         password = get_key_password(env, key);
         *pkey = ENGINE_load_private_key(e, id, NULL, password);
-        if (!pkey)
+        if (!*pkey)
             return PKEY_BADARG;
         enif_free(id);
 #else
@@ -4794,7 +4794,6 @@ static ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NI
     EVP_PKEY *pkey;
     ERL_NIF_TERM alg = argv[0];
     ERL_NIF_TERM result[8];
-
     if (get_pkey_private_key(env, alg, argv[1], &pkey) != PKEY_OK) {
 	return enif_make_badarg(env);
     }
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
index a66bee2ddf..5c6122c06a 100644
--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -218,9 +218,9 @@ EVP_PKEY* test_key_load(ENGINE *er, const char *id, UI_METHOD *ui_method, void *
     fclose(f);
     
     if (!pkey) {
-        fprintf(stderr, "%s:%d Key read from file failed. ", __FILE__,__LINE__);
+        fprintf(stderr, "%s:%d Key read from file %s failed.\r\n", __FILE__,__LINE__,id);
         if (callback_data) 
-            fprintf(stderr, "Pwd = \"%s\". ", (char *)callback_data);
+            fprintf(stderr, "Pwd = \"%s\".\r\n", (char *)callback_data);
         fprintf(stderr, "Contents of file \"%s\":\r\n",id);
         f = fopen(id, "r");
         { /* Print the contents of the key file */
@@ -228,12 +228,14 @@ EVP_PKEY* test_key_load(ENGINE *er, const char *id, UI_METHOD *ui_method, void *
             while (!feof(f)) {
                 switch (c=fgetc(f)) {
                 case '\n':
-                case '\r': putc('\r',stdout); putc('\n',stdout); break;
-                default: putc(c, stdout);
+                case '\r': putc('\r',stderr); putc('\n',stderr); break;
+                default: putc(c, stderr);
                 }
             }
         }
+        fprintf(stderr, "File contents printed.\r\n");
         fclose(f);
+        return NULL;
     }
     
     return pkey;
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 3ab8f9c832..cc72bde9cb 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 9ba1623348..91e154280f 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1100,7 +1100,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 72bd59f8ab..5967331d8e 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -53,10 +53,15 @@ groups() ->
        sign_verify_dsa,
        sign_verify_ecdsa,
        sign_verify_rsa_pwd,
+       sign_verify_rsa_pwd_bad_pwd,
        priv_encrypt_pub_decrypt_rsa,
        priv_encrypt_pub_decrypt_rsa_pwd,
        pub_encrypt_priv_decrypt_rsa,
        pub_encrypt_priv_decrypt_rsa_pwd,
+       get_pub_from_priv_key_rsa,
+       get_pub_from_priv_key_rsa_pwd,
+       get_pub_from_priv_key_rsa_pwd_no_pwd,
+       get_pub_from_priv_key_rsa_pwd_bad_pwd,
        get_pub_from_priv_key_dsa,
        get_pub_from_priv_key_ecdsa
       ]}].
@@ -382,6 +387,18 @@ sign_verify_rsa_pwd(Config) ->
              key_id => key_id(Config, "rsa_public_key_pwd.pem")},
     sign_verify(rsa, sha, Priv, Pub).
 
+sign_verify_rsa_pwd_bad_pwd(Config) ->
+    Priv = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
+             password => "Bad password"},
+    Pub  = #{engine => engine_ref(Config),
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
+    try sign_verify(rsa, sha, Priv, Pub) of
+        _ -> {fail, "PWD prot pubkey sign succeded with no pwd!"}
+    catch
+        error:badarg -> ok
+    end.  
+
 priv_encrypt_pub_decrypt_rsa(Config) ->
     Priv = #{engine => engine_ref(Config),
              key_id => key_id(Config, "rsa_private_key.pem")},
@@ -406,35 +423,74 @@ pub_encrypt_priv_decrypt_rsa(Config) ->
 
 pub_encrypt_priv_decrypt_rsa_pwd(Config) ->
     Priv = #{engine => engine_ref(Config),
-             key_id => key_id(Config, "rsa_private_key.pem"),
+             key_id => key_id(Config, "rsa_private_key_pwd.pem"),
              password => "password"},
     Pub  = #{engine => engine_ref(Config),
-             key_id => key_id(Config, "rsa_public_key.pem")},
+             key_id => key_id(Config, "rsa_public_key_pwd.pem")},
     pub_enc_priv_dec(rsa, Pub, Priv,  rsa_pkcs1_padding).
 
 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"},
+    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 although no pwd!"}
+    catch
+        error:badarg -> ok
+    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
+    end.
 
 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.
     
 %%%================================================================