diff options
| author |   tedu <tedu@openbsd.org> | 2014-05-05 15:03:22 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-05-05 15:03:22 +0000 |
| commit | 8a8f3f13dd1fd3d25edeb39c5f7566180cd105f8 (patch) | |
| tree | bcf94eb93f2a60e72350cf5ac63be771a19d7b94 /lib/libssl/ssl_sess.c | |
| parent | A couple of malloc()+memset(0) -> calloc. (diff) | |
| download | wireguard-openbsd-8a8f3f13dd1fd3d25edeb39c5f7566180cd105f8.tar.xz wireguard-openbsd-8a8f3f13dd1fd3d25edeb39c5f7566180cd105f8.zip | |
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.
Diffstat (limited to 'lib/libssl/ssl_sess.c')
| -rw-r--r-- | lib/libssl/ssl_sess.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/libssl/ssl_sess.c b/lib/libssl/ssl_sess.c index 2b8da1ccaeb..05c6948efcb 100644 --- a/lib/libssl/ssl_sess.c +++ b/lib/libssl/ssl_sess.c @@ -223,9 +223,6 @@ SSL_SESSION_new(void) ss->psk_identity_hint = NULL; ss->psk_identity = NULL; #endif -#ifndef OPENSSL_NO_SRP - ss->srp_username = NULL; -#endif return (ss); } @@ -726,10 +723,6 @@ SSL_SESSION_free(SSL_SESSION *ss) 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); |