From 9103197591150bb0d8641a26e79cccdc4b514697 Mon Sep 17 00:00:00 2001
From: Trevor Perrin <unsafe@trevp.net>
Date: Fri, 13 Sep 2013 18:31:48 -0700
Subject: [PATCH] Redo deletion of some serverinfo code that supplemental data
 code mistakenly reinstated.

---
 ssl/ssl_rsa.c | 9 ---------
 1 file changed, 9 deletions(-)

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;
-- 
GitLab