diff options
| author | Cody P Schafer <[email protected]> | 2015-09-01 17:09:19 -0400 |
|---|---|---|
| committer | Cody P Schafer <[email protected]> | 2015-09-01 17:14:04 -0400 |
| commit | 50c5042c705a399ebc178b204a1e6148a26966e1 (patch) | |
| tree | 0a3b186b89e63135cf65736af4c17d2c46003561 /openssl-sys/src | |
| parent | openssl/ssl: fix some of the comment text where I missed replacing NPN with ALPN (diff) | |
| download | rust-openssl-50c5042c705a399ebc178b204a1e6148a26966e1.tar.xz rust-openssl-50c5042c705a399ebc178b204a1e6148a26966e1.zip | |
ssl/npn+alpn: adjust protocol selection to fail if no protocols match
The current behavior causes a server written using rust-openssl to (if
it cannot negotiate a protocol) fallback to the first protocol it has
avaliable.
This makes it impossible to detect protocol mismatches.
This updates our selection to be more similar to how openssl's
s_server behaves: non-matching protocols are not supplied with a
fallback.
Note that some setups may actually want a fallback protocol supplied
via ALPN. To support those cases, we should consider adding a generic
callback that allows protocol selection to be entirely controlled by
the programmer.
For the purposes of having a sane default, however, not supplying a
default (and mimicing s_server's behavior) is the best choice.
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 9b5fd744..91b090e2 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; |