mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7877 assume gnutls is at least 2.12.0

Browse Source
This commit is contained in:
Ryan Tandy 2014-06-30 11:38:05 -07:00 committed by Howard Chu
parent 0fd0f24f03
commit 7d2f9c6277
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/libldap/tls_g.c
View File

@ -272,7 +272,6 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
* then we have to build the cert chain. * then we have to build the cert chain.
*/ */
if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) { if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) {
#if GNUTLS_VERSION_NUMBER >= 0x020c00
unsigned int i; unsigned int i;
for ( i = 1; i<VERIFY_DEPTH; i++ ) { for ( i = 1; i<VERIFY_DEPTH; i++ ) {
if ( gnutls_certificate_get_issuer( ctx->cred, certs[i-1], &certs[i], 0 )) if ( gnutls_certificate_get_issuer( ctx->cred, certs[i-1], &certs[i], 0 ))
@ -282,27 +281,6 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
if ( gnutls_x509_crt_check_issuer( certs[i], certs[i] )) if ( gnutls_x509_crt_check_issuer( certs[i], certs[i] ))
break; break;
} }
#else
gnutls_x509_crt_t *cas;
unsigned int i, j, ncas;
gnutls_certificate_get_x509_cas( ctx->cred, &cas, &ncas );
for ( i = 1; i<VERIFY_DEPTH; i++ ) {
for ( j = 0; j<ncas; j++ ) {
if ( gnutls_x509_crt_check_issuer( certs[i-1], cas[j] )) {
certs[i] = cas[j];
max++;
/* If this CA is self-signed, we're done */
if ( gnutls_x509_crt_check_issuer( cas[j], cas[j] ))
j = ncas;
break;
}
}
/* only continue if we found a CA and it was not self-signed */
if ( j == ncas )
break;
}
#endif
} }
rc = gnutls_certificate_set_x509_key( ctx->cred, certs, max, key ); rc = gnutls_certificate_set_x509_key( ctx->cred, certs, max, key );
if ( rc ) return -1; if ( rc ) return -1;
@ -692,8 +670,6 @@ tlsg_session_strength( tls_session *session )
static int static int
tlsg_session_unique( tls_session *sess, struct berval *buf, int is_server) tlsg_session_unique( tls_session *sess, struct berval *buf, int is_server)
{ {
/* channel bindings added in 2.12.0 */
#if GNUTLS_VERSION_NUMBER >= 0x020c00
tlsg_session *s = (tlsg_session *)sess; tlsg_session *s = (tlsg_session *)sess;
gnutls_datum_t cb; gnutls_datum_t cb;
int rc; int rc;
@ -707,7 +683,6 @@ tlsg_session_unique( tls_session *sess, struct berval *buf, int is_server)
memcpy( buf->bv_val, cb.data, len ); memcpy( buf->bv_val, cb.data, len );
return len; return len;
} }
#endif
return 0; return 0;
} }