Fix email address delete code.

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 5d7fca404d2639c973eb3a16dd79c01279efbf46..b5ae1beacf1fee70fdeaf42b6460a51080656df2 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -69,7 +69,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
+#include <openssl/rand.h>
 
 #define DEFBITS        512
 #undef PROG
@@ -226,8 +226,14 @@ bad:
                l+=rsa->e->d[i];
                }
        BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
-       if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout))
+       {
+       PW_CB_DATA cb_data;
+       cb_data.password = passout;
+       cb_data.prompt_info = outfile;
+       if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
+               (pem_password_cb *)password_callback,&cb_data))
                goto err;
+       }
 
        ret=0;
 err:
@@ -236,6 +242,7 @@ err:
        if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
+       apps_shutdown();
        EXIT(ret);
        }