diff options
| author | Matt Caswell <matt@openssl.org> | 2015-07-21 00:02:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-07-27 15:00:05 +0100 |
| commit | 57787ac81444938a876f185cdd73875c8f53e208 (patch) | |
| tree | 1b6f66591c0117283b801ae50cd73f5c2ee4e6aa /include | |
| parent | f4ee22be03bb8318b1e0f00e116be231ba12fdef (diff) | |
| download | openssl-57787ac81444938a876f185cdd73875c8f53e208.tar.gz | |
Remove support for SSL3_FLAGS_DELAY_CLIENT_FINISHED
This flag was not set anywhere within the codebase (only read). It could
only be set by an app reaching directly into s->s3->flags and setting it
directly. However that method became impossible when libssl was opaquified.
Even in 1.0.2/1.0.1 if an app set the flag directly it is only relevant to
ssl3_connect(), which calls SSL_clear() during initialisation that clears
any flag settings. Therefore it could take effect if the app set the flag
after the handshake has started but before it completed. It seems quite
unlikely that any apps really do this (especially as it is completely
undocumented).
The purpose of the flag is suppress flushing of the write bio on the client
side at the end of the handshake after the client has written the Finished
message whilst resuming a session. This enables the client to send
application data as part of the same flight as the Finished message.
This flag also controls the setting of a second flag SSL3_FLAGS_POP_BUFFER.
There is an interesting comment in the code about this second flag in the
implementation of ssl3_write:
/* This is an experimental flag that sends the
* last handshake message in the same packet as the first
* use data - used to see if it helps the TCP protocol during
* session-id reuse */
It seems the experiment did not work because as far as I can tell nothing
is using this code. The above comment has been in the code since SSLeay.
This commit removes support for SSL3_FLAGS_DELAY_CLIENT_FINISHED, as well
as the associated SSL3_FLAGS_POP_BUFFER.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index d56105e178..43df925999 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -360,10 +360,10 @@ extern "C" { # define SSL3_CT_NUMBER 9 # define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 -# define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002 -# define SSL3_FLAGS_POP_BUFFER 0x0004 + /* Removed from OpenSSL 1.1.0 */ # define TLS1_FLAGS_TLS_PADDING_BUG 0x0 + # define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010 /* * Set when the handshake is ready to process peer's ChangeCipherSpec message. |