Changeset 5648 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Sep 14, 2017 5:03:45 AM (7 years ago)

Author:

riza

Message:

Re #1994(misc): Avoid calling SSL_shutdown() if handshake wasn't completed otherwise OpenSSL 1.0.2f and newer version will complain. Thanks to Peter Koletzki for the report.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)

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

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