diff options
| author | David Benjamin <davidben@chromium.org> | 2014-12-11 18:13:28 -0500 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-13 22:31:16 +0000 |
| commit | 7e23746dd47ac20e6c873c5518969a034396de30 (patch) | |
| tree | c096c3e56f38416980e8a69ed09bed9142479580 /include | |
| parent | 138c2ac627cee80ef2bea4536f9da42c2d22e8dd (diff) | |
| download | boringssl-7e23746dd47ac20e6c873c5518969a034396de30.zip boringssl-7e23746dd47ac20e6c873c5518969a034396de30.tar.gz boringssl-7e23746dd47ac20e6c873c5518969a034396de30.tar.bz2 | |
Remove redundant SSL_ST_BEFORE-related checks.
SSL_ST_BEFORE isn't a possible state anymore. It seems this state meant the
side wasn't known, back in the early SSLeay days. Now upstream guesses
(sometimes incorrectly with generic methods), and we don't initialize until
later. SSL_shutdown also doesn't bother to call ssl3_shutdown at all if the
side isn't initialized and SSL_ST_BEFORE isn't the uninitialized state, which
seems a much more sensible arrangement.
Likewise, because bare SSL_ST_BEFOREs no longer exist, SSL_in_init implies
SSL_in_before and there is no need to check both.
Change-Id: Ie680838b2f860b895073dabb4d759996e21c2824
Reviewed-on: https://boringssl-review.googlesource.com/2564
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 39e228b..c78cb96 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -860,6 +860,8 @@ struct ssl_ctx_st int trust; /* Trust setting */ #endif + /* quiet_shutdown is true if the connection should not send a + * close_notify on shutdown. */ int quiet_shutdown; /* Maximum amount of data to send in one fragment. @@ -1205,7 +1207,11 @@ struct ssl_st * NB: For servers, the 'new' session may actually be a previously * cached session or even the previous session unless * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */ - int quiet_shutdown;/* don't send shutdown packets */ + + /* quiet_shutdown is true if the connection should not send a + * close_notify on shutdown. */ + int quiet_shutdown; + int shutdown; /* we have shut things down, 0x01 sent, 0x02 * for received */ int state; /* where we are */ |