From d4114c6097a5c92c1d4a420c12f3e5b840b287c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 17 Jun 2003 04:05:13 +0000 Subject: [PATCH] remove unused function, indent, add gssapi_msg_order_f that filter gss flags to gss_msg_order flags git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12369 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/krb5/sequence.c | 27 ++++++++------------------- lib/gssapi/sequence.c | 27 ++++++++------------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/lib/gssapi/krb5/sequence.c b/lib/gssapi/krb5/sequence.c index e74fafe97..3b0d862c4 100644 --- a/lib/gssapi/krb5/sequence.c +++ b/lib/gssapi/krb5/sequence.c @@ -96,14 +96,6 @@ elem_set(struct gss_msg_order *o, unsigned int slot, OM_uint32 val) o->elem[slot % o->jitter_window] = val; } -#if 0 -static OM_uint32 -elem_get(struct gss_msg_order *o, unsigned int slot) -{ - return o->elem[slot % o->jitter_window]; -} -#endif - static void elem_insert(struct gss_msg_order *o, unsigned int after_slot, @@ -121,16 +113,6 @@ elem_insert(struct gss_msg_order *o, o->length++; } -#if 0 -static int -elem_samep(struct gss_msg_order *o, - unsigned int slot, - OM_uint32 value) -{ - return elem_get(o, slot) == value; -} -#endif - /* rule 1: expected sequence number */ /* rule 2: > expected sequence number */ /* rule 3: seqnum < seqnum(first) */ @@ -180,8 +162,9 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num) return(GSS_S_UNSEQ_TOKEN); } - if (seq_num == o->elem[o->length-1]) + if (seq_num == o->elem[o->length - 1]) { return GSS_S_DUPLICATE_TOKEN; + } for (i = 0; i < o->length - 1; i++) { if (o->elem[i] == seq_num) @@ -197,3 +180,9 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num) return GSS_S_FAILURE; } + +OM_uint32 +gssapi_msg_order_f(OM_uint32 flags) +{ + return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG); +} diff --git a/lib/gssapi/sequence.c b/lib/gssapi/sequence.c index e74fafe97..3b0d862c4 100644 --- a/lib/gssapi/sequence.c +++ b/lib/gssapi/sequence.c @@ -96,14 +96,6 @@ elem_set(struct gss_msg_order *o, unsigned int slot, OM_uint32 val) o->elem[slot % o->jitter_window] = val; } -#if 0 -static OM_uint32 -elem_get(struct gss_msg_order *o, unsigned int slot) -{ - return o->elem[slot % o->jitter_window]; -} -#endif - static void elem_insert(struct gss_msg_order *o, unsigned int after_slot, @@ -121,16 +113,6 @@ elem_insert(struct gss_msg_order *o, o->length++; } -#if 0 -static int -elem_samep(struct gss_msg_order *o, - unsigned int slot, - OM_uint32 value) -{ - return elem_get(o, slot) == value; -} -#endif - /* rule 1: expected sequence number */ /* rule 2: > expected sequence number */ /* rule 3: seqnum < seqnum(first) */ @@ -180,8 +162,9 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num) return(GSS_S_UNSEQ_TOKEN); } - if (seq_num == o->elem[o->length-1]) + if (seq_num == o->elem[o->length - 1]) { return GSS_S_DUPLICATE_TOKEN; + } for (i = 0; i < o->length - 1; i++) { if (o->elem[i] == seq_num) @@ -197,3 +180,9 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num) return GSS_S_FAILURE; } + +OM_uint32 +gssapi_msg_order_f(OM_uint32 flags) +{ + return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG); +}