diff options
author | Matt Caswell <matt@openssl.org> | 2018-06-25 14:51:11 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2018-06-27 10:03:37 +0100 |
commit | 358ffa05cd3a088822c7d06256bc87516d918798 (patch) | |
tree | 59682167c740c52c35fa4b55b859cee2499bc16b /crypto/err | |
parent | ba70904949d2f9eec160043bf9a97182b33a2b82 (diff) | |
download | openssl-358ffa05cd3a088822c7d06256bc87516d918798.zip openssl-358ffa05cd3a088822c7d06256bc87516d918798.tar.gz openssl-358ffa05cd3a088822c7d06256bc87516d918798.tar.bz2 |
Return a fatal error if application data is encountered during shutdown
Currently if you encounter application data while waiting for a
close_notify from the peer, and you have called SSL_shutdown() then
you will get a -1 return (fatal error) and SSL_ERROR_SYSCALL from
SSL_get_error(). This isn't accurate (it should be SSL_ERROR_SSL) and
isn't persistent (you can call SSL_shutdown() again and it might then work).
We change this into a proper fatal error that is persistent.
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6340)
Diffstat (limited to 'crypto/err')
-rw-r--r-- | crypto/err/openssl.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index e65a806..ee68388 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2544,6 +2544,8 @@ SM2_R_INVALID_ENCODING:104:invalid encoding SM2_R_INVALID_FIELD:105:invalid field SM2_R_NO_PARAMETERS_SET:109:no parameters set SM2_R_USER_ID_TOO_LARGE:106:user id too large +SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY:291:\ + application data after close notify SSL_R_APP_DATA_IN_HANDSHAKE:100:app data in handshake SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT:272:\ attempt to reuse session in different context |