Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Rong-En Fan: fix compilation with gcc 4.2

Browse Source
This commit is contained in:
vanhu 2007-06-06 15:37:15 +00:00
parent cc41629a4c
commit 6ae0ffb7d9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/dist/ipsec-tools/src/racoon/eaytest.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: eaytest.c,v 1.7 2006/10/06 12:02:27 manu Exp $ */
/* $NetBSD: eaytest.c,v 1.8 2007/06/06 15:37:15 vanhu Exp $ */
/* Id: eaytest.c,v 1.22 2005/06/19 18:02:54 manubsd Exp */
@ -232,8 +232,8 @@ certtest(ac, av)
vchar_t *asn1dn = NULL, asn1dn0;
#ifdef ORIG_DN
char dnstr[] = "C=JP, ST=Kanagawa, L=Fujisawa, O=WIDE Project, OU=KAME Project, CN=Shoichi Sakane/Email=sakane@kame.net";
char *dnstr_w1 = 0;
char *dnstr_w2 = 0;
char *dnstr_w1 = NULL;
char *dnstr_w2 = NULL;
char dn0[] = {
0x30,0x81,0x9a,0x31,0x0b,0x30,0x09,0x06,
0x03,0x55,0x04,0x06,0x13,0x02,0x4a,0x50,
@ -313,7 +313,7 @@ certtest(ac, av)
printf("exact match: succeed.\n");
if (dnstr_w1) {
if (dnstr_w1 != NULL) {
asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1));
if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
errx(1, "asn1dn length wrong for wildcard 1\n");
@ -323,7 +323,7 @@ certtest(ac, av)
printf("wildcard 1 match: succeed.\n");
}
if (dnstr_w1) {
if (dnstr_w1 != NULL) {
asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2));
if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
errx(1, "asn1dn length wrong for wildcard 2\n");

8
crypto/dist/ipsec-tools/src/racoon/var.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.h,v 1.4 2006/09/09 16:22:10 manu Exp $ */
/* $NetBSD: var.h,v 1.5 2007/06/06 15:37:15 vanhu Exp $ */
/* Id: var.h,v 1.6 2004/11/20 16:16:59 monas Exp */
@ -78,9 +78,9 @@
do { \
if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \
NIFLAGS) != 0) { \
if (y) \
if (y != NULL) \
strncpy((y), "(invalid)", sizeof(y)); \
if (z) \
if (z != NULL) \
strncpy((z), "(invalid)", sizeof(z)); \
} \
} while (0);
@ -89,7 +89,7 @@ do { \
do { \
if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
NIFLAGS) != 0) { \
if (y) \
if (y != NULL) \
strncpy((y), "(invalid)", sizeof(y)); \
} \
} while (0);