Additions for 0.9.6.

[openssl.git] / apps / pkcs8.c

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 3e59b74124a2a9f615a6c3d93ef489a069945fa1..7b588e43370763968d6f5d06f7a942a12e6a4591 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -194,8 +194,15 @@ int MAIN(int argc, char **argv)
                                 "Can't open output file %s\n", outfile);
                        return (1);
                }
-       } else out = BIO_new_fp (stdout, BIO_NOCLOSE);
-
+       } else {
+               out = BIO_new_fp (stdout, BIO_NOCLOSE);
+#ifdef VMS
+               {
+                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                       out = BIO_push(tmpbio, out);
+               }
+#endif
+       }
        if (topk8) {
                if(informat == FORMAT_PEM)
                        pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin);
@@ -253,9 +260,9 @@ int MAIN(int argc, char **argv)
                }
                PKCS8_PRIV_KEY_INFO_free (p8inf);
                EVP_PKEY_free(pkey);
-               BIO_free(out);
-               if(passin) Free(passin);
-               if(passout) Free(passout);
+               BIO_free_all(out);
+               if(passin) OPENSSL_free(passin);
+               if(passout) OPENSSL_free(passout);
                return (0);
        }
 
@@ -336,10 +343,10 @@ int MAIN(int argc, char **argv)
        }
 
        EVP_PKEY_free(pkey);
-       BIO_free(out);
+       BIO_free_all(out);
        BIO_free(in);
-       if(passin) Free(passin);
-       if(passout) Free(passout);
+       if(passin) OPENSSL_free(passin);
+       if(passout) OPENSSL_free(passout);
 
        return (0);
 }