Kolab Groupware OBS

Changes of Revision 7

support-tls1.1-and-later.patch Changed

@@ -1,7 +1,7 @@
---- mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c.orig	2006-10-10 06:37:35.000000000 -0700
-+++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c	2014-11-03 14:18:59.908337004 -0800
-@@ -59,8 +59,9 @@
- #endif /* OSF1V4D */
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/ldapsinit.c mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/ldapsinit.c	2011-01-06 13:05:39.000000000 +0100
++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c	2019-10-19 12:23:01.010624494 +0200
+@@ -60,6 +60,7 @@
  
  #include <errno.h>
  #include <nspr.h>
@@ -9,9 +9,7 @@
  #include <cert.h>
  #include <key.h>
  #include <ssl.h>
- #include <sslproto.h>
-@@ -70,8 +71,21 @@
- #include <ldap.h>
+@@ -71,6 +72,19 @@
  #include <ldap_ssl.h>
  #include <ldappr.h>
  #include <pk11func.h>
@@ -31,9 +29,7 @@
  
  /*
   * Macro that determines how many SSL options we support. As of June, 2002
-  * NSS supports 14 options numbered 1-14 (see nss/ssl.h).  We allow some
-@@ -247,8 +261,20 @@
-     PRLDAPSocketInfo	soi;
+@@ -248,6 +262,18 @@
      LDAPSSLSocketInfo	*ssoip = NULL;
      LDAPSSLSessionInfo	*sseip;
      PRFileDesc		*sslfd = NULL;
@@ -52,9 +48,7 @@
  
      /*
       * Determine if secure option is set.  Also, clear secure bit in options
-      * the we pass to the standard connect() function (since it doesn't know
-@@ -305,9 +331,18 @@
-     if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) {
+@@ -306,7 +332,16 @@
  	goto close_socket_and_exit_with_error;
      }
  
@@ -71,9 +65,7 @@
  		SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure )
  		!= SECSuccess || ( secure && SSL_ResetHandshake( sslfd,
  		PR_FALSE ) != SECSuccess )) {
- 	goto close_socket_and_exit_with_error;
-@@ -505,8 +540,20 @@
-     LBER_SOCKET 	intfd = -1;
+@@ -516,6 +551,18 @@
      int			rc = LDAP_LOCAL_ERROR;
      char 		*hostlist = NULL;
      struct lextiof_socket_private *socketargp = NULL;
@@ -92,29 +84,7 @@
          
      /*
       * Get hostlist from LDAP Handle
-      */
-@@ -570,10 +617,18 @@
- 	rc = LDAP_LOCAL_ERROR;
- 	goto close_socket_and_exit_with_error;
-     }
-     
-+#if defined(NSS_TLS11)
-+    sslStatus = SSL_VersionRangeSet(sslfd, &ldapNSSVersions);
-+    if (sslStatus != SECSuccess) {
-+        goto close_socket_and_exit_with_error;
-+    }
-+#endif
-     if ( SSL_OptionSet( sslfd, SSL_SECURITY, secure ) != SECSuccess ||
--		 SSL_OptionSet( sslfd, SSL_ENABLE_TLS, secure ) != SECSuccess ||
-+#if defined(NSS_TLS10)
-+         SSL_OptionSet( sslfd, SSL_ENABLE_TLS, secure ) != SECSuccess ||
-+#endif
- 		 SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess ||
- 		 ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess ) ) {
- 	rc = LDAP_LOCAL_ERROR;
- 	goto close_socket_and_exit_with_error;
-@@ -1350,13 +1405,25 @@
-     PRLDAPSocketInfo				soi;
+@@ -1371,11 +1418,23 @@
      LDAPSSLSocketInfo				*ssoip = NULL;
      LDAPSSLSessionInfo				*sseip;
      PRFileDesc						*sslfd = NULL;
@@ -142,9 +112,7 @@
       * Get hostlist from LDAP Handle
       */
      if ( ldap_get_option(ld, LDAP_OPT_HOST_NAME, &hostlist) < 0 ) {
- 		return( -1 );
-@@ -1411,10 +1478,18 @@
-     if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) {
+@@ -1432,8 +1491,16 @@
          goto reset_socket_and_exit_with_error;
      }
  
@@ -162,4 +130,5 @@
                  SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure )
                  != SECSuccess || ( secure && SSL_ResetHandshake( sslfd,
                  PR_FALSE ) != SECSuccess )) {
-         goto reset_socket_and_exit_with_error;
+Only in mozldap-6.0.7/c-sdk/ldap/libraries/libssldap: ldapsinit.c.orig
+Only in mozldap-6.0.7/c-sdk/ldap/libraries/libssldap: ldapsinit.c.rej