+/* tls.c - Handle tls/ssl using SSLeay or OpenSSL. */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * tls.c - Handle tls/ssl using SSLeay or OpenSSL.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
+#include "ldap_config.h"
#include <stdio.h>
#include <ac/errno.h>
#include <ac/socket.h>
#include <ac/string.h>
+#include <ac/ctype.h>
#include <ac/time.h>
#include <ac/unistd.h>
#include <ac/param.h>
+#include <ac/dirent.h>
#include "ldap-int.h"
static void tls_report_error( void );
-static void tls_info_cb( SSL *ssl, int where, int ret );
+static void tls_info_cb( const SSL *ssl, int where, int ret );
static int tls_verify_cb( int ok, X509_STORE_CTX *ctx );
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 );
tls_def_ctx = NULL;
EVP_cleanup();
+ ERR_remove_state(0);
ERR_free_strings();
if ( tls_opt_certfile ) {
{
static int tls_initialized = 0;
- if ( tls_initialized ) return 0;
- tls_initialized = 1;
+ if ( tls_initialized++ ) return 0;
+#ifdef HAVE_EBCDIC
+ {
+ char *file = LDAP_STRDUP( tls_opt_randfile );
+ if ( file ) __atoe( file );
+ (void) tls_seed_PRNG( file );
+ LDAP_FREE( file );
+ }
+#else
(void) tls_seed_PRNG( tls_opt_randfile );
+#endif
#ifdef LDAP_R_COMPILE
tls_init_threads();
ldap_pvt_tls_init_def_ctx( void )
{
STACK_OF(X509_NAME) *calist;
+ int rc = 0;
+ char *ciphersuite = tls_opt_ciphersuite;
+ char *cacertfile = tls_opt_cacertfile;
+ char *cacertdir = tls_opt_cacertdir;
+ char *certfile = tls_opt_certfile;
+ char *keyfile = tls_opt_keyfile;
+
+#ifdef HAVE_EBCDIC
+ /* This ASCII/EBCDIC handling is a real pain! */
+ if ( ciphersuite ) {
+ ciphersuite = LDAP_STRDUP( ciphersuite );
+ __atoe( ciphersuite );
+ }
+ if ( cacertfile ) {
+ cacertfile = LDAP_STRDUP( cacertfile );
+ __atoe( cacertfile );
+ }
+ if ( cacertdir ) {
+ cacertdir = LDAP_STRDUP( cacertdir );
+ __atoe( cacertdir );
+ }
+ if ( certfile ) {
+ certfile = LDAP_STRDUP( certfile );
+ __atoe( certfile );
+ }
+ if ( keyfile ) {
+ keyfile = LDAP_STRDUP( keyfile );
+ __atoe( keyfile );
+ }
+#endif
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &tls_def_ctx_mutex );
tls_def_ctx = SSL_CTX_new( SSLv23_method() );
if ( tls_def_ctx == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not allocate default ctx (%d).\n",
- ERR_peek_error() ));
+ ERR_peek_error(), 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not allocate default ctx (%lu).\n",
ERR_peek_error(),0,0);
#endif
+ rc = -1;
goto error_exit;
}
+ SSL_CTX_set_session_id_context( tls_def_ctx,
+ (const unsigned char *) "OpenLDAP", sizeof("OpenLDAP")-1 );
+
if ( tls_opt_ciphersuite &&
- !SSL_CTX_set_cipher_list( tls_def_ctx, tls_opt_ciphersuite ) )
+ !SSL_CTX_set_cipher_list( tls_def_ctx, ciphersuite ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not set cipher list %s.\n",
- tls_opt_ciphersuite ));
+ tls_opt_ciphersuite, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not set cipher list %s.\n",
tls_opt_ciphersuite, 0, 0 );
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
if (tls_opt_cacertfile != NULL || tls_opt_cacertdir != NULL) {
if ( !SSL_CTX_load_verify_locations( tls_def_ctx,
- tls_opt_cacertfile, tls_opt_cacertdir ) ||
+ cacertfile, cacertdir ) ||
!SSL_CTX_set_default_verify_paths( tls_def_ctx ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
+ LDAP_LOG ( TRANSPORT, ERR,
"ldap_pvt_tls_init_def_ctx: "
"TLS could not load verify locations "
"(file:`%s',dir:`%s').\n",
tls_opt_cacertfile ? tls_opt_cacertfile : "",
- tls_opt_cacertdir ? tls_opt_cacertdir : "" ));
+ tls_opt_cacertdir ? tls_opt_cacertdir : "", 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: "
"could not load verify locations (file:`%s',dir:`%s').\n",
0 );
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
- calist = get_ca_list( tls_opt_cacertfile, tls_opt_cacertdir );
+ calist = get_ca_list( cacertfile, cacertdir );
if ( !calist ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
"TLS could not load client CA list (file: `%s',dir:`%s')\n",
tls_opt_cacertfile ? tls_opt_cacertfile : "",
- tls_opt_cacertdir ? tls_opt_cacertdir : "" ));
+ tls_opt_cacertdir ? tls_opt_cacertdir : "", 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: "
"could not load client CA list (file:`%s',dir:`%s').\n",
0 );
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
if ( tls_opt_keyfile &&
!SSL_CTX_use_PrivateKey_file( tls_def_ctx,
- tls_opt_keyfile, SSL_FILETYPE_PEM ) )
+ keyfile, SSL_FILETYPE_PEM ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
- "TLS could not use key file `%s'.\n", tls_opt_keyfile ));
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
+ "TLS could not use key file `%s'.\n", tls_opt_keyfile, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not use key file `%s'.\n",
tls_opt_keyfile,0,0);
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
if ( tls_opt_certfile &&
!SSL_CTX_use_certificate_file( tls_def_ctx,
- tls_opt_certfile, SSL_FILETYPE_PEM ) )
+ certfile, SSL_FILETYPE_PEM ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
- "TLS could not use certificate `%s'.\n", tls_opt_certfile ));
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_init_def_ctx: "
+ "TLS could not use certificate `%s'.\n",
+ tls_opt_certfile, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: could not use certificate `%s'.\n",
tls_opt_certfile,0,0);
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
!SSL_CTX_check_private_key( tls_def_ctx ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_init_def_ctx: "
- "TLS private key mismatch.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "ldap_pvt_tls_init_def_ctx: TLS private key mismatch.\n",
+ 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: private key mismatch.\n",
0,0,0);
#endif
tls_report_error();
+ rc = -1;
goto error_exit;
}
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 ); */
}
-#ifdef LDAP_R_COMPILE
- ldap_pvt_thread_mutex_unlock( &tls_def_ctx_mutex );
-#endif
- return 0;
-
error_exit:
- if ( tls_def_ctx != NULL ) {
+ if ( rc == -1 && tls_def_ctx != NULL ) {
SSL_CTX_free( tls_def_ctx );
tls_def_ctx = NULL;
}
+#ifdef HAVE_EBCDIC
+ LDAP_FREE( ciphersuite );
+ LDAP_FREE( cacertfile );
+ LDAP_FREE( cacertdir );
+ LDAP_FREE( certfile );
+ LDAP_FREE( keyfile );
+#endif
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &tls_def_ctx_mutex );
#endif
- return -1;
+ return rc;
}
static STACK_OF(X509_NAME) *
if ( bundle ) {
ca_list = SSL_load_client_CA_file( bundle );
}
- /*
- * FIXME: We have now to go over all files in dir, load them
- * and add every certificate there to ca_list.
- */
+#if defined(HAVE_DIRENT_H) || defined(dirent)
+ if ( dir ) {
+ int freeit = 0;
+
+ if ( !ca_list ) {
+ ca_list = sk_X509_NAME_new_null();
+ freeit = 1;
+ }
+ if ( !SSL_add_dir_cert_subjects_to_stack( ca_list, dir ) &&
+ freeit ) {
+ sk_X509_NAME_free( ca_list );
+ ca_list = NULL;
+ }
+ }
+#endif
return ca_list;
}
ssl = SSL_new( ctx );
if ( ssl == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "alloc_handle: "
- "TLS can't create ssl handle.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "alloc_handle: TLS can't create ssl handle.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't create ssl handle.\n",0,0,0);
#endif
ret = LBER_SBIOD_READ_NEXT( p->sbiod, buf, len );
BIO_clear_retry_flags( b );
- if ( ret < 0 && errno == EWOULDBLOCK ) {
- BIO_set_retry_read( b );
+ if ( ret < 0 ) {
+ int err = errno;
+ if ( err == EAGAIN || err == EWOULDBLOCK ) {
+ BIO_set_retry_read( b );
+ }
}
return ret;
ret = LBER_SBIOD_WRITE_NEXT( p->sbiod, (char *)buf, len );
BIO_clear_retry_flags( b );
- if ( ret < 0 && errno == EWOULDBLOCK ) {
- BIO_set_retry_write( b );
+ if ( ret < 0 ) {
+ int err = errno;
+ if ( err == EAGAIN || err == EWOULDBLOCK ) {
+ BIO_set_retry_write( b );
+ }
}
return ret;
if ((err = ERR_peek_error())) {
char buf[256];
+
+ if (ld->ld_error ) {
+ LDAP_FREE( ld->ld_error );
+ }
ld->ld_error = LDAP_STRDUP(ERR_error_string(err, buf));
+#ifdef HAVE_EBCDIC
+ if ( ld->ld_error ) __etoa(ld->ld_error);
+#endif
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_int_tls_connect: "
- "TLS can't connect.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "ldap_int_tls_connect: TLS can't connect.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't connect.\n",0,0,0);
#endif
if ( update_flags( sb, ssl, err )) return 1;
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_accept: "
- "TLS can't accept.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "ldap_pvt_tls_accept: TLS can't accept.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,"TLS: can't accept.\n",0,0,0 );
#endif
return HAS_TLS( sb ) ? 1 : 0;
}
-void *
-ldap_pvt_tls_sb_ctx( Sockbuf *sb )
-{
- void *p;
-
- if (HAS_TLS( sb )) {
- ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&p );
- return p;
- }
-
- return NULL;
-}
-
-int
-ldap_pvt_tls_get_strength( void *s )
-{
- SSL_CIPHER *c;
-
- c = SSL_get_current_cipher((SSL *)s);
- return SSL_CIPHER_get_bits(c, NULL);
-}
-
-
-int
-ldap_pvt_tls_get_my_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func, unsigned flags )
-{
- X509 *x;
- X509_NAME *xn;
- int rc;
-
- x = SSL_get_certificate((SSL *)s);
-
- if (!x) return LDAP_INVALID_CREDENTIALS;
-
- xn = X509_get_subject_name(x);
- rc = ldap_X509dn2bv(xn, dn, (LDAPDN_rewrite_func *)func, flags );
- X509_free(x);
- return rc;
-}
-
static X509 *
tls_get_cert( SSL *s )
{
}
int
-ldap_pvt_tls_get_peer_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func, unsigned flags )
+ldap_pvt_tls_get_peer_dn( void *s, struct berval *dn,
+ LDAPDN_rewrite_dummy *func, unsigned flags )
{
X509 *x;
X509_NAME *xn;
return p;
}
+/* what kind of hostname were we given? */
+#define IS_DNS 0
+#define IS_IP4 1
+#define IS_IP6 2
+
int
-ldap_pvt_tls_check_hostname( void *s, const char *name_in )
+ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
{
int i, ret = LDAP_LOCAL_ERROR;
X509 *x;
const char *name;
+ char *ptr;
+ int ntype = IS_DNS;
+#ifdef LDAP_PF_INET6
+ struct in6_addr addr;
+#else
+ struct in_addr addr;
+#endif
if( ldap_int_hostname &&
( !name_in || !strcasecmp( name_in, "localhost" ) ) )
x = tls_get_cert((SSL *)s);
if (!x) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
- "TLS unable to get peer certificate.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "ldap_pvt_tls_check_hostname: "
+ "TLS unable to get peer certificate.\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: unable to get peer certificate.\n",
return LDAP_SUCCESS;
}
+#ifdef LDAP_PF_INET6
+ if (name[0] == '[' && strchr(name, ']')) {
+ char *n2 = ldap_strdup(name+1);
+ *strchr(n2, ']') = 2;
+ if (inet_pton(AF_INET6, n2, &addr))
+ ntype = IS_IP6;
+ LDAP_FREE(n2);
+ } else
+#endif
+ if ((ptr = strrchr(name, '.')) && isdigit((unsigned char)ptr[1])) {
+ if (inet_aton(name, (struct in_addr *)&addr)) ntype = IS_IP4;
+ }
+
i = X509_get_ext_by_NID(x, NID_subject_alt_name, -1);
if (i >= 0) {
X509_EXTENSION *ex;
ex = X509_get_ext(x, i);
alt = X509V3_EXT_d2i(ex);
if (alt) {
- int n, len1, len2 = 0;
- char *domain;
+ int n, len1 = 0, len2 = 0;
+ char *domain = NULL;
GENERAL_NAME *gn;
- X509V3_EXT_METHOD *method;
- len1 = strlen(name);
- n = sk_GENERAL_NAME_num(alt);
- domain = strchr(name, '.');
- if (domain) {
- len2 = len1 - (domain-name);
+ if (ntype == IS_DNS) {
+ len1 = strlen(name);
+ domain = strchr(name, '.');
+ if (domain) {
+ len2 = len1 - (domain-name);
+ }
}
+ n = sk_GENERAL_NAME_num(alt);
for (i=0; i<n; i++) {
+ char *sn;
+ int sl;
gn = sk_GENERAL_NAME_value(alt, i);
if (gn->type == GEN_DNS) {
- char *sn = ASN1_STRING_data(gn->d.ia5);
- int sl = ASN1_STRING_length(gn->d.ia5);
+ if (ntype != IS_DNS) continue;
+
+ sn = (char *) ASN1_STRING_data(gn->d.ia5);
+ sl = ASN1_STRING_length(gn->d.ia5);
+
+ /* ignore empty */
+ if (sl == 0) continue;
/* Is this an exact match? */
if ((len1 == sl) && !strncasecmp(name, sn, len1)) {
}
/* Is this a wildcard match? */
- if ((*sn == '*') && domain && (len2 == sl-1) &&
- !strncasecmp(domain, sn+1, len2))
+ if (domain && (sn[0] == '*') && (sn[1] == '.') &&
+ (len2 == sl-1) && !strncasecmp(domain, &sn[1], len2))
{
break;
}
-#if 0
- /* Is this a RFC 2549 style wildcard match? */
- if ((*sn == '.') && domain && (len2 == sl) &&
- !strncasecmp(domain, sn, len2))
- {
+ } else if (gn->type == GEN_IPADD) {
+ if (ntype == IS_DNS) continue;
+
+ sn = (char *) ASN1_STRING_data(gn->d.ia5);
+ sl = ASN1_STRING_length(gn->d.ia5);
+
+#ifdef LDAP_PF_INET6
+ if (ntype == IS_IP6 && sl != sizeof(struct in6_addr)) {
+ continue;
+ } else
+#endif
+ if (ntype == IS_IP4 && sl != sizeof(struct in_addr)) {
+ continue;
+ }
+ if (!memcmp(sn, &addr, sl)) {
break;
}
-#endif
}
}
- method = X509V3_EXT_get(ex);
- method->ext_free(alt);
+ GENERAL_NAMES_free(alt);
if (i < n) { /* Found a match */
ret = LDAP_SUCCESS;
}
if (ret != LDAP_SUCCESS) {
X509_NAME *xn;
char buf[2048];
+ buf[0] = '\0';
xn = X509_get_subject_name(x);
-
if( X509_NAME_get_text_by_NID( xn, NID_commonName,
buf, sizeof(buf)) == -1)
{
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
- "TLS unable to get common name from peer certificate.\n" ));
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_check_hostname: "
+ "TLS unable to get common name from peer certificate.\n",
+ 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: unable to get common name from peer certificate.\n",
0, 0, 0 );
#endif
+ ret = LDAP_CONNECT_ERROR;
+ if (ld->ld_error ) {
+ LDAP_FREE( ld->ld_error );
+ }
+ ld->ld_error = LDAP_STRDUP(
+ _("TLS: unable to get CN from peer certificate"));
+
+ } else if (strcasecmp(name, buf) == 0 ) {
+ ret = LDAP_SUCCESS;
+
+ } else if (( buf[0] == '*' ) && ( buf[1] == '.' )) {
+ char *domain = strchr(name, '.');
+ if( domain ) {
+ size_t dlen = 0;
+ size_t sl;
+
+ sl = strlen(name);
+ dlen = sl - (domain-name);
+ sl = strlen(buf);
- } else if (strcasecmp(name, buf)) {
+ /* Is this a wildcard match? */
+ if ((dlen == sl-1) && !strncasecmp(domain, &buf[1], dlen)) {
+ ret = LDAP_SUCCESS;
+ }
+ }
+ }
+
+ if( ret == LDAP_LOCAL_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "ldap_pvt_tls_check_hostname: "
+ LDAP_LOG ( TRANSPORT, ERR, "ldap_pvt_tls_check_hostname: "
"TLS hostname (%s) does not match "
- "common name in certificate (%s).\n", name, buf ));
+ "common name in certificate (%s).\n", name, buf, 0 );
#else
Debug( LDAP_DEBUG_ANY, "TLS: hostname (%s) does not match "
"common name in certificate (%s).\n",
name, buf, 0 );
#endif
ret = LDAP_CONNECT_ERROR;
-
- } else {
- ret = LDAP_SUCCESS;
+ if (ld->ld_error ) {
+ LDAP_FREE( ld->ld_error );
+ }
+ ld->ld_error = LDAP_STRDUP(
+ _("TLS: hostname does not match CN in peer certificate"));
}
}
X509_free(x);
case LDAP_OPT_X_TLS_CERTFILE:
case LDAP_OPT_X_TLS_KEYFILE:
case LDAP_OPT_X_TLS_RANDOM_FILE:
+ case LDAP_OPT_X_TLS_CIPHER_SUITE:
return ldap_pvt_tls_set_option( ld, option, (void *) arg );
case LDAP_OPT_X_TLS_REQUIRE_CERT:
/*
* compare host with name(s) in certificate
*/
- ld->ld_errno = ldap_pvt_tls_check_hostname( ssl, host );
- if (ld->ld_errno != LDAP_SUCCESS) {
- return ld->ld_errno;
- }
-
- /*
- * set SASL properties to TLS ssf and authid
- */
- {
- struct berval authid = { 0, NULL };
- ber_len_t ssf;
-
- /* we need to let SASL know */
- ssf = ldap_pvt_tls_get_strength( ssl );
- /* failure is OK, we just can't use SASL EXTERNAL */
- (void) ldap_pvt_tls_get_my_dn( ssl, &authid, NULL, 0 );
-
- (void) ldap_int_sasl_external( ld, conn, authid.bv_val, ssf );
- LDAP_FREE( authid.bv_val );
+ if (tls_opt_require_cert != LDAP_OPT_X_TLS_NEVER) {
+ ld->ld_errno = ldap_pvt_tls_check_hostname( ld, ssl, host );
+ if (ld->ld_errno != LDAP_SUCCESS) {
+ return ld->ld_errno;
+ }
}
return LDAP_SUCCESS;
/* Derived from openssl/apps/s_cb.c */
static void
-tls_info_cb( SSL *ssl, int where, int ret )
+tls_info_cb( const SSL *ssl, int where, int ret )
{
int w;
char *op;
+ char *state = (char *) SSL_state_string_long( (SSL *)ssl );
w = where & ~SSL_ST_MASK;
if ( w & SSL_ST_CONNECT ) {
op = "undefined";
}
+#ifdef HAVE_EBCDIC
+ if ( state ) {
+ state = LDAP_STRDUP( state );
+ __etoa( state );
+ }
+#endif
if ( where & SSL_CB_LOOP ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1, "tls_info_cb: "
- "TLS trace: %s:%s\n", op, SSL_state_string_long( ssl ) ));
+ LDAP_LOG ( TRANSPORT, DETAIL1, "tls_info_cb: "
+ "TLS trace: %s:%s\n", op, state, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:%s\n",
- op, SSL_state_string_long( ssl ), 0 );
+ op, state, 0 );
#endif
} else if ( where & SSL_CB_ALERT ) {
+ char *atype = (char *) SSL_alert_type_string_long( ret );
+ char *adesc = (char *) SSL_alert_desc_string_long( ret );
op = ( where & SSL_CB_READ ) ? "read" : "write";
+#ifdef HAVE_EBCDIC
+ if ( atype ) {
+ atype = LDAP_STRDUP( atype );
+ __etoa( atype );
+ }
+ if ( adesc ) {
+ adesc = LDAP_STRDUP( adesc );
+ __etoa( adesc );
+ }
+#endif
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1, "tls_info_cb: "
- "TLS trace: SSL3 alert %s:%s:%s\n", op,
- SSL_alert_type_string_long( ret ),
- SSL_alert_desc_string_long( ret) ));
+ LDAP_LOG ( TRANSPORT, DETAIL1,
+ "tls_info_cb: TLS trace: SSL3 alert %s:%s:%s\n",
+ op, atype, adesc );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: SSL3 alert %s:%s:%s\n",
- op,
- SSL_alert_type_string_long( ret ),
- SSL_alert_desc_string_long( ret) );
+ op, atype, adesc );
+#endif
+#ifdef HAVE_EBCDIC
+ if ( atype ) LDAP_FREE( atype );
+ if ( adesc ) LDAP_FREE( adesc );
#endif
-
} else if ( where & SSL_CB_EXIT ) {
if ( ret == 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_info_cb: "
- "TLS trace: %s:failed in %s\n", op, SSL_state_string_long( ssl ) ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "tls_info_cb: TLS trace: %s:failed in %s\n",
+ op, state, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:failed in %s\n",
- op, SSL_state_string_long( ssl ), 0 );
+ op, state, 0 );
#endif
} else if ( ret < 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_info_cb: "
- "TLS trace: %s:error in %s\n", op, SSL_state_string_long( ssl ) ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "tls_info_cb: TLS trace: %s:error in %s\n",
+ op, state, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"TLS trace: %s:error in %s\n",
- op, SSL_state_string_long( ssl ), 0 );
+ op, state, 0 );
#endif
}
}
+#ifdef HAVE_EBCDIC
+ if ( state ) LDAP_FREE( state );
+#endif
}
static int
X509_NAME *issuer;
char *sname;
char *iname;
+ char *certerr = NULL;
cert = X509_STORE_CTX_get_current_cert( ctx );
errnum = X509_STORE_CTX_get_error( ctx );
/* X509_NAME_oneline, if passed a NULL buf, allocate memomry */
sname = X509_NAME_oneline( subject, NULL, 0 );
iname = X509_NAME_oneline( issuer, NULL, 0 );
+ if ( !ok ) certerr = (char *)X509_verify_cert_error_string( errnum );
+#ifdef HAVE_EBCDIC
+ if ( sname ) __etoa( sname );
+ if ( iname ) __etoa( iname );
+ if ( certerr ) {
+ certerr = LDAP_STRDUP( certerr );
+ __etoa( certerr );
+ }
+#endif
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "tls_verify_cb"
- "TLS certificate verification: depth: %d, err: %d: "
- "subject: %s, issuer: %s\n", errdepth, errnum,
- sname ? sname : "-unknown-", iname ? iname : "-unknown-" ));
+ LDAP_LOG( TRANSPORT, ERR,
+ "TLS certificate verification: depth: %d, err: %d, subject: %s,",
+ errdepth, errnum,
+ sname ? sname : "-unknown-" );
+ LDAP_LOG( TRANSPORT, ERR, " issuer: %s\n", iname ? iname : "-unknown-", 0, 0 );
if ( !ok ) {
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR, "TLS certificate verification: Error, %s\n",
- X509_verify_cert_error_string(errnum)));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "TLS certificate verification: Error, %s\n",
+ certerr, 0, 0 );
}
#else
Debug( LDAP_DEBUG_TRACE,
if ( !ok ) {
Debug( LDAP_DEBUG_ANY,
"TLS certificate verification: Error, %s\n",
- X509_verify_cert_error_string(errnum), 0, 0 );
+ certerr, 0, 0 );
}
#endif
if ( sname )
CRYPTO_free ( sname );
if ( iname )
CRYPTO_free ( iname );
-
+#ifdef HAVE_EBCDIC
+ if ( certerr ) LDAP_FREE( certerr );
+#endif
return ok;
}
int line;
while ( ( l = ERR_get_error_line( &file, &line ) ) != 0 ) {
+ ERR_error_string_n( l, buf, sizeof( buf ) );
+#ifdef HAVE_EBCDIC
+ if ( file ) {
+ file = LDAP_STRDUP( file );
+ __etoa( (char *)file );
+ }
+ __etoa( buf );
+#endif
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
+ LDAP_LOG ( TRANSPORT, ERR,
"tls_report_error: TLS %s %s:%d\n",
- ERR_error_string( l, buf ), file, line ));
+ buf, file, line );
#else
Debug( LDAP_DEBUG_ANY, "TLS: %s %s:%d\n",
- ERR_error_string( l, buf ), file, line );
+ buf, file, line );
+#endif
+#ifdef HAVE_EBCDIC
+ if ( file ) LDAP_FREE( (void *)file );
#endif
}
}
if ( !tmp_rsa ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_ERR,
- "tls_tmp_rsa_cb: TLS Failed to generate temporary %d-bit %s RSA key\n",
- key_length, is_export ? "export" : "domestic" ));
+ LDAP_LOG ( TRANSPORT, ERR,
+ "tls_tmp_rsa_cb: TLS Failed to generate temporary %d-bit %s "
+ "RSA key\n", key_length, is_export ? "export" : "domestic", 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: Failed to generate temporary %d-bit %s RSA key\n",
if (randfile == NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1,
+ LDAP_LOG ( TRANSPORT, DETAIL1,
"tls_seed_PRNG: TLS Use configuration file or "
- "$RANDFILE to define seed PRNG\n" ));
+ "$RANDFILE to define seed PRNG\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: Use configuration file or $RANDFILE to define seed PRNG\n",
if (RAND_status() == 0) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "tls", LDAP_LEVEL_DETAIL1,
- "tls_seed_PRNG: TLS PRNG not been seeded with enough data\n" ));
+ LDAP_LOG ( TRANSPORT, DETAIL1,
+ "tls_seed_PRNG: TLS PRNG not been seeded with enough data\n",
+ 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"TLS: PRNG not been seeded with enough data\n",
#endif
#endif
+void *
+ldap_pvt_tls_sb_ctx( Sockbuf *sb )
+{
+#ifdef HAVE_TLS
+ void *p;
+
+ if (HAS_TLS( sb )) {
+ ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&p );
+ return p;
+ }
+#endif
+
+ return NULL;
+}
+
+int
+ldap_pvt_tls_get_strength( void *s )
+{
+#ifdef HAVE_TLS
+ SSL_CIPHER *c;
+
+ c = SSL_get_current_cipher((SSL *)s);
+ return SSL_CIPHER_get_bits(c, NULL);
+#else
+ return 0;
+#endif
+}
+
+
+int
+ldap_pvt_tls_get_my_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func, unsigned flags )
+{
+#ifdef HAVE_TLS
+ X509 *x;
+ X509_NAME *xn;
+ int rc;
+
+ x = SSL_get_certificate((SSL *)s);
+
+ if (!x) return LDAP_INVALID_CREDENTIALS;
+
+ xn = X509_get_subject_name(x);
+ rc = ldap_X509dn2bv(xn, dn, (LDAPDN_rewrite_func *)func, flags );
+ return rc;
+#else
+ return LDAP_NOT_SUPPORTED;
+#endif
+}
+
int
ldap_start_tls_s ( LDAP *ld,
LDAPControl **serverctrls,
rc = ldap_extended_operation_s( ld, LDAP_EXOP_START_TLS,
NULL, serverctrls, clientctrls, &rspoid, &rspdata );
- if ( rc != LDAP_SUCCESS ) {
- return rc;
- }
if ( rspoid != NULL ) {
LDAP_FREE(rspoid);
ber_bvfree( rspdata );
}
- rc = ldap_int_tls_start( ld, ld->ld_defconn, NULL );
+ if ( rc == LDAP_SUCCESS ) {
+ rc = ldap_int_tls_start( ld, ld->ld_defconn, NULL );
+ }
+
#else
rc = LDAP_NOT_SUPPORTED;
#endif
projects / openldap / blobdiff