diff options
| author | Steven Fackler <[email protected]> | 2015-09-16 11:51:45 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-09-16 11:51:45 -0700 |
| commit | b1b76f7913cafac909ac7a5fc42e889d0731ace0 (patch) | |
| tree | c6c4a67e57b2835218cb72e18190cff14097bfc0 /openssl-sys/src | |
| parent | Merge pull request #261 from jedisct1/try_ssl_null (diff) | |
| parent | ssl/alpn: test mismatch between protocols resulting in None (diff) | |
| download | rust-openssl-b1b76f7913cafac909ac7a5fc42e889d0731ace0.tar.xz rust-openssl-b1b76f7913cafac909ac7a5fc42e889d0731ace0.zip | |
Merge pull request #266 from jmesmon/alpn
ssl/npn+alpn: adjust protocol selection to fail if no protocols match
Diffstat (limited to 'openssl-sys/src')
| -rw-r--r-- | openssl-sys/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index c2c6157c..3f5f7623 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -167,11 +167,11 @@ macro_rules! import_options { include!("ssl_options.rs"); -#[cfg(feature = "npn")] +#[cfg(any(feature = "npn", feature = "alpn"))] pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0; -#[cfg(feature = "npn")] +#[cfg(any(feature = "npn", feature = "alpn"))] pub const OPENSSL_NPN_NEGOTIATED: c_int = 1; -#[cfg(feature = "npn")] +#[cfg(any(feature = "npn", feature = "alpn"))] pub const OPENSSL_NPN_NO_OVERLAP: c_int = 2; pub const V_ASN1_GENERALIZEDTIME: c_int = 24; |