summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_txt.c
diff options
context:
space:
mode:
authortedu <>2014-05-05 15:03:22 +0000
committertedu <>2014-05-05 15:03:22 +0000
commit5b4326f23352be2e7084f2020795d8aa042c746f (patch)
treec342d9903092a19dfda173837629fd04c429eda9 /src/lib/libssl/ssl_txt.c
parent77dd1ca11ad22b323b27beea447edd1e35c3b24e (diff)
downloadopenbsd-5b4326f23352be2e7084f2020795d8aa042c746f.tar.gz
openbsd-5b4326f23352be2e7084f2020795d8aa042c746f.tar.bz2
openbsd-5b4326f23352be2e7084f2020795d8aa042c746f.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 'src/lib/libssl/ssl_txt.c')
-rw-r--r--src/lib/libssl/ssl_txt.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index c6bfd68de6..01dd846596 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -161,19 +161,6 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
161 if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) 161 if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
162 goto err; 162 goto err;
163 } 163 }
164#ifndef OPENSSL_NO_KRB5
165 if (BIO_puts(bp, "\n Krb5 Principal: ") <= 0)
166 goto err;
167 if (x->krb5_client_princ_len == 0) {
168 if (BIO_puts(bp, "None") <= 0)
169 goto err;
170 } else {
171 for (i = 0; i < x->krb5_client_princ_len; i++) {
172 if (BIO_printf(bp, "%02X", x->krb5_client_princ[i]) <= 0)
173 goto err;
174 }
175 }
176#endif /* OPENSSL_NO_KRB5 */
177#ifndef OPENSSL_NO_PSK 164#ifndef OPENSSL_NO_PSK
178 if (BIO_puts(bp, "\n PSK identity: ") <= 0) 165 if (BIO_puts(bp, "\n PSK identity: ") <= 0)
179 goto err; 166 goto err;
@@ -184,12 +171,6 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
184 if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) 171 if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0)
185 goto err; 172 goto err;
186#endif 173#endif
187#ifndef OPENSSL_NO_SRP
188 if (BIO_puts(bp, "\n SRP username: ") <= 0)
189 goto err;
190 if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0)
191 goto err;
192#endif
193#ifndef OPENSSL_NO_TLSEXT 174#ifndef OPENSSL_NO_TLSEXT
194 if (x->tlsext_tick_lifetime_hint) { 175 if (x->tlsext_tick_lifetime_hint) {
195 if (BIO_printf(bp, 176 if (BIO_printf(bp,