From d7cccacc05fc8baf2055ec57fff4886e1057de80 Mon Sep 17 00:00:00 2001 From: Daniel Roethlisberger Date: Tue, 21 Apr 2015 15:52:39 +0200 Subject: [PATCH] Move ssl_tls_clienthello_identify out of !OPENSSL_NO_TLSEXT Issue: #87 --- ssl.c | 2 +- ssl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl.c b/ssl.c index cb8fffe..a413d90 100644 --- a/ssl.c +++ b/ssl.c @@ -1902,6 +1902,7 @@ out: DBG_printf("%zd bytes unparsed\n", n); return servername; } +#endif /* !OPENSSL_NO_TLSEXT */ int ssl_tls_clienthello_identify(const unsigned char *buf, ssize_t *sz) @@ -1984,6 +1985,5 @@ out2: DBG_printf("%zd bytes unparsed\n", n); return 0; } -#endif /* !OPENSSL_NO_TLSEXT */ /* vim: set noet ft=c: */ diff --git a/ssl.h b/ssl.h index 322a06b..0178241 100644 --- a/ssl.h +++ b/ssl.h @@ -167,9 +167,9 @@ int ssl_is_ocspreq(const unsigned char *, size_t) NONNULL(1) WUNRES; #ifndef OPENSSL_NO_TLSEXT char * ssl_tls_clienthello_parse_sni(const unsigned char *, ssize_t *) NONNULL(1,2) MALLOC; +#endif /* !OPENSSL_NO_TLSEXT */ int ssl_tls_clienthello_identify(const unsigned char *, ssize_t *) NONNULL(1,2); -#endif /* !OPENSSL_NO_TLSEXT */ int ssl_dnsname_match(const char *, size_t, const char *, size_t) NONNULL(1,3) WUNRES; char * ssl_wildcardify(const char *) NONNULL(1) MALLOC;