ITS#5341

diff --git a/CHANGES b/CHANGES
index 9288a59c6941ca7c97fe076d410a21c50066ae7d..86aa8f493aade020256c384b6809622610930167 100644 (file)
--- 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 93405ebe2d6e3fb5f734d89ae0bc1e9f1058842f..a40601b784128c3f2f9db48e3a52ad20bf0048ec 100644 (file)
--- 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;