s3:libads/sasl: allow wrapped messages up to a size of 0xfffffff
authorStefan Metzmacher <metze@samba.org>
Fri, 22 Apr 2016 14:31:55 +0000 (16:31 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 29 Apr 2016 10:06:25 +0000 (12:06 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11872

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 795e796658e6da0149c9c00ece7cca4ccc457717)

source3/libads/sasl.c

index b8d4527a15f72caf8de0753f0597571e96674537..10f63e891817b51e65de883f6ffcbf6cca2dce26 100644 (file)
@@ -328,7 +328,7 @@ static ADS_STATUS ads_sasl_spnego_gensec_bind(ADS_STRUCT *ads,
                 * arcfour-hmac-md5.
                 */
                ads->ldap.in.min_wrapped = MIN(ads->ldap.out.sig_size, 0x2C);
-               ads->ldap.in.max_wrapped = max_wrapped;
+               ads->ldap.in.max_wrapped = ADS_SASL_WRAPPING_IN_MAX_WRAPPED;
                status = ads_setup_sasl_wrapping(ads, &ads_sasl_gensec_ops, auth_generic_state->gensec_security);
                if (!ADS_ERR_OK(status)) {
                        DEBUG(0, ("ads_setup_sasl_wrapping() failed: %s\n",
@@ -986,7 +986,7 @@ static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv
 
                ads->ldap.out.sig_size = max_msg_size - ads->ldap.out.max_unwrapped;
                ads->ldap.in.min_wrapped = 0x2C; /* taken from a capture with LDAP unbind */
-               ads->ldap.in.max_wrapped = max_msg_size;
+               ads->ldap.in.max_wrapped = ADS_SASL_WRAPPING_IN_MAX_WRAPPED;
                status = ads_setup_sasl_wrapping(ads, &ads_sasl_gssapi_ops, context_handle);
                if (!ADS_ERR_OK(status)) {
                        DEBUG(0, ("ads_setup_sasl_wrapping() failed: %s\n",