aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/spnego
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2007-05-25 19:39:35 +0000
committerGuy Harris <guy@alum.mit.edu>2007-05-25 19:39:35 +0000
commit88f69b80c0b4a4c476d00c1207b99d26d84e8e6a (patch)
tree7a7704250e4683890454d704ebbcf9a29e1d56df /asn1/spnego
parent4e008159c8106611c06f4dcf2d023fdaaa29e8bf (diff)
Make SND_SEQ an array of 2 guint32's, rather than an array of 8
guint8's, to squelch some compiler warnings (and clean up some comparisons). svn path=/trunk/; revision=21941
Diffstat (limited to 'asn1/spnego')
-rw-r--r--asn1/spnego/packet-spnego-template.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 4a86547418..9d6c82b74d 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -434,7 +434,9 @@ decrypt_arcfour(packet_info *pinfo,
int ret;
gint32 seq_number;
size_t datalen;
- guint8 k6_data[16], SND_SEQ[8], Confounder[8];
+ guint8 k6_data[16];
+ guint32 SND_SEQ[2];
+ guint8 Confounder[8];
guint8 cksum_data[8];
int cmp;
int conf_flag;
@@ -472,14 +474,9 @@ decrypt_arcfour(packet_info *pinfo,
memset(k6_data, 0, sizeof(k6_data));
}
- seq_number=g_ntohl(*((guint32 *)SND_SEQ));
+ seq_number=g_ntohl(SND_SEQ[0]);
- cmp = memcmp(&SND_SEQ[4], "\xff\xff\xff\xff", 4);
- if(cmp){
- cmp = memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4);
- }
-
- if (cmp != 0) {
+ if (SND_SEQ[1] != 0xFFFFFFFF && SND_SEQ[1] != 0x00000000) {
return -6;
}