diff options
author | jsing <> | 2014-05-31 10:53:39 +0000 |
---|---|---|
committer | jsing <> | 2014-05-31 10:53:39 +0000 |
commit | f6e83696cca45f0d0392ebe733e48b8bd94ebb47 (patch) | |
tree | cea4d337f9a4c116882a3406ccc08e588dd003fb /src/lib/libssl/ssl_locl.h | |
parent | cc0b160e462358c219bef48df27be2e816b65194 (diff) | |
download | openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.tar.gz openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.tar.bz2 openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.zip |
ECDH and ECDSA will not work overly well if there is no EC, so unifdef
OPENSSL_NO_EC.
ok tedu@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index ecf108d6a5..4aa2911da7 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -448,14 +448,12 @@ | |||
448 | #define CERT_PRIVATE_KEY 2 | 448 | #define CERT_PRIVATE_KEY 2 |
449 | */ | 449 | */ |
450 | 450 | ||
451 | #ifndef OPENSSL_NO_EC | ||
452 | /* From ECC-TLS draft, used in encoding the curve type in | 451 | /* From ECC-TLS draft, used in encoding the curve type in |
453 | * ECParameters | 452 | * ECParameters |
454 | */ | 453 | */ |
455 | #define EXPLICIT_PRIME_CURVE_TYPE 1 | 454 | #define EXPLICIT_PRIME_CURVE_TYPE 1 |
456 | #define EXPLICIT_CHAR2_CURVE_TYPE 2 | 455 | #define EXPLICIT_CHAR2_CURVE_TYPE 2 |
457 | #define NAMED_CURVE_TYPE 3 | 456 | #define NAMED_CURVE_TYPE 3 |
458 | #endif /* OPENSSL_NO_EC */ | ||
459 | 457 | ||
460 | typedef struct cert_pkey_st { | 458 | typedef struct cert_pkey_st { |
461 | X509 *x509; | 459 | X509 *x509; |
@@ -830,10 +828,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | |||
830 | 828 | ||
831 | SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); | 829 | SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); |
832 | 830 | ||
833 | #ifndef OPENSSL_NO_EC | ||
834 | int tls1_ec_curve_id2nid(int curve_id); | 831 | int tls1_ec_curve_id2nid(int curve_id); |
835 | int tls1_ec_nid2curve_id(int nid); | 832 | int tls1_ec_nid2curve_id(int nid); |
836 | #endif /* OPENSSL_NO_EC */ | ||
837 | 833 | ||
838 | unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, | 834 | unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, |
839 | unsigned char *limit); | 835 | unsigned char *limit); |