diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-31 10:49:28 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-31 10:49:28 +0000 |
| commit | 1faa0e499708c894964780c27c8412b45faae6dd (patch) | |
| tree | ba68e1397bfa16390078f07ba332cf537b4e9c96 /lib/libssl/src/ssl/ssl_locl.h | |
| parent | Delete the extraneous "return" statement at the end of a void function. (diff) | |
| download | wireguard-openbsd-1faa0e499708c894964780c27c8412b45faae6dd.tar.xz wireguard-openbsd-1faa0e499708c894964780c27c8412b45faae6dd.zip | |
TLS would not be entirely functional without extensions, so unifdef
OPENSSL_NO_TLSEXT.
ok tedu@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 208610dac19..ecf108d6a57 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -750,12 +750,10 @@ int ssl3_send_client_key_exchange(SSL *s); int ssl3_get_key_exchange(SSL *s); int ssl3_get_server_certificate(SSL *s); int ssl3_check_cert_and_algorithm(SSL *s); -#ifndef OPENSSL_NO_TLSEXT int ssl3_check_finished(SSL *s); # ifndef OPENSSL_NO_NEXTPROTONEG int ssl3_send_next_proto(SSL *s); # endif -#endif int dtls1_client_hello(SSL *s); int dtls1_send_client_certificate(SSL *s); @@ -837,7 +835,6 @@ int tls1_ec_curve_id2nid(int curve_id); int tls1_ec_nid2curve_id(int nid); #endif /* OPENSSL_NO_EC */ -#ifndef OPENSSL_NO_TLSEXT unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit); @@ -863,7 +860,6 @@ int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, int tls12_get_sigid(const EVP_PKEY *pk); const EVP_MD *tls12_get_hash(unsigned char hash_alg); -#endif EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md); void ssl_clear_hash_ctx(EVP_MD_CTX **hash); int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, |