Merge branch 'hans/crypto/cuddle_tests' into maint

2 files changed, 7 insertions, 6 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;