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.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.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index d6f875a797..fd01ac9806 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -505,12 +505,10 @@ struct ssl_session_st { | |||
505 | * efficient and to implement a maximum cache size. */ | 505 | * efficient and to implement a maximum cache size. */ |
506 | struct ssl_session_st *prev, *next; | 506 | struct ssl_session_st *prev, *next; |
507 | char *tlsext_hostname; | 507 | char *tlsext_hostname; |
508 | #ifndef OPENSSL_NO_EC | ||
509 | size_t tlsext_ecpointformatlist_length; | 508 | size_t tlsext_ecpointformatlist_length; |
510 | unsigned char *tlsext_ecpointformatlist; /* peer's list */ | 509 | unsigned char *tlsext_ecpointformatlist; /* peer's list */ |
511 | size_t tlsext_ellipticcurvelist_length; | 510 | size_t tlsext_ellipticcurvelist_length; |
512 | unsigned char *tlsext_ellipticcurvelist; /* peer's list */ | 511 | unsigned char *tlsext_ellipticcurvelist; /* peer's list */ |
513 | #endif /* OPENSSL_NO_EC */ | ||
514 | /* RFC4507 info */ | 512 | /* RFC4507 info */ |
515 | unsigned char *tlsext_tick; /* Session ticket */ | 513 | unsigned char *tlsext_tick; /* Session ticket */ |
516 | size_t tlsext_ticklen; /* Session ticket length */ | 514 | size_t tlsext_ticklen; /* Session ticket length */ |
@@ -1204,12 +1202,10 @@ struct ssl_st { | |||
1204 | 1202 | ||
1205 | /* RFC4507 session ticket expected to be received or sent */ | 1203 | /* RFC4507 session ticket expected to be received or sent */ |
1206 | int tlsext_ticket_expected; | 1204 | int tlsext_ticket_expected; |
1207 | #ifndef OPENSSL_NO_EC | ||
1208 | size_t tlsext_ecpointformatlist_length; | 1205 | size_t tlsext_ecpointformatlist_length; |
1209 | unsigned char *tlsext_ecpointformatlist; /* our list */ | 1206 | unsigned char *tlsext_ecpointformatlist; /* our list */ |
1210 | size_t tlsext_ellipticcurvelist_length; | 1207 | size_t tlsext_ellipticcurvelist_length; |
1211 | unsigned char *tlsext_ellipticcurvelist; /* our list */ | 1208 | unsigned char *tlsext_ellipticcurvelist; /* our list */ |
1212 | #endif /* OPENSSL_NO_EC */ | ||
1213 | 1209 | ||
1214 | /* draft-rescorla-tls-opaque-prf-input-00.txt information to be used for handshakes */ | 1210 | /* draft-rescorla-tls-opaque-prf-input-00.txt information to be used for handshakes */ |
1215 | void *tlsext_opaque_prf_input; | 1211 | void *tlsext_opaque_prf_input; |