From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 12 Feb 2008 01:48:16 +0000 (+0000)
Subject: ITS#5341
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d49db4be9f2f9a1f9891db1ba2c59d492f4b65af;p=openldap

ITS#5341
---

diff --git a/CHANGES b/CHANGES
index 9288a59c69..86aa8f493a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.8 Engineering
 	Fixed libldap search timeout crash (ITS#5291)
 	Fixed libldap paged results crash (ITS#5315)
 	Fixed libldap use of %n (ITS#5324)
+	Fixed libldap cipher suite with GnuTLS (ITS#5341)
 	Fixed ldapdelete with sizelimit (ITS#5294)
 	Fixed ldapdelete with subentries control (ITS#5293)
 	Fixed slapd support for 2.1 CSN (ITS#5348)
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 93405ebe2d..a40601b784 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -307,6 +307,7 @@ tls_parse_ciphers( tls_ctx *ctx, char *suites )
 			/* unrecognized cipher suite */
 			return -1;
 		}
+		ptr += len + 1;
 	} while (end);
 
 	/* Space for all 3 lists */
@@ -348,6 +349,7 @@ tls_parse_ciphers( tls_ctx *ctx, char *suites )
 				break;
 			}
 		}
+		ptr += len + 1;
 	} while (end);
 	kx[nkx] = 0;
 	cipher[ncipher] = 0;