From 5b4326f23352be2e7084f2020795d8aa042c746f Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Mon, 5 May 2014 15:03:22 +0000
Subject: Remove SRP and Kerberos support from libssl. These are complex
 protocols all on their own and we can't effectively maintain them without
 using them, which we don't. If the need arises, the code can be resurrected.

---
 src/lib/libssl/ssl_sess.c | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 2b8da1ccae..05c6948efc 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -222,9 +222,6 @@ SSL_SESSION_new(void)
 #ifndef OPENSSL_NO_PSK
 	ss->psk_identity_hint = NULL;
 	ss->psk_identity = NULL;
-#endif
-#ifndef OPENSSL_NO_SRP
-	ss->srp_username = NULL;
 #endif
 	return (ss);
 }
@@ -725,10 +722,6 @@ SSL_SESSION_free(SSL_SESSION *ss)
 		free(ss->psk_identity_hint);
 	if (ss->psk_identity != NULL)
 		free(ss->psk_identity);
-#endif
-#ifndef OPENSSL_NO_SRP
-	if (ss->srp_username != NULL)
-		free(ss->srp_username);
 #endif
 	OPENSSL_cleanse(ss, sizeof(*ss));
 	free(ss);
@@ -754,15 +747,6 @@ SSL_set_session(SSL *s, SSL_SESSION *session)
 				return (0);
 		}
 
-#ifndef OPENSSL_NO_KRB5
-		if (s->kssl_ctx && !s->kssl_ctx->client_princ &&
-		    session->krb5_client_princ_len > 0) {
-			s->kssl_ctx->client_princ = malloc(session->krb5_client_princ_len + 1);
-			memcpy(s->kssl_ctx->client_princ, session->krb5_client_princ,
-			    session->krb5_client_princ_len);
-			s->kssl_ctx->client_princ[session->krb5_client_princ_len] = '\0';
-		}
-#endif /* OPENSSL_NO_KRB5 */
 
 		/* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/
 		CRYPTO_add(&session->references, 1, CRYPTO_LOCK_SSL_SESSION);
-- 
cgit v1.2.3-55-g6feb