From 11cafd1e0bf44ab4639a852fe6f3a309a987bc25 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 5 Oct 2005 20:41:32 +0000 Subject: [PATCH] Revert last commit per hyc's note on -devel --- CHANGES | 1 - include/ldap.h | 1 - libraries/libldap/init.c | 2 +- libraries/libldap/tls.c | 162 ++------------------------------------- 4 files changed, 7 insertions(+), 159 deletions(-) diff --git a/CHANGES b/CHANGES index acf15395a0..e1ff350df7 100644 --- a/CHANGES +++ b/CHANGES @@ -47,7 +47,6 @@ OpenLDAP 2.3.8 Release Fixed slapcat out-of-memory problem (ITS#4010) Fixed slurpd unrecognized slave names bug (ITS#4012) Fixed liblber dgram len bug (ITS#4046) - Added libldap TLS Diffie-Hellman parameters support (ITS#4017) Fixed libldap SASL and TLS potential ld_error leaks (ITS#4064) Fixed liblutil/csn time counter issue Updated contrib/ldapc++ to avoid deprecated functions diff --git a/include/ldap.h b/include/ldap.h index 2921d05cd1..05eb052df4 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -136,7 +136,6 @@ LDAP_BEGIN_DECL #define LDAP_OPT_X_TLS_CRLCHECK 0x600b #define LDAP_OPT_X_TLS_CONNECT_CB 0x600c #define LDAP_OPT_X_TLS_CONNECT_ARG 0x600d -#define LDAP_OPT_X_TLS_DHPARAMDIR 0x600e #define LDAP_OPT_X_TLS_NEVER 0 #define LDAP_OPT_X_TLS_HARD 1 diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 613bd93c57..fe47f8dc39 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -110,7 +110,7 @@ static const struct ol_attribute { {0, ATTR_NONE, NULL, NULL, 0} }; -#define MAX_LDAP_ATTR_LEN sizeof("TLS_CIPHER_SUITE") +#define MAX_LDAP_ATTR_LEN sizeof("TLS_CACERTDIR") #define MAX_LDAP_ENV_PREFIX_LEN 8 static void openldap_ldap_init_w_conf( diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c index 6b3d998bfd..71a5e33d20 100644 --- a/libraries/libldap/tls.c +++ b/libraries/libldap/tls.c @@ -50,7 +50,6 @@ static int tls_opt_trace = 1; static char *tls_opt_certfile = NULL; static char *tls_opt_keyfile = NULL; -static char *tls_opt_dhparamdir = NULL; static char *tls_opt_cacertfile = NULL; static char *tls_opt_cacertdir = NULL; static int tls_opt_require_cert = LDAP_OPT_X_TLS_DEMAND; @@ -59,7 +58,6 @@ static int tls_opt_crlcheck = LDAP_OPT_X_TLS_CRL_NONE; #endif static char *tls_opt_ciphersuite = NULL; static char *tls_opt_randfile = NULL; -static int tls_opt_dhparamdirlen; #define HAS_TLS( sb ) ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, \ (void *)&sb_tls_sbio ) @@ -72,7 +70,9 @@ static int tls_verify_ok( int ok, X509_STORE_CTX *ctx ); static RSA * tls_tmp_rsa_cb( SSL *ssl, int is_export, int key_length ); static STACK_OF(X509_NAME) * get_ca_list( char * bundle, char * dir ); +#if 0 /* Currently this is not used by anyone */ static DH * tls_tmp_dh_cb( SSL *ssl, int is_export, int key_length ); +#endif static SSL_CTX *tls_def_ctx = NULL; @@ -134,10 +134,6 @@ ldap_pvt_tls_destroy( void ) LDAP_FREE( tls_opt_keyfile ); tls_opt_keyfile = NULL; } - if ( tls_opt_dhparamdir ) { - LDAP_FREE( tls_opt_dhparamdir ); - tls_opt_dhparamdir = NULL; - } if ( tls_opt_cacertfile ) { LDAP_FREE( tls_opt_cacertfile ); tls_opt_cacertfile = NULL; @@ -337,7 +333,7 @@ ldap_pvt_tls_init_def_ctx( void ) tls_opt_require_cert == LDAP_OPT_X_TLS_ALLOW ? tls_verify_ok : tls_verify_cb ); SSL_CTX_set_tmp_rsa_callback( tls_def_ctx, tls_tmp_rsa_cb ); - SSL_CTX_set_tmp_dh_callback( tls_def_ctx, tls_tmp_dh_cb ); + /* SSL_CTX_set_tmp_dh_callback( tls_def_ctx, tls_tmp_dh_cb ); */ #ifdef HAVE_OPENSSL_CRL if ( tls_opt_crlcheck ) { X509_STORE *x509_s = SSL_CTX_get_cert_store( tls_def_ctx ); @@ -1120,7 +1116,6 @@ ldap_int_tls_config( LDAP *ld, int option, const char *arg ) case LDAP_OPT_X_TLS_KEYFILE: case LDAP_OPT_X_TLS_RANDOM_FILE: case LDAP_OPT_X_TLS_CIPHER_SUITE: - case LDAP_OPT_X_TLS_DHPARAMDIR: return ldap_pvt_tls_set_option( ld, option, (void *) arg ); case LDAP_OPT_X_TLS_REQUIRE_CERT: @@ -1218,10 +1213,6 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg ) *(char **)arg = tls_opt_keyfile ? LDAP_STRDUP( tls_opt_keyfile ) : NULL; break; - case LDAP_OPT_X_TLS_DHPARAMDIR: - *(char **)arg = tls_opt_dhparamdir ? - LDAP_STRDUP( tls_opt_dhparamdir ) : NULL; - break; case LDAP_OPT_X_TLS_REQUIRE_CERT: *(int *)arg = tls_opt_require_cert; break; @@ -1333,12 +1324,6 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg ) if ( tls_opt_keyfile ) LDAP_FREE( tls_opt_keyfile ); tls_opt_keyfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL; break; - case LDAP_OPT_X_TLS_DHPARAMDIR: - if ( tls_opt_dhparamdir ) LDAP_FREE( tls_opt_dhparamdir ); - tls_opt_dhparamdir = arg ? LDAP_STRDUP( (char *) arg ) : NULL; - if ( tls_opt_dhparamdir ) - tls_opt_dhparamdirlen = strlen( tls_opt_dhparamdir ); - break; case LDAP_OPT_X_TLS_REQUIRE_CERT: switch( *(int *) arg ) { case LDAP_OPT_X_TLS_NEVER: @@ -1636,149 +1621,14 @@ tls_seed_PRNG( const char *randfile ) return 0; } -struct dhinfo { - int keylength; - const char *pem; - size_t size; -}; - -struct dhplist { - struct dhplist *next; - int keylength; - DH *param; -}; - -static struct dhplist *dhparams; - -/* From the OpenSSL 0.9.7 distro */ -static const char dhpem512[] = -"-----BEGIN DH PARAMETERS-----\n\ -MEYCQQDaWDwW2YUiidDkr3VvTMqS3UvlM7gE+w/tlO+cikQD7VdGUNNpmdsp13Yn\n\ -a6LT1BLiGPTdHghM9tgAPnxHdOgzAgEC\n\ ------END DH PARAMETERS-----\n"; - -static const char dhpem1024[] = -"-----BEGIN DH PARAMETERS-----\n\ -MIGHAoGBAJf2QmHKtQXdKCjhPx1ottPb0PMTBH9A6FbaWMsTuKG/K3g6TG1Z1fkq\n\ -/Gz/PWk/eLI9TzFgqVAuPvr3q14a1aZeVUMTgo2oO5/y2UHe6VaJ+trqCTat3xlx\n\ -/mNbIK9HA2RgPC3gWfVLZQrY+gz3ASHHR5nXWHEyvpuZm7m3h+irAgEC\n\ ------END DH PARAMETERS-----\n"; - -static const char dhpem2048[] = -"-----BEGIN DH PARAMETERS-----\n\ -MIIBCAKCAQEA7ZKJNYJFVcs7+6J2WmkEYb8h86tT0s0h2v94GRFS8Q7B4lW9aG9o\n\ -AFO5Imov5Jo0H2XMWTKKvbHbSe3fpxJmw/0hBHAY8H/W91hRGXKCeyKpNBgdL8sh\n\ -z22SrkO2qCnHJ6PLAMXy5fsKpFmFor2tRfCzrfnggTXu2YOzzK7q62bmqVdmufEo\n\ -pT8igNcLpvZxk5uBDvhakObMym9mX3rAEBoe8PwttggMYiiw7NuJKO4MqD1llGkW\n\ -aVM8U2ATsCun1IKHrRxynkE1/MJ86VHeYYX8GZt2YA8z+GuzylIOKcMH6JAWzMwA\n\ -Gbatw6QwizOhr9iMjZ0B26TE3X8LvW84wwIBAg==\n\ ------END DH PARAMETERS-----\n"; - -static const char dhpem4096[] = -"-----BEGIN DH PARAMETERS-----\n\ -MIICCAKCAgEA/urRnb6vkPYc/KEGXWnbCIOaKitq7ySIq9dTH7s+Ri59zs77zty7\n\ -vfVlSe6VFTBWgYjD2XKUFmtqq6CqXMhVX5ElUDoYDpAyTH85xqNFLzFC7nKrff/H\n\ -TFKNttp22cZE9V0IPpzedPfnQkE7aUdmF9JnDyv21Z/818O93u1B4r0szdnmEvEF\n\ -bKuIxEHX+bp0ZR7RqE1AeifXGJX3d6tsd2PMAObxwwsv55RGkn50vHO4QxtTARr1\n\ -rRUV5j3B3oPMgC7Offxx+98Xn45B1/G0Prp11anDsR1PGwtaCYipqsvMwQUSJtyE\n\ -EOQWk+yFkeMe4vWv367eEi0Sd/wnC+TSXBE3pYvpYerJ8n1MceI5GQTdarJ77OW9\n\ -bGTHmxRsLSCM1jpLdPja5jjb4siAa6EHc4qN9c/iFKS3PQPJEnX7pXKBRs5f7AF3\n\ -W3RIGt+G9IVNZfXaS7Z/iCpgzgvKCs0VeqN38QsJGtC1aIkwOeyjPNy2G6jJ4yqH\n\ -ovXYt/0mc00vCWeSNS1wren0pR2EiLxX0ypjjgsU1mk/Z3b/+zVf7fZSIB+nDLjb\n\ -NPtUlJCVGnAeBK1J1nG3TQicqowOXoM6ISkdaXj5GPJdXHab2+S7cqhKGv5qC7rR\n\ -jT6sx7RUr0CNTxzLI7muV2/a4tGmj0PSdXQdsZ7tw7gbXlaWT1+MM2MCAQI=\n\ ------END DH PARAMETERS-----\n"; - -static const struct dhinfo dhpem[] = { - { 512, dhpem512, sizeof(dhpem512) }, - { 1024, dhpem1024, sizeof(dhpem1024) }, - { 2048, dhpem2048, sizeof(dhpem2048) }, - { 4096, dhpem4096, sizeof(dhpem4096) }, - { 0, NULL, 0 } -}; - -#define MAXDIGITS 12 - -#define DHFILEPATTERN "dh%d.pem" - +#if 0 static DH * tls_tmp_dh_cb( SSL *ssl, int is_export, int key_length ) { - struct dhplist *p = NULL; - BIO *b = NULL; - FILE *f; - char *file; - DH *dh = NULL; - - /* Do we have params of this length already? */ -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &tls_def_ctx_mutex ); -#endif - for ( p = dhparams; p; p=p->next ) { - if ( p->keylength == key_length ) { -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &tls_def_ctx_mutex ); -#endif - return p->param; - } - } - - /* See if there's a file to load */ - if ( tls_opt_dhparamdir ) { - file = LDAP_MALLOC( tls_opt_dhparamdirlen + 1 + MAXDIGITS + - sizeof(DHFILEPATTERN) ); - if ( file == NULL ) - goto done; - sprintf( file, "%s/" DHFILEPATTERN, tls_opt_dhparamdir, key_length ); - } else { - file = LDAP_MALLOC( STRLENOF(LDAP_SYSCONFDIR) + 1 + MAXDIGITS + - sizeof(DHFILEPATTERN) ); - if ( file == NULL ) - goto done; - sprintf( file, LDAP_SYSCONFDIR "/" DHFILEPATTERN, key_length ); - } - f = fopen(file,"r"); - /* Did we get the file? */ - if ( f ) { - b = BIO_new_fp( f, BIO_CLOSE ); - if ( b == NULL ) - fclose( f ); - } else { - /* No - check for hardcoded params */ - int i; - - for (i=0; dhpem[i].keylength; i++) { - if ( dhpem[i].keylength == key_length ) { - b = BIO_new_mem_buf( (char *)dhpem[i].pem, dhpem[i].size ); - break; - } - } - } - if ( b ) { - dh = PEM_read_bio_DHparams( b, NULL, NULL, NULL ); - BIO_free( b ); - } - - /* Generating on the fly is expensive/slow... */ - if ( !dh ) { - dh = DH_generate_parameters( key_length, DH_GENERATOR_2, NULL, NULL ); - } - if ( dh ) { - p = LDAP_MALLOC( sizeof(struct dhplist) ); - if ( p != NULL ) { - p->keylength = key_length; - p->param = dh; - p->next = dhparams; - dhparams = p; - } - } -done: -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &tls_def_ctx_mutex ); -#endif - return dh; + return NULL; } #endif +#endif void * ldap_pvt_tls_sb_ctx( Sockbuf *sb ) -- 2.39.5