From 158a47cbe467a6c50c6a6e85247959f20e51c1d4 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 30 Oct 2009 18:55:18 +0000 Subject: [PATCH] ITS#6355 --- CHANGES | 1 + libraries/libldap/tls_o.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ef981c9280..03089f7734 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ OpenLDAP 2.4 Change Log OpenLDAP 2.4.20 Engineering + Fixed libldap uninitialized return value (ITS#6355) Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324) OpenLDAP 2.4.19 Release (2009/10/06) diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c index 4d08272a21..dcae8f2894 100644 --- a/libraries/libldap/tls_o.c +++ b/libraries/libldap/tls_o.c @@ -1081,6 +1081,7 @@ tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length ) /* FIXME: Who frees the key? */ #if OPENSSL_VERSION_NUMBER > 0x00908000 BIGNUM *bn = BN_new(); + tmp_rsa = NULL; if ( bn ) { if ( BN_set_word( bn, RSA_F4 )) { tmp_rsa = RSA_new(); @@ -1090,8 +1091,6 @@ tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length ) } } BN_free( bn ); - } else { - tmp_rsa = NULL; } #else tmp_rsa = RSA_generate_key( key_length, RSA_F4, NULL, NULL ); @@ -1101,7 +1100,6 @@ tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length ) Debug( LDAP_DEBUG_ANY, "TLS: Failed to generate temporary %d-bit %s RSA key\n", key_length, is_export ? "export" : "domestic", 0 ); - return NULL; } return tmp_rsa; } -- 2.39.5