| commit | 23b29b831766c2aa81341ec74c6dc9086f7a73d1 | [log] [tgz] |
|---|---|---|
| author | Jouni Malinen <jouni@qca.qualcomm.com> | Tue Aug 18 17:56:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 17:56:01 2015 +0000 |
| tree | 39e27ab73ac3268fca5797d177e7702e574b8080 | |
| parent | 5f6ca22cea74955d5e19d7a13ba7d5046108b0fa [diff] | |
| parent | f291c682d490cef0b520b68e694a2bf97126b441 [diff] |
am f291c682: BoringSSL: Fix session resumption * commit 'f291c682d490cef0b520b68e694a2bf97126b441': BoringSSL: Fix session resumption
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 2250e6e..db2d73e 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c
@@ -1149,7 +1149,7 @@ * and "close notify" shutdown alert would confuse AS. */ SSL_set_quiet_shutdown(conn->ssl, 1); SSL_shutdown(conn->ssl); - return 0; + return SSL_clear(conn->ssl) == 1 ? 0 : -1; }