From ae9d23f02624214dfa3102cd43e55bcff2a8b940 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Tue, 1 Jul 2014 21:26:27 +0000
Subject: Avoid a NULL deref in i2d_ECPrivateKey() when an EC_KEY lacks the
 public key member (which is perfectly acceptable).

From BoringSSL (Adam Langley), commit f71a27920a903c9c36bcb31e68781b17674d3fd2
---
 src/lib/libcrypto/ec/ec_asn1.c         | 4 ++--
 src/lib/libssl/src/crypto/ec/ec_asn1.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 52f33d8f34..9478e5260a 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.8 2014/07/01 21:26:27 miod Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1092,7 +1092,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
 			goto err;
 		}
 	}
-	if (!(a->enc_flag & EC_PKEY_NO_PUBKEY)) {
+	if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) {
 		priv_key->publicKey = M_ASN1_BIT_STRING_new();
 		if (priv_key->publicKey == NULL) {
 			ECerr(EC_F_I2D_ECPRIVATEKEY,
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
index 52f33d8f34..9478e5260a 100644
--- a/src/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.8 2014/07/01 21:26:27 miod Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1092,7 +1092,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
 			goto err;
 		}
 	}
-	if (!(a->enc_flag & EC_PKEY_NO_PUBKEY)) {
+	if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) {
 		priv_key->publicKey = M_ASN1_BIT_STRING_new();
 		if (priv_key->publicKey == NULL) {
 			ECerr(EC_F_I2D_ECPRIVATEKEY,
-- 
cgit v1.2.3-55-g6feb