Fixes for print-isakmp.c CVE: CAN-2004-0183, CAN-2004-0184
- http://www.rapid7.com/advisories/R7-0017.html
+ http://www.rapid7.com/advisories/R7-0017.html
IP-over-IEEE1394 printing.
some MINGW32 changes.
updates for autoconf 2.5
;;
osf*)
- #
+ #
# Presumed to be DEC OSF/1, Digital UNIX, or
# Tru64 UNIX.
#
# Or should we just look for "libcrypto.*"?
#
if test -d "$1/$tmplib" -a \( -f "$1/$tmplib/libcrypto.a" -o \
- -f "$1/$tmplib/libcrypto.so" -o \
- -f "$1/$tmplib/libcrypto.sl" -o \
- -f "$1/$tmplib/libcrypto.dylib" \); then
+ -f "$1/$tmplib/libcrypto.so" -o \
+ -f "$1/$tmplib/libcrypto.sl" -o \
+ -f "$1/$tmplib/libcrypto.dylib" \); then
ac_cv_ssleay_path="$1"
fi
*cp++ = hex[*nsap++ & 0xf];
if (((nsap_idx & 1) == 0) &&
(nsap_idx + 1 < nsap_length)) {
- *cp++ = '.';
+ *cp++ = '.';
}
}
*cp = '\0';
;;
osf*)
- #
+ #
# Presumed to be DEC OSF/1, Digital UNIX, or
# Tru64 UNIX.
#
#define E_SSID 0
#define E_RATES 1
-#define E_FH 2
+#define E_FH 2
#define E_DS 3
-#define E_CF 4
-#define E_TIM 5
+#define E_CF 4
+#define E_TIM 5
#define E_IBSS 6
/* reserved 7 */
/* reserved 8 */
"Reserved", /* 8 */
"Reserved", /* 9 */
"Cannot Support all requested capabilities in the Capability "
- "Information field", /* 10 */
+ "Information field", /* 10 */
"Reassociation denied due to inability to confirm that association "
"exists", /* 11 */
"Association denied due to reason outside the scope of the "
"sequence number out of expected sequence", /* 14 */
"Authentication rejected because of challenge failure", /* 15 */
"Authentication rejected due to timeout waiting for next frame in "
- "sequence", /* 16 */
+ "sequence", /* 16 */
"Association denied because AP is unable to handle additional"
- "associated stations", /* 17 */
+ "associated stations", /* 17 */
"Association denied due to requesting station not supporting all of "
"the data rates in BSSBasicRateSet parameter", /* 18 */
"Association denied due to requesting station not supporting "
#define ICMP6_MAXTYPE 201
#define ICMP6_DST_UNREACH_NOROUTE 0 /* no route to destination */
-#define ICMP6_DST_UNREACH_ADMIN 1 /* administratively prohibited */
+#define ICMP6_DST_UNREACH_ADMIN 1 /* administratively prohibited */
#define ICMP6_DST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor(obsolete) */
#define ICMP6_DST_UNREACH_BEYONDSCOPE 2 /* beyond scope of source address */
#define ICMP6_DST_UNREACH_ADDR 3 /* address unreachable */
#define ICMP6_TIME_EXCEED_TRANSIT 0 /* ttl==0 in transit */
#define ICMP6_TIME_EXCEED_REASSEMBLY 1 /* ttl==0 in reass */
-#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
+#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
#define ICMP6_PARAMPROB_NEXTHEADER 1 /* unrecognized next header */
#define ICMP6_PARAMPROB_OPTION 2 /* unrecognized option */
nd_uint8_t nd_opt_rdnss_len;
nd_uint16_t nd_opt_rdnss_reserved;
nd_uint32_t nd_opt_rdnss_lifetime;
- nd_ipv6 nd_opt_rdnss_addr[1]; /* variable-length */
+ nd_ipv6 nd_opt_rdnss_addr[1]; /* variable-length */
};
struct nd_opt_dnssl { /* DNSSL RFC 6106 5.2 */
ND_TCHECK_SIZE(dao);
if (length < ND_RPL_DAO_MIN_LEN)
- goto tooshort;
+ goto tooshort;
bp += ND_RPL_DAO_MIN_LEN;
length -= ND_RPL_DAO_MIN_LEN;
ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN);
if (length < ND_RPL_DAOACK_MIN_LEN)
- goto tooshort;
+ goto tooshort;
bp += ND_RPL_DAOACK_MIN_LEN;
length -= ND_RPL_DAOACK_MIN_LEN;
static const struct attrmap oakley_t_map[] = {
{ NULL, 0, { NULL } },
{ "enc", 8, { NULL, "1des", "idea", "blowfish", "rc5",
- "3des", "cast", "aes", }, },
+ "3des", "cast", "aes", }, },
{ "hash", 7, { NULL, "md5", "sha1", "tiger",
"sha2-256", "sha2-384", "sha2-512", }, },
{ "auth", 6, { NULL, "preshared", "dss", "rsa sig", "rsa enc",
break;
case LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION:
if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION_LENGTH){
- return hexdump;
+ return hexdump;
}
tval=EXTRACT_U_1(tptr + 4);
ND_PRINT("\n\t Pre-Priority CNPV Indicator");
}
tval=EXTRACT_U_1(tptr + 4);
ND_PRINT("\n\t Willing:%u, CBS:%u, RES:%u, Max TCs:%u",
- tval >> 7, (tval >> 6) & 0x02, (tval >> 3) & 0x07, tval & 0x07);
+ tval >> 7, (tval >> 6) & 0x02, (tval >> 3) & 0x07, tval & 0x07);
/*Print Priority Assignment Table*/
print_ets_priority_assignment_table(ndo, tptr + 5);
case LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION:
if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION_LENGTH) {
- return hexdump;
+ return hexdump;
}
ND_PRINT("\n\t RES: %u", EXTRACT_U_1(tptr + 4));
/*Print Priority Assignment Table */
}
tval=EXTRACT_U_1(tptr + 4);
ND_PRINT("\n\t Willing: %u, MBC: %u, RES: %u, PFC cap:%u ",
- tval >> 7, (tval >> 6) & 0x01, (tval >> 4) & 0x03, (tval & 0x0f));
+ tval >> 7, (tval >> 6) & 0x01, (tval >> 4) & 0x03, (tval & 0x0f));
ND_PRINT("\n\t PFC Enable");
tval=EXTRACT_U_1(tptr + 5);
ND_PRINT("\n\t Priority : 0 1 2 3 4 5 6 7");
}
ND_PRINT("\n\t RES: %u", EXTRACT_U_1(tptr + 4));
if(tlv_len<=LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY_MIN_LENGTH){
- return hexdump;
+ return hexdump;
}
/* Length of Application Priority Table */
sublen=tlv_len-5;
if(sublen%3!=0){
- return hexdump;
+ return hexdump;
}
i=0;
ND_PRINT("\n\t Application Priority Table");
while(i<sublen) {
- tval=EXTRACT_U_1(tptr + i + 5);
- ND_PRINT("\n\t Priority: %u, RES: %u, Sel: %u, Protocol ID: %u",
- tval >> 5, (tval >> 3) & 0x03, (tval & 0x07),
+ tval=EXTRACT_U_1(tptr + i + 5);
+ ND_PRINT("\n\t Priority: %u, RES: %u, Sel: %u, Protocol ID: %u",
+ tval >> 5, (tval >> 3) & 0x03, (tval & 0x07),
EXTRACT_BE_U_2(tptr + i + 5));
- i=i+3;
+ i=i+3;
}
break;
case LLDP_PRIVATE_8021_SUBTYPE_EVB:
if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_EVB_LENGTH){
- return hexdump;
+ return hexdump;
}
ND_PRINT("\n\t EVB Bridge Status");
tval=EXTRACT_U_1(tptr + 4);
ND_PRINT("\n\t RES: %u, BGID: %u, RRCAP: %u, RRCTR: %u",
- tval >> 3, (tval >> 2) & 0x01, (tval >> 1) & 0x01, tval & 0x01);
+ tval >> 3, (tval >> 2) & 0x01, (tval >> 1) & 0x01, tval & 0x01);
ND_PRINT("\n\t EVB Station Status");
tval=EXTRACT_U_1(tptr + 5);
ND_PRINT("\n\t RES: %u, SGID: %u, RRREQ: %u,RRSTAT: %u",
- tval >> 4, (tval >> 3) & 0x01, (tval >> 2) & 0x01, tval & 0x03);
+ tval >> 4, (tval >> 3) & 0x01, (tval >> 2) & 0x01, tval & 0x03);
tval=EXTRACT_U_1(tptr + 6);
ND_PRINT("\n\t R: %u, RTE: %u, ",tval >> 5, tval & 0x1f);
tval=EXTRACT_U_1(tptr + 7);
ND_PRINT("EVB Mode: %s [%u]",
- tok2str(lldp_evb_mode_values, "unknown", tval >> 6), tval >> 6);
+ tok2str(lldp_evb_mode_values, "unknown", tval >> 6), tval >> 6);
ND_PRINT("\n\t ROL: %u, RWD: %u, ", (tval >> 5) & 0x01, tval & 0x1f);
tval=EXTRACT_U_1(tptr + 8);
ND_PRINT("RES: %u, ROL: %u, RKA: %u", tval >> 6, (tval >> 5) & 0x01, tval & 0x1f);
case LLDP_PRIVATE_8021_SUBTYPE_CDCP:
if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CDCP_MIN_LENGTH){
- return hexdump;
+ return hexdump;
}
tval=EXTRACT_U_1(tptr + 4);
ND_PRINT("\n\t Role: %u, RES: %u, Scomp: %u ",
- tval >> 7, (tval >> 4) & 0x07, (tval >> 3) & 0x01);
+ tval >> 7, (tval >> 4) & 0x07, (tval >> 3) & 0x01);
ND_PRINT("ChnCap: %u", EXTRACT_BE_U_2(tptr + 6) & 0x0fff);
sublen=tlv_len-8;
if(sublen%3!=0) {
- return hexdump;
+ return hexdump;
}
i=0;
while(i<sublen) {
tval=EXTRACT_BE_U_3(tptr + i + 8);
- ND_PRINT("\n\t SCID: %u, SVID: %u",
- tval >> 12, tval & 0x000fff);
- i=i+3;
+ ND_PRINT("\n\t SCID: %u, SVID: %u",
+ tval >> 12, tval & 0x000fff);
+ i=i+3;
}
break;
ND_PRINT("\n\t\t Channel Status: %s (%u)",
tok2str(lmp_obj_channel_status_values,
- "Unknown",
+ "Unknown",
EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
offset+=8;
ND_TCHECK_4(bp->key_id);
ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
ND_TCHECK_LEN(bp->message_digest, 16);
- ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
- EXTRACT_BE_U_4(bp->message_digest),
- EXTRACT_BE_U_4(bp->message_digest + 4),
- EXTRACT_BE_U_4(bp->message_digest + 8),
- EXTRACT_BE_U_4(bp->message_digest + 12));
+ ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
+ EXTRACT_BE_U_4(bp->message_digest),
+ EXTRACT_BE_U_4(bp->message_digest + 4),
+ EXTRACT_BE_U_4(bp->message_digest + 8),
+ EXTRACT_BE_U_4(bp->message_digest + 12));
} else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) { /* Optional: key-id + 160-bit digest */
ND_TCHECK_4(bp->key_id);
ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
ND_TCHECK_LEN(bp->message_digest, 20);
ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
- EXTRACT_BE_U_4(bp->message_digest),
- EXTRACT_BE_U_4(bp->message_digest + 4),
- EXTRACT_BE_U_4(bp->message_digest + 8),
- EXTRACT_BE_U_4(bp->message_digest + 12),
- EXTRACT_BE_U_4(bp->message_digest + 16));
+ EXTRACT_BE_U_4(bp->message_digest),
+ EXTRACT_BE_U_4(bp->message_digest + 4),
+ EXTRACT_BE_U_4(bp->message_digest + 8),
+ EXTRACT_BE_U_4(bp->message_digest + 12),
+ EXTRACT_BE_U_4(bp->message_digest + 16));
} else if (length > NTP_TIMEMSG_MINLEN) {
ND_PRINT("\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN);
}
*/
void
ntp_print(netdissect_options *ndo,
- const u_char *cp, u_int length)
+ const u_char *cp, u_int length)
{
const union ntpdata *bp = (const union ntpdata *)cp;
u_int mode, version, leapind;
mode = (status & MODEMASK) >> MODESHIFT;
if (!ndo->ndo_vflag) {
ND_PRINT(", %s, length %u",
- tok2str(ntp_mode_values, "Unknown mode", mode),
- length);
+ tok2str(ntp_mode_values, "Unknown mode", mode),
+ length);
return;
}
ND_PRINT(", %s, length %u\n",
- tok2str(ntp_mode_values, "Unknown mode", mode), length);
+ tok2str(ntp_mode_values, "Unknown mode", mode), length);
/* leapind = (status & LEAPMASK) >> LEAPSHIFT; */
leapind = (status & LEAPMASK);
ND_PRINT("\tLeap indicator: %s (%u)",
- tok2str(ntp_leapind_values, "Unknown", leapind),
- leapind);
+ tok2str(ntp_leapind_values, "Unknown", leapind),
+ leapind);
switch (mode) {
static void
p_ntp_time(netdissect_options *ndo,
- const struct l_fixedpt *lfp)
+ const struct l_fixedpt *lfp)
{
uint32_t i;
uint32_t uf;
/* Prints time difference between *lfp and *olfp */
static void
p_ntp_delta(netdissect_options *ndo,
- const struct l_fixedpt *olfp,
- const struct l_fixedpt *lfp)
+ const struct l_fixedpt *olfp,
+ const struct l_fixedpt *lfp)
{
uint32_t u, uf;
uint32_t ou, ouf;
* header.
*/
if (length < sizeof(struct lsa6_hdr) || (const u_char *)lsap + length > dataend)
- return (1);
+ return (1);
lsa_length = length - sizeof(struct lsa6_hdr);
tptr = (const uint8_t *)lsap+sizeof(struct lsa6_hdr);
return (hdrlen + length);
}
if (ndo->ndo_eflag) {
- uint16_t tag = EXTRACT_BE_U_2(p);
+ uint16_t tag = EXTRACT_BE_U_2(p);
ND_PRINT("%s, ", ieee8021q_tci_string(tag));
}
return (hdrlen + length);
}
if (ndo->ndo_eflag) {
- uint16_t tag = EXTRACT_BE_U_2(p);
+ uint16_t tag = EXTRACT_BE_U_2(p);
ND_PRINT("%s, ", ieee8021q_tci_string(tag));
}
smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
if (nterrcodes) {
- nterror = EXTRACT_LE_U_4(buf + 5);
+ nterror = EXTRACT_LE_U_4(buf + 5);
if (nterror)
ND_PRINT("NTError = %s\n", nt_errstr(nterror));
} else {
* (see X.690:1997 clause 8.19 for the details)
*/
if (first < 0) {
- first = 0;
+ first = 0;
firstval = o / OIDMUX;
if (firstval > 2) firstval = 2;
o -= firstval * OIDMUX;
ip6addr_string(ndo, ip6->ip6_dst));
} else {
ND_PRINT("%s > %s:",
- ipaddr_string(ndo, ip->ip_src),
+ ipaddr_string(ndo, ip->ip_src),
ipaddr_string(ndo, ip->ip_dst));
}
nd_print_trunc(ndo);
{ nflog_if_print, DLT_NFLOG},
#endif
#ifdef DLT_CIP
- { cip_if_print, DLT_CIP },
+ { cip_if_print, DLT_CIP },
#endif
#ifdef DLT_ATM_CLIP
{ cip_if_print, DLT_ATM_CLIP },