Changeset 6054

Timestamp:

Aug 28, 2019 12:02:50 PM (5 years ago)

Author:

riza

Message:

Fixed #2221: When using Openssl as TLS backend, close notify alert is not sent before closing the connection.

Location:

pjproject/trunk/pjlib/src/pj

Files:

• ssl_sock_imp_common.c (modified) (1 diff)
• ssl_sock_imp_common.h (modified) (1 diff)
• ssl_sock_ossl.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c

@@ -1282 +1282 @@
     pj_ioqueue_op_key_init(&ssock->handshake_op_key,
                            sizeof(pj_ioqueue_op_key_t));
+    pj_ioqueue_op_key_init(&ssock->shutdown_op_key,
+                           sizeof(pj_ioqueue_op_key_t));
 
     /* Create secure socket mutex */

pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.h

@@ -108 +108 @@
     enum ssl_state        ssl_state;
     pj_ioqueue_op_key_t   handshake_op_key;
+    pj_ioqueue_op_key_t   shutdown_op_key;
     pj_timer_entry        timer;
     pj_status_t           verify_status;

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -1169 +1169 @@
     /* Destroy SSL instance */
     if (ossock->ossl_ssl) {
-        /**
-         * Avoid calling SSL_shutdown() if handshake wasn't completed.
-         * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an
-         * SSL handshake, while previous versions always return 0.       
-         */
-        if (SSL_in_init(ossock->ossl_ssl) == 0) {
-            SSL_shutdown(ossock->ossl_ssl);
-        }       
         SSL_free(ossock->ossl_ssl); /* this will also close BIOs */
         ossock->ossl_ssl = NULL;
@@ -1197 +1189 @@
 static void ssl_reset_sock_state(pj_ssl_sock_t *ssock)
 {
+    ossl_sock_t *ossock = (ossl_sock_t *)ssock;
+    /**
+     * Avoid calling SSL_shutdown() if handshake wasn't completed.
+     * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an
+     * SSL handshake, while previous versions always return 0.
+     */
+    if (ossock->ossl_ssl && SSL_in_init(ossock->ossl_ssl) == 0) {
+        int ret = SSL_shutdown(ossock->ossl_ssl);
+        if (ret == 0) {
+            /* Flush data to send close notify. */
+            flush_circ_buf_output(ssock, &ssock->shutdown_op_key, 0, 0);
+        }
+    }
+
     pj_lock_acquire(ssock->write_mutex);
     ssock->ssl_state = SSL_STATE_NULL;