Changeset 5929

Timestamp:

Jan 9, 2019 9:15:11 AM (5 years ago)

Author:

riza

Message:

Close #2174: Fix out of bound error when enabling GnuTLS.

Location:

pjproject/trunk

Files:

• pjlib/build/pjlib.vcxproj (modified) (1 diff)
• pjlib/src/pj/ssl_sock_gtls.c (modified) (2 diffs)
• pjmedia/src/pjmedia/transport_srtp_sdes.c (modified) (1 diff)

pjproject/trunk/pjlib/build/pjlib.vcxproj

@@ -753 +753 @@
     <ClCompile Include="..\src\pj\ssl_sock_dump.c" />
     <ClCompile Include="..\src\pj\ssl_sock_ossl.c" />
+    <ClCompile Include="..\src\pj\ssl_sock_gtls.c" />
     <ClCompile Include="..\src\pj\string.c" />
     <ClCompile Include="..\src\pj\symbols.c">

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

@@ -494 +494 @@
         unsigned int i;
 
-        for (i = 0; ; i++) {
+        for (i = 0; i<PJ_ARRAY_SIZE(tls_ciphers); i++) {
             unsigned char id[2];
             const char *suite;
@@ -504 +504 @@
              * ciphers anyway, so by checking here we can exit the loop as soon
              * as either all ciphers have been added or the array is full */
-            if (suite && i < PJ_ARRAY_SIZE(tls_ciphers)) {
+            if (suite) {
                 tls_ciphers[i].id = (pj_ssl_cipher)
                     (pj_uint32_t) ((id[0] << 8) | id[1]);

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_sdes.c

@@ -21 +21 @@
 
 /* Include OpenSSL libraries for MSVC */
-#  ifdef _MSC_VER
-#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
-#      pragma comment(lib, "libcrypto")
-#    else
-#      pragma comment(lib, "libeay32")
-#      pragma comment(lib, "ssleay32")
+#  ifdef _MSC_VER 
+#    if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
+#      if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#        pragma comment(lib, "libcrypto")
+#      else
+#        pragma comment(lib, "libeay32")
+#        pragma comment(lib, "ssleay32")
+#      endif
 #    endif
 #  endif
-
 #endif