diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 16 |
1 files changed, 0 insertions, 16 deletions
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 | |||
| @@ -223,9 +223,6 @@ SSL_SESSION_new(void) | |||
| 223 | ss->psk_identity_hint = NULL; | 223 | ss->psk_identity_hint = NULL; |
| 224 | ss->psk_identity = NULL; | 224 | ss->psk_identity = NULL; |
| 225 | #endif | 225 | #endif |
| 226 | #ifndef OPENSSL_NO_SRP | ||
| 227 | ss->srp_username = NULL; | ||
| 228 | #endif | ||
| 229 | return (ss); | 226 | return (ss); |
| 230 | } | 227 | } |
| 231 | 228 | ||
| @@ -726,10 +723,6 @@ SSL_SESSION_free(SSL_SESSION *ss) | |||
| 726 | if (ss->psk_identity != NULL) | 723 | if (ss->psk_identity != NULL) |
| 727 | free(ss->psk_identity); | 724 | free(ss->psk_identity); |
| 728 | #endif | 725 | #endif |
| 729 | #ifndef OPENSSL_NO_SRP | ||
| 730 | if (ss->srp_username != NULL) | ||
| 731 | free(ss->srp_username); | ||
| 732 | #endif | ||
| 733 | OPENSSL_cleanse(ss, sizeof(*ss)); | 726 | OPENSSL_cleanse(ss, sizeof(*ss)); |
| 734 | free(ss); | 727 | free(ss); |
| 735 | } | 728 | } |
| @@ -754,15 +747,6 @@ SSL_set_session(SSL *s, SSL_SESSION *session) | |||
| 754 | return (0); | 747 | return (0); |
| 755 | } | 748 | } |
| 756 | 749 | ||
| 757 | #ifndef OPENSSL_NO_KRB5 | ||
| 758 | if (s->kssl_ctx && !s->kssl_ctx->client_princ && | ||
| 759 | session->krb5_client_princ_len > 0) { | ||
| 760 | s->kssl_ctx->client_princ = malloc(session->krb5_client_princ_len + 1); | ||
| 761 | memcpy(s->kssl_ctx->client_princ, session->krb5_client_princ, | ||
| 762 | session->krb5_client_princ_len); | ||
| 763 | s->kssl_ctx->client_princ[session->krb5_client_princ_len] = '\0'; | ||
| 764 | } | ||
| 765 | #endif /* OPENSSL_NO_KRB5 */ | ||
| 766 | 750 | ||
| 767 | /* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/ | 751 | /* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/ |
| 768 | CRYPTO_add(&session->references, 1, CRYPTO_LOCK_SSL_SESSION); | 752 | CRYPTO_add(&session->references, 1, CRYPTO_LOCK_SSL_SESSION); |
