summaryrefslogtreecommitdiffstats
path: root/apps/apps.h
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2012-06-03 22:00:21 +0000
committerBen Laurie <ben@openssl.org>2012-06-03 22:00:21 +0000
commit71fa451343f97b3624374ed1359adc23fba5696e (patch)
tree87ebfb43ece32507c68e360f36a67b4a921e79c0 /apps/apps.h
parenta9e1c50bb09a110d4774e6710f9322344684fa2d (diff)
Version skew reduction: trivia (I hope).
Diffstat (limited to 'apps/apps.h')
-rw-r--r--apps/apps.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h
index 77d07dac44..c1ca99da12 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -331,6 +331,10 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
#endif
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
+#endif /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+
#define FORMAT_UNDEF 0
#define FORMAT_ASN1 1
#define FORMAT_TEXT 2
@@ -363,10 +367,7 @@ int raw_write_stdout(const void *,int);
#define TM_START 0
#define TM_STOP 1
double app_tminterval (int stop,int usertime);
-#endif
#define OPENSSL_NO_SSL_INTERN
-#ifndef OPENSSL_NO_NEXTPROTONEG
-unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
#endif