mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7430 GnuTLS: Avoid use of deprecated function

Browse Source
This commit is contained in:
Howard Chu 2013-09-07 09:39:24 -07:00
parent 3e100bb54d
commit 0205e83f46
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/libldap/tls_g.c
View File

@ -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; i<VERIFY_DEPTH; i++ ) {
if ( gnutls_certificate_get_issuer( ctx->cred, 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;