From ffcbdf8a3fda87b9b0d60403b8bda401683595e1 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 7 Jun 2014 17:27:14 +0000
Subject: Add missing NULL check after calling EVP_PKEY_new_mac_key().

Based on Adam Langley's chromium patches.
---
 src/lib/libssl/t1_enc.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/libssl/t1_enc.c')

diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index fba582d4ad..59c0c487ef 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -487,6 +487,8 @@ tls1_change_cipher_state(SSL *s, int which)
 	if (!(EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
 		mac_key = EVP_PKEY_new_mac_key(mac_type, NULL,
 		    mac_secret, mac_secret_size);
+		if (mac_key == NULL)
+			goto err;
 		EVP_DigestSignInit(mac_ctx, NULL, mac, NULL, mac_key);
 		EVP_PKEY_free(mac_key);
 	}
-- 
cgit v1.2.3-55-g6feb