From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 15 Jan 2009 12:52:38 +0000 (+0000)
Subject: Make PKCS#8 the standard write format for private keys, replacing the
X-Git-Tag: OpenSSL_0_9_8k^2~60
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=8125d9f99ceb3fcd81fdd191e85a73b27063383a

Make PKCS#8 the standard write format for private keys, replacing the
ancient SSLeay format.
---

diff --git a/CHANGES b/CHANGES
index 829a7da5b9..66e812c809 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.8j and 0.9.9  [xx XXX xxxx]
 
+  *) Make PKCS#8 the default write format for private keys, replacing the
+     traditional format. This form is standardised, more secure and doesn't
+     include an implicit MD5 dependency.
+     [Steve Henson]
+
   *) Add a $gcc_devteam_warn option to Configure. The idea is that any code
      committed to OpenSSL should pass this lot as a minimum.
      [Steve Henson]
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index cb208a7518..8ecf24903b 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -142,7 +142,7 @@ int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
                                                pem_password_cb *cb, void *u)
 	{
 	char pem_str[80];
-	if (!x->ameth || !x->ameth->old_priv_encode)
+	if (!x->ameth || x->ameth->priv_encode)
 		return PEM_write_bio_PKCS8PrivateKey(bp, x, enc,
 							(char *)kstr, klen,
 							cb, u);