mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

recognize xauth vendor payload

Browse Source 
ok ho markus
This commit is contained in:
hshoexer 2006-08-24 12:13:16 +00:00
parent 7eadb65f7d
commit fd20a4a456
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/tcpdump/ike.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ike.h,v 1.18 2006/07/02 13:25:52 hshoexer Exp $ */
/* $OpenBSD: ike.h,v 1.19 2006/08/24 12:13:16 hshoexer Exp $ */
/*
* Copyright (c) 2001 Håkan Olsson. All rights reserved.
@ -417,10 +417,12 @@ static u_int16_t min_priv_payload_lengths[] = {
static const struct vendor_id
{
size_t len;
char vid[16];
char *name;
} vendor_ids[] = {
{
16,
{
0x44, 0x85, 0x15, 0x2d, 0x18, 0xb6, 0xbb, 0xcd,
0x0b, 0xe8, 0xa8, 0x46, 0x95, 0x79, 0xdd, 0xcc,
@ -428,6 +430,7 @@ static const struct vendor_id
"v1 NAT-T, draft-ietf-ipsec-nat-t-ike-00",
},
{
16,
{
0x90, 0xcb, 0x80, 0x91, 0x3e, 0xbb, 0x69, 0x6e,
0x08, 0x63, 0x81, 0xb5, 0xec, 0x42, 0x7b, 0x1f,
@ -435,6 +438,7 @@ static const struct vendor_id
"v2 NAT-T, draft-ietf-ipsec-nat-t-ike-02",
},
{
16,
{
0xcd, 0x60, 0x46, 0x43, 0x35, 0xdf, 0x21, 0xf8,
0x7c, 0xfd, 0xb2, 0xfc, 0x68, 0xb6, 0xa4, 0x48,
@ -442,6 +446,7 @@ static const struct vendor_id
"v2 NAT-T, draft-ietf-ipsec-nat-t-ike-02\\n",
},
{
16,
{
0x7d, 0x94, 0x19, 0xa6, 0x53, 0x10, 0xca, 0x6f,
0x2c, 0x17, 0x9d, 0x92, 0x15, 0x52, 0x9d, 0x56,
@ -449,6 +454,7 @@ static const struct vendor_id
"v3 NAT-T, draft-ietf-ipsec-nat-t-ike-03",
},
{
16,
{
0xaf, 0xca, 0xd7, 0x13, 0x68, 0xa1, 0xf1, 0xc9,
0x6b, 0x86, 0x96, 0xfc, 0x77, 0x57, 0x01, 0x00,
@ -457,6 +463,7 @@ static const struct vendor_id
"DPD v1.0"
},
{
16,
{
0x4a, 0x13, 0x1c, 0x81, 0x07, 0x03, 0x58, 0x45,
0x5c, 0x57, 0x28, 0xf2, 0x0e, 0x95, 0x45, 0x2f,
@ -464,10 +471,18 @@ static const struct vendor_id
"NAT-T, RFC 3947"
},
{
16,
{
0x6c, 0x0d, 0xcd, 0x48, 0x1d, 0xea, 0xe8, 0xae,
0x0b, 0x0a, 0x68, 0x38, 0x4b, 0x30, 0x72, 0xf9,
},
"OpenBSD-4.0"
},
{
8,
{
0x09, 0x00, 0x26, 0x89, 0xdf, 0xd6, 0xb7, 0x12
},
"draft-ietf-ipsra-isakmp-xauth-06.txt"
}
};

6
usr.sbin/tcpdump/print-ike.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: print-ike.c,v 1.28 2005/08/28 18:37:55 cloder Exp $ */
/* $OpenBSD: print-ike.c,v 1.29 2006/08/24 12:13:16 hshoexer Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@ -29,7 +29,7 @@
#ifndef lint
static const char rcsid[] =
"@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.28 2005/08/28 18:37:55 cloder Exp $ (XXX)";
"@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.29 2006/08/24 12:13:16 hshoexer Exp $ (XXX)";
#endif
#include <sys/param.h>
@ -708,7 +708,7 @@ ike_pl_vendor_print (u_int8_t *buf, int len, u_int8_t doi)
for (i = 0; i < sizeof vendor_ids / sizeof vendor_ids[0]; i ++)
if (memcmp(vp->vid, vendor_ids[i].vid,
sizeof vendor_ids[i].vid) == 0) {
vendor_ids[i].len) == 0) {
printf (" (supports %s)", vendor_ids[i].name);
return;
}