diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-06-18 21:07:58 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-06-23 22:12:07 +0200 |
| commit | 7b916b5f9a3db5b268639d2d68cfa85e20a83266 (patch) | |
| tree | 9c7244a245d20b42db08af1c0ca08d86ecede49d /source4/auth | |
| parent | ac5283f7888d3b0bbc4d3a53102cc47d32366d06 (diff) | |
| download | samba-7b916b5f9a3db5b268639d2d68cfa85e20a83266.tar.gz | |
s4:gensec/gssapi: make calculation of gensec_gssapi_sig_size() for aes keys more clear
This way the result matches what gss_wrap_iov_length() would return.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index fd0f2a1986d..b3a469770d6 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -1470,11 +1470,10 @@ static size_t gensec_gssapi_sig_size(struct gensec_security *gensec_security, si if (gensec_gssapi_state->lucid->protocol == 1) { if (gensec_gssapi_state->gss_got_flags & GSS_C_CONF_FLAG) { - /* - * TODO: windows uses 76 here, but we don't know - * gss_wrap works with aes keys yet - */ - gensec_gssapi_state->sig_size = 76; + gensec_gssapi_state->sig_size = 60; + if (gensec_gssapi_state->gss_got_flags & GSS_C_DCE_STYLE) { + gensec_gssapi_state->sig_size += 16; + } } else { gensec_gssapi_state->sig_size = 28; } |