From 6a38642fc0ea99426005d0a599edd5d3fdc3c409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 16 Sep 2003 12:12:42 +0000 Subject: [PATCH] (*): set minor_status (gss_wrap): set conf_state to conf_req_flags on success From: Luke Howard git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12835 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/arcfour.c | 12 ++++++++++++ lib/gssapi/krb5/arcfour.c | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/gssapi/arcfour.c b/lib/gssapi/arcfour.c index e68ec1bb3..76a01a77e 100644 --- a/lib/gssapi/arcfour.c +++ b/lib/gssapi/arcfour.c @@ -218,6 +218,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status, memset(k6_data, 0, sizeof(k6_data)); } + *minor_status = 0; return GSS_S_COMPLETE; } @@ -238,6 +239,9 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, u_char *p; int cmp; + if (qop_state) + *qop_state = 0; + p = token_buffer->value; omret = gssapi_krb5_verify_header (&p, token_buffer->length, @@ -306,6 +310,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, if (omret) return omret; + *minor_status = 0; return GSS_S_COMPLETE; } @@ -326,6 +331,9 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status, krb5_error_code ret; int32_t seq_number; + if (conf_state) + *conf_state = 0; + datalen = input_message_buffer->length + 1 /* padding */; len = datalen + 30; gssapi_krb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM); @@ -443,6 +451,9 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status, memset(k6_data, 0, sizeof(k6_data)); } + if (conf_state) + *conf_state = conf_req_flag; + *minor_status = 0; return GSS_S_COMPLETE; } @@ -610,5 +621,6 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, if (conf_state) *conf_state = conf_flag; + *minor_status = 0; return GSS_S_COMPLETE; } diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c index e68ec1bb3..76a01a77e 100644 --- a/lib/gssapi/krb5/arcfour.c +++ b/lib/gssapi/krb5/arcfour.c @@ -218,6 +218,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status, memset(k6_data, 0, sizeof(k6_data)); } + *minor_status = 0; return GSS_S_COMPLETE; } @@ -238,6 +239,9 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, u_char *p; int cmp; + if (qop_state) + *qop_state = 0; + p = token_buffer->value; omret = gssapi_krb5_verify_header (&p, token_buffer->length, @@ -306,6 +310,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, if (omret) return omret; + *minor_status = 0; return GSS_S_COMPLETE; } @@ -326,6 +331,9 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status, krb5_error_code ret; int32_t seq_number; + if (conf_state) + *conf_state = 0; + datalen = input_message_buffer->length + 1 /* padding */; len = datalen + 30; gssapi_krb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM); @@ -443,6 +451,9 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status, memset(k6_data, 0, sizeof(k6_data)); } + if (conf_state) + *conf_state = conf_req_flag; + *minor_status = 0; return GSS_S_COMPLETE; } @@ -610,5 +621,6 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, if (conf_state) *conf_state = conf_flag; + *minor_status = 0; return GSS_S_COMPLETE; }