summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-05-31 10:53:39 +0000
committerjsing <jsing@openbsd.org>2014-05-31 10:53:39 +0000
commit13864de44878ba021550cd0ac6af43138fdbfd5c (patch)
tree5512b9cb5cfcf9ba81b084389135e6dd49d023af /lib/libssl/src/ssl/ssl_locl.h
parentTLS would not be entirely functional without extensions, so unifdef (diff)
downloadwireguard-openbsd-13864de44878ba021550cd0ac6af43138fdbfd5c.tar.xz
wireguard-openbsd-13864de44878ba021550cd0ac6af43138fdbfd5c.zip
ECDH and ECDSA will not work overly well if there is no EC, so unifdef
OPENSSL_NO_EC. ok tedu@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r--lib/libssl/src/ssl/ssl_locl.h4
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 ecf108d6a57..4aa2911da70 100644
--- a/lib/libssl/src/ssl/ssl_locl.h
+++ b/lib/libssl/src/ssl/ssl_locl.h
@@ -448,14 +448,12 @@
#define CERT_PRIVATE_KEY 2
*/
-#ifndef OPENSSL_NO_EC
/* From ECC-TLS draft, used in encoding the curve type in
* ECParameters
*/
#define EXPLICIT_PRIME_CURVE_TYPE 1
#define EXPLICIT_CHAR2_CURVE_TYPE 2
#define NAMED_CURVE_TYPE 3
-#endif /* OPENSSL_NO_EC */
typedef struct cert_pkey_st {
X509 *x509;
@@ -830,10 +828,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n);
-#ifndef OPENSSL_NO_EC
int tls1_ec_curve_id2nid(int curve_id);
int tls1_ec_nid2curve_id(int nid);
-#endif /* OPENSSL_NO_EC */
unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p,
unsigned char *limit);