Print this page
pass 2

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c
          +++ new/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c
↓ open down ↓ 148 lines elided ↑ open up ↑
 149  149                  /* neither *key[0-9].db nor *cert[0=9].db found */
 150  150                  return (-1);
 151  151          }
 152  152  
 153  153          return (0);
 154  154  }
 155  155  
 156  156  
 157  157  static PRStatus local_SSLPLCY_Install(void)
 158  158  {
 159      -        SECStatus s;
 160      -
 161      -#ifdef NS_DOMESTIC
 162      -        s = NSS_SetDomesticPolicy(); 
 163      -#elif NS_EXPORT
 164      -        s = NSS_SetExportPolicy(); 
 165      -#else
 166      -        s = PR_FAILURE;
 167      -#endif
 168      -        return s?PR_FAILURE:PR_SUCCESS;
      159 +        return NSS_SetDomesticPolicy() ? PR_FAILURE : PR_SUCCESS;
 169  160  }
 170  161  
 171  162  
 172  163  
 173  164  static void
 174  165  ldapssl_basic_init( void )
 175  166  {
 176  167  #ifndef _SOLARIS_SDK
 177  168          /*
 178  169           * NSPR is initialized in .init on SOLARIS
↓ open down ↓ 286 lines elided ↑ open up ↑
 465  456              || SSL_OptionSetDefault(SSL_ENABLE_SSL3, PR_TRUE)) {
 466  457          if (( rc = PR_GetError()) >= 0 ) {
 467  458              rc = -1;
 468  459          }
 469  460          mutex_unlock(&inited_mutex);
 470  461          return( rc );
 471  462      }
 472  463  
 473  464  
 474  465  
 475      -#if defined(NS_DOMESTIC)
 476  466      if (local_SSLPLCY_Install() == PR_FAILURE) {
 477  467        mutex_unlock(&inited_mutex);
 478  468        return( -1 );
 479  469      }
 480      -#elif(NS_EXPORT)
 481      -    if (local_SSLPLCY_Install() == PR_FAILURE) {
 482      -      mutex_unlock(&inited_mutex);
 483      -      return( -1 );
 484      -    }
 485      -#else
 486      -    mutex_unlock(&inited_mutex);
 487      -    return( -1 );
 488      -#endif
 489  470  
 490  471      inited = 1;
 491  472      mutex_unlock(&inited_mutex);
 492  473  
 493  474      return( 0 );
 494  475  
 495  476  }
 496  477  
 497  478  /*
 498  479   * Initialize ns/security so it can be used for SSL client authentication.
↓ open down ↓ 70 lines elided ↑ open up ↑
 569  550      }
 570  551      ldapssl_free(&enval);
 571  552  #endif
 572  553      if (rc != 0) {
 573  554          if ((rc = PR_GetError()) >= 0)
 574  555              rc = -1;
 575  556          mutex_unlock(&inited_mutex);
 576  557          return (rc);
 577  558      }
 578  559  
 579      -#if defined(NS_DOMESTIC)
 580  560      if (local_SSLPLCY_Install() == PR_FAILURE) {
 581  561        mutex_unlock(&inited_mutex);
 582  562        return( -1 );
 583  563      }
 584      -#elif(NS_EXPORT)
 585      -    if (local_SSLPLCY_Install() == PR_FAILURE) {
 586      -      mutex_unlock(&inited_mutex);
 587      -      return( -1 );
 588      -    }
 589      -#else
 590      -    mutex_unlock(&inited_mutex);
 591      -    return( -1 );
 592      -#endif
 593  564  
 594  565      inited = 1;
 595  566      mutex_unlock(&inited_mutex);
 596  567  
 597  568      return( ldapssl_set_strength( NULL, sslstrength));
 598  569  
 599  570  }
 600  571  
 601  572  
 602  573  /*
↓ open down ↓ 101 lines elided ↑ open up ↑
 704  675      if (SSL_OptionSetDefault(SSL_ENABLE_SSL2, PR_FALSE)
 705  676          || SSL_OptionSetDefault(SSL_ENABLE_SSL3, PR_TRUE)) {
 706  677          if (( rc = PR_GetError()) >= 0 ) {
 707  678              rc = -1;
 708  679          }
 709  680          
 710  681          mutex_unlock(&inited_mutex);
 711  682          return( rc );
 712  683      }
 713  684      
 714      -#if defined(NS_DOMESTIC)
 715  685      if (local_SSLPLCY_Install() == PR_FAILURE) {
 716  686        mutex_unlock(&inited_mutex);
 717  687        return( -1 );
 718  688      }
 719      -#elif(NS_EXPORT)
 720      -    if (local_SSLPLCY_Install() == PR_FAILURE) {
 721      -      mutex_unlock(&inited_mutex);
 722      -      return( -1 );
 723      -    }
 724      -#else
 725      -    mutex_unlock(&inited_mutex);
 726      -    return( -1 );
 727      -#endif
 728  689  
 729  690      inited = 1;
 730  691  
 731  692      if ( certdbName != NULL ) {
 732  693          ldapssl_free((void **) &certdbName );
 733  694      }
 734  695      
 735  696      return( ldapssl_set_strength( NULL, LDAPSSL_AUTH_CNCHECK));
 736  697  }
 737  698  
↓ open down ↓ 249 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX