From: Trevor Perrin <unsafe@trevp.net>
Date: Sat, 14 Sep 2013 01:31:48 +0000 (-0700)
Subject: Redo deletion of some serverinfo code that supplemental data code mistakenly reinstated.
X-Git-Tag: master-post-reformat~1174
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=92acab0b6a540fb2990ced45815f56072ef66d20;ds=sidebyside

Redo deletion of some serverinfo code that supplemental data code mistakenly reinstated.
---

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 41878776ec..b6765a30e1 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -459,15 +459,6 @@ static int ssl_set_cert(CERT *c, X509 *x)
 		X509_free(c->pkeys[i].x509);
 	CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
 	c->pkeys[i].x509=x;
-#ifndef OPENSSL_NO_TLSEXT
-	/* Free the old serverinfo data, if it exists. */
-	if (c->pkeys[i].serverinfo != NULL)
-		{
-		OPENSSL_free(c->pkeys[i].serverinfo);
-		c->pkeys[i].serverinfo = NULL;
-		c->pkeys[i].serverinfo_length = 0;
-		}
-#endif
 	c->key= &(c->pkeys[i]);
 
 	c->valid=0;