summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2014-05-31 10:49:28 +0000
committerjsing <>2014-05-31 10:49:28 +0000
commitcc0b160e462358c219bef48df27be2e816b65194 (patch)
tree32a374445fa15f520b06510f07c011a6234df599 /src/lib/libssl/ssl_locl.h
parent57e924c96320c9b14de6078fc75984c949b073b2 (diff)
downloadopenbsd-cc0b160e462358c219bef48df27be2e816b65194.tar.gz
openbsd-cc0b160e462358c219bef48df27be2e816b65194.tar.bz2
openbsd-cc0b160e462358c219bef48df27be2e816b65194.zip
TLS would not be entirely functional without extensions, so unifdef
OPENSSL_NO_TLSEXT. ok tedu@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 208610dac1..ecf108d6a5 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -750,12 +750,10 @@ int ssl3_send_client_key_exchange(SSL *s);
750int ssl3_get_key_exchange(SSL *s); 750int ssl3_get_key_exchange(SSL *s);
751int ssl3_get_server_certificate(SSL *s); 751int ssl3_get_server_certificate(SSL *s);
752int ssl3_check_cert_and_algorithm(SSL *s); 752int ssl3_check_cert_and_algorithm(SSL *s);
753#ifndef OPENSSL_NO_TLSEXT
754int ssl3_check_finished(SSL *s); 753int ssl3_check_finished(SSL *s);
755# ifndef OPENSSL_NO_NEXTPROTONEG 754# ifndef OPENSSL_NO_NEXTPROTONEG
756int ssl3_send_next_proto(SSL *s); 755int ssl3_send_next_proto(SSL *s);
757# endif 756# endif
758#endif
759 757
760int dtls1_client_hello(SSL *s); 758int dtls1_client_hello(SSL *s);
761int dtls1_send_client_certificate(SSL *s); 759int dtls1_send_client_certificate(SSL *s);
@@ -837,7 +835,6 @@ int tls1_ec_curve_id2nid(int curve_id);
837int tls1_ec_nid2curve_id(int nid); 835int tls1_ec_nid2curve_id(int nid);
838#endif /* OPENSSL_NO_EC */ 836#endif /* OPENSSL_NO_EC */
839 837
840#ifndef OPENSSL_NO_TLSEXT
841unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, 838unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p,
842 unsigned char *limit); 839 unsigned char *limit);
843 840
@@ -863,7 +860,6 @@ int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
863int tls12_get_sigid(const EVP_PKEY *pk); 860int tls12_get_sigid(const EVP_PKEY *pk);
864const EVP_MD *tls12_get_hash(unsigned char hash_alg); 861const EVP_MD *tls12_get_hash(unsigned char hash_alg);
865 862
866#endif
867EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md); 863EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md);
868void ssl_clear_hash_ctx(EVP_MD_CTX **hash); 864void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
869int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, 865int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p,