diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-11-07 14:16:49 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-11-07 14:16:49 +0000 |
| commit | 7b86736b43198de19faa81ff17d344aed33e3a97 (patch) | |
| tree | 02b7fa0f57a81db7d5a941bb9a5a5a851ea736f1 /usr.bin/openssl | |
| parent | 8fa48933d6f58fedc21cb196cab1a20a4910c8ec (diff) | |
More OPENSSL_NO_TLSEXT clean up.
Diffstat (limited to 'usr.bin/openssl')
| -rw-r--r-- | usr.bin/openssl/apps.c | 6 | ||||
| -rw-r--r-- | usr.bin/openssl/apps.h | 6 | ||||
| -rw-r--r-- | usr.bin/openssl/s_client.c | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/openssl/apps.c b/usr.bin/openssl/apps.c index 6ffdf3df1a5..78555528b66 100644 --- a/usr.bin/openssl/apps.c +++ b/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.11 2014/10/16 10:43:54 jsing Exp $ */ +/* $OpenBSD: apps.c,v 1.12 2014/11/07 14:16:48 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -2163,7 +2163,7 @@ policies_print(BIO *out, X509_STORE_CTX *ctx) BIO_free(out); } -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) /* next_protos_parse parses a comma separated list of strings into a string * in a format suitable for passing to SSL_CTX_set_next_protos_advertised. * outlen: (output) set to the length of the resulting buffer on success. @@ -2203,7 +2203,7 @@ next_protos_parse(unsigned short *outlen, const char *in) return out; } #endif -/* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ +/* !OPENSSL_NO_NEXTPROTONEG */ double app_tminterval(int stop, int usertime) diff --git a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h index ea6be60a447..d6b18e2a359 100644 --- a/usr.bin/openssl/apps.h +++ b/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.7 2014/08/30 15:14:03 jsing Exp $ */ +/* $OpenBSD: apps.h,v 1.8 2014/11/07 14:16:48 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -245,9 +245,9 @@ int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md, int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, STACK_OF(OPENSSL_STRING) *sigopts); -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) unsigned char *next_protos_parse(unsigned short *outlen, const char *in); -#endif /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ +#endif /* !OPENSSL_NO_NEXTPROTONEG */ #define FORMAT_UNDEF 0 #define FORMAT_ASN1 1 diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c index 12c9bd2c2d8..37a8280d15c 100644 --- a/usr.bin/openssl/s_client.c +++ b/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.6 2014/11/06 14:50:12 jsing Exp $ */ +/* $OpenBSD: s_client.c,v 1.7 2014/11/07 14:16:48 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -638,7 +638,7 @@ bad: goto end; } -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) next_proto.status = -1; if (next_proto_neg_in) { next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in); @@ -734,7 +734,7 @@ bad: if (socket_type == SOCK_DGRAM) SSL_CTX_set_read_ahead(ctx, 1); -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) if (next_proto.data) SSL_CTX_set_next_proto_select_cb(ctx, next_proto_cb, &next_proto); #endif @@ -1243,7 +1243,7 @@ end: print_stuff(bio_c_out, con, 1); SSL_free(con); } -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) free(next_proto.data); #endif if (ctx != NULL) @@ -1399,7 +1399,7 @@ print_stuff(BIO * bio, SSL * s, int full) } #endif -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if !defined(OPENSSL_NO_NEXTPROTONEG) if (next_proto.status != -1) { const unsigned char *proto; unsigned int proto_len; |