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
This commit is contained in:
@@ -96,14 +96,6 @@ elem_set(struct gss_msg_order *o, unsigned int slot, OM_uint32 val)
|
|||||||
o->elem[slot % o->jitter_window] = 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
|
static void
|
||||||
elem_insert(struct gss_msg_order *o,
|
elem_insert(struct gss_msg_order *o,
|
||||||
unsigned int after_slot,
|
unsigned int after_slot,
|
||||||
@@ -121,16 +113,6 @@ elem_insert(struct gss_msg_order *o,
|
|||||||
o->length++;
|
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 1: expected sequence number */
|
||||||
/* rule 2: > expected sequence number */
|
/* rule 2: > expected sequence number */
|
||||||
/* rule 3: seqnum < seqnum(first) */
|
/* 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);
|
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;
|
return GSS_S_DUPLICATE_TOKEN;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < o->length - 1; i++) {
|
for (i = 0; i < o->length - 1; i++) {
|
||||||
if (o->elem[i] == seq_num)
|
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;
|
return GSS_S_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OM_uint32
|
||||||
|
gssapi_msg_order_f(OM_uint32 flags)
|
||||||
|
{
|
||||||
|
return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG);
|
||||||
|
}
|
||||||
|
@@ -96,14 +96,6 @@ elem_set(struct gss_msg_order *o, unsigned int slot, OM_uint32 val)
|
|||||||
o->elem[slot % o->jitter_window] = 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
|
static void
|
||||||
elem_insert(struct gss_msg_order *o,
|
elem_insert(struct gss_msg_order *o,
|
||||||
unsigned int after_slot,
|
unsigned int after_slot,
|
||||||
@@ -121,16 +113,6 @@ elem_insert(struct gss_msg_order *o,
|
|||||||
o->length++;
|
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 1: expected sequence number */
|
||||||
/* rule 2: > expected sequence number */
|
/* rule 2: > expected sequence number */
|
||||||
/* rule 3: seqnum < seqnum(first) */
|
/* 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);
|
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;
|
return GSS_S_DUPLICATE_TOKEN;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < o->length - 1; i++) {
|
for (i = 0; i < o->length - 1; i++) {
|
||||||
if (o->elem[i] == seq_num)
|
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;
|
return GSS_S_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OM_uint32
|
||||||
|
gssapi_msg_order_f(OM_uint32 flags)
|
||||||
|
{
|
||||||
|
return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG);
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user