summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_rsa.c
diff options
context:
space:
mode:
authorTrevor Perrin <unsafe@trevp.net>2013-09-13 18:31:48 -0700
committerTrevor Perrin <unsafe@trevp.net>2013-09-13 18:31:48 -0700
commit9103197591150bb0d8641a26e79cccdc4b514697 (patch)
tree5cae7753ef9067adcec5bf77463ba7fe830444de /ssl/ssl_rsa.c
parent785da0e6107460d05e2ed627613ddc851ac43ff6 (diff)
Redo deletion of some serverinfo code that supplemental data code mistakenly reinstated.
Diffstat (limited to 'ssl/ssl_rsa.c')
-rw-r--r--ssl/ssl_rsa.c9
1 files changed, 0 insertions, 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;