summaryrefslogtreecommitdiffstats
path: root/apps/apps.c
diff options
context:
space:
mode:
authorPiotr Sikora <piotr@cloudflare.com>2013-11-13 15:20:22 -0800
committerDr. Stephen Henson <steve@openssl.org>2013-11-14 01:20:12 +0000
commit2911575c6e790541e495927a60121d7546a66962 (patch)
treef41125d3a9c716eb9a0f0e33d34930c4c9dd48e2 /apps/apps.c
parentafa23c46d966fc3862804612be999d403a755cd7 (diff)
Fix compilation with no-nextprotoneg.
PR#3106
Diffstat (limited to 'apps/apps.c')
-rw-r--r--apps/apps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/apps.c b/apps/apps.c
index e35f3c458c..c5a3bb27e4 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2909,7 +2909,7 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
#endif
-#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+#ifndef OPENSSL_NO_TLSEXT
/* 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.
@@ -2951,7 +2951,7 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
*outlen = len + 1;
return out;
}
-#endif /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+#endif /* ndef OPENSSL_NO_TLSEXT */
void print_cert_checks(BIO *bio, X509 *x,
const unsigned char *checkhost,