From 0205e83f4670d10ad3c6ae4b8fc5ec1d0c7020c0 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 7 Sep 2013 09:39:24 -0700 Subject: [PATCH] ITS#7430 GnuTLS: Avoid use of deprecated function Upstream-status: Backport --- libraries/libldap/tls_g.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c index 9acffaf..c793828 100644 --- a/libraries/libldap/tls_g.c +++ b/libraries/libldap/tls_g.c @@ -368,6 +368,17 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server ) * then we have to build the cert chain. */ if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) { +#if GNUTLS_VERSION_NUMBER >= 0x020c00 + unsigned int i; + for ( i = 1; icred, certs[i-1], &certs[i], 0 )) + break; + max++; + /* If this CA is self-signed, we're done */ + if ( gnutls_x509_crt_check_issuer( certs[i], certs[i] )) + break; + } +#else gnutls_x509_crt_t *cas; unsigned int i, j, ncas; @@ -387,6 +398,7 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server ) if ( j == ncas ) break; } +#endif } rc = gnutls_certificate_set_x509_key( ctx->cred, certs, max, key ); if ( rc ) return -1; -- 1.7.4.2