From 5ff6e2dfbbc222296d2eec592412042e4c5389af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 5 Sep 2011 13:31:07 +0000
Subject: Fix d2i_SSL_SESSION.

---
 ssl/ssl_asn1.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'ssl/ssl_asn1.c')

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 994a654edb..9fd3535ca6 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -571,6 +571,19 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
 		}
 	else
 		ret->psk_identity_hint=NULL;
+
+	os.length=0;
+	os.data=NULL;
+	M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,8);
+	if (os.data)
+		{
+		ret->psk_identity = BUF_strndup((char *)os.data, os.length);
+		OPENSSL_free(os.data);
+		os.data = NULL;
+		os.length = 0;
+		}
+	else
+		ret->psk_identity=NULL;
 #endif /* OPENSSL_NO_PSK */
 
 #ifndef OPENSSL_NO_TLSEXT
-- 
cgit v1.2.3