Changeset 6016 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

May 30, 2019 3:27:25 AM (5 years ago)

Author:

ming

Message:

Fixed #2206: Avoid calling SSL_shutdown() in DTLS media transport if handshake isn't completed yet

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -463 +463 @@
     /* Destroy SSL instance */
     if (ds->ossl_ssl) {
-        SSL_shutdown(ds->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(ds->ossl_ssl); /* this will also close BIOs */
         ds->ossl_ssl = NULL;