Move ssl_tls_clienthello_identify out of !OPENSSL_NO_TLSEXT

Issue:		#87
This commit is contained in:
Daniel Roethlisberger 2015-04-21 15:52:39 +02:00
parent 96b038ef9b
commit d7cccacc05
2 changed files with 2 additions and 2 deletions

2
ssl.c
View File

@ -1902,6 +1902,7 @@ out:
DBG_printf("%zd bytes unparsed\n", n); DBG_printf("%zd bytes unparsed\n", n);
return servername; return servername;
} }
#endif /* !OPENSSL_NO_TLSEXT */
int int
ssl_tls_clienthello_identify(const unsigned char *buf, ssize_t *sz) ssl_tls_clienthello_identify(const unsigned char *buf, ssize_t *sz)
@ -1984,6 +1985,5 @@ out2:
DBG_printf("%zd bytes unparsed\n", n); DBG_printf("%zd bytes unparsed\n", n);
return 0; return 0;
} }
#endif /* !OPENSSL_NO_TLSEXT */
/* vim: set noet ft=c: */ /* vim: set noet ft=c: */

2
ssl.h
View File

@ -167,9 +167,9 @@ int ssl_is_ocspreq(const unsigned char *, size_t) NONNULL(1) WUNRES;
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
char * ssl_tls_clienthello_parse_sni(const unsigned char *, ssize_t *) char * ssl_tls_clienthello_parse_sni(const unsigned char *, ssize_t *)
NONNULL(1,2) MALLOC; NONNULL(1,2) MALLOC;
#endif /* !OPENSSL_NO_TLSEXT */
int ssl_tls_clienthello_identify(const unsigned char *, ssize_t *) int ssl_tls_clienthello_identify(const unsigned char *, ssize_t *)
NONNULL(1,2); NONNULL(1,2);
#endif /* !OPENSSL_NO_TLSEXT */
int ssl_dnsname_match(const char *, size_t, const char *, size_t) int ssl_dnsname_match(const char *, size_t, const char *, size_t)
NONNULL(1,3) WUNRES; NONNULL(1,3) WUNRES;
char * ssl_wildcardify(const char *) NONNULL(1) MALLOC; char * ssl_wildcardify(const char *) NONNULL(1) MALLOC;