ITS#7428 - Non-blocking TLS is not compatible with MOZNSS

[openldap] / libraries / libldap / tls2.c

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index 732826b2e0688cf95e5cd3b4b50ddea17a7745f4..f6dbf21f993738ba5e826a717dc1220ec0bf02b8 100644 (file)
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -43,7 +43,9 @@ static tls_impl *tls_imp = &ldap_int_tls_impl;
 
 #endif /* HAVE_TLS */
 
+#ifndef HAVE_MOZNSS
 #define LDAP_USE_NON_BLOCKING_TLS
+#endif
 
 /* RFC2459 minimum required set of supported attribute types
  * in a certificate DN
@@ -734,6 +736,33 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
                }
                break;
        }
+       case LDAP_OPT_X_TLS_CACERT: {
+               struct berval *bv = arg;
+               if ( lo->ldo_tls_cacert.bv_val ) {
+                       ber_dupbv( bv, &lo->ldo_tls_cacert );
+               } else {
+                       BER_BVZERO( bv );
+               }
+               break;
+       }
+       case LDAP_OPT_X_TLS_CERT: {
+               struct berval *bv = arg;
+               if ( lo->ldo_tls_cert.bv_val ) {
+                       ber_dupbv( bv, &lo->ldo_tls_cert );
+               } else {
+                       BER_BVZERO( bv );
+               }
+               break;
+       }
+       case LDAP_OPT_X_TLS_KEY: {
+               struct berval *bv = arg;
+               if ( lo->ldo_tls_key.bv_val ) {
+                       ber_dupbv( bv, &lo->ldo_tls_key );
+               } else {
+                       BER_BVZERO( bv );
+               }
+               break;
+       }
 
        default:
                return -1;
@@ -867,34 +896,43 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
                lo->ldo_tls_ctx = NULL;
                return ldap_int_tls_init_ctx( lo, *(int *)arg );
        case LDAP_OPT_X_TLS_CACERT:
-               if ( !arg ) return -1;
                if ( lo->ldo_tls_cacert.bv_val )
                        LDAP_FREE( lo->ldo_tls_cacert.bv_val );
-               lo->ldo_tls_cacert.bv_len = ((struct berval *)arg)->bv_len;
-               lo->ldo_tls_cacert.bv_val = LDAP_MALLOC( lo->ldo_tls_cacert.bv_len );
-               if ( !lo->ldo_tls_cacert.bv_val )
-                       return -1;
-               AC_MEMCPY( lo->ldo_tls_cacert.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_cacert.bv_len );
+               if ( arg ) {
+                       lo->ldo_tls_cacert.bv_len = ((struct berval *)arg)->bv_len;
+                       lo->ldo_tls_cacert.bv_val = LDAP_MALLOC( lo->ldo_tls_cacert.bv_len );
+                       if ( !lo->ldo_tls_cacert.bv_val )
+                               return -1;
+                       AC_MEMCPY( lo->ldo_tls_cacert.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_cacert.bv_len );
+               } else {
+                       BER_BVZERO( &lo->ldo_tls_cacert );
+               }
                break;
        case LDAP_OPT_X_TLS_CERT:
-               if ( !arg ) return -1;
                if ( lo->ldo_tls_cert.bv_val )
                        LDAP_FREE( lo->ldo_tls_cert.bv_val );
-               lo->ldo_tls_cert.bv_len = ((struct berval *)arg)->bv_len;
-               lo->ldo_tls_cert.bv_val = LDAP_MALLOC( lo->ldo_tls_cert.bv_len );
-               if ( !lo->ldo_tls_cert.bv_val )
-                       return -1;
-               AC_MEMCPY( lo->ldo_tls_cert.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_cert.bv_len );
+               if ( arg ) {
+                       lo->ldo_tls_cert.bv_len = ((struct berval *)arg)->bv_len;
+                       lo->ldo_tls_cert.bv_val = LDAP_MALLOC( lo->ldo_tls_cert.bv_len );
+                       if ( !lo->ldo_tls_cert.bv_val )
+                               return -1;
+                       AC_MEMCPY( lo->ldo_tls_cert.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_cert.bv_len );
+               } else {
+                       BER_BVZERO( &lo->ldo_tls_cert );
+               }
                break;
        case LDAP_OPT_X_TLS_KEY:
-               if ( !arg ) return -1;
                if ( lo->ldo_tls_key.bv_val )
                        LDAP_FREE( lo->ldo_tls_key.bv_val );
-               lo->ldo_tls_key.bv_len = ((struct berval *)arg)->bv_len;
-               lo->ldo_tls_key.bv_val = LDAP_MALLOC( lo->ldo_tls_key.bv_len );
-               if ( !lo->ldo_tls_key.bv_val )
-                       return -1;
-               AC_MEMCPY( lo->ldo_tls_key.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_key.bv_len );
+               if ( arg ) {
+                       lo->ldo_tls_key.bv_len = ((struct berval *)arg)->bv_len;
+                       lo->ldo_tls_key.bv_val = LDAP_MALLOC( lo->ldo_tls_key.bv_len );
+                       if ( !lo->ldo_tls_key.bv_val )
+                               return -1;
+                       AC_MEMCPY( lo->ldo_tls_key.bv_val, ((struct berval *)arg)->bv_val, lo->ldo_tls_key.bv_len );
+               } else {
+                       BER_BVZERO( &lo->ldo_tls_key );
+               }
                break;
        default:
                return -1;