Menu
▾
▴
[Ipsec-tools-commits] ipsec-tools/src/racoon cfparse.y,1.45,1.46 cftoken.l,1.37,1.38 crypto_openssl.c,1.43,1.44 getcertsbyname.c,1.2,1.3 grabmyaddr.c,1.23,1.24 ipsec_doi.c,1.32,1.33 isakmp.c,1.43,1.44 isakmp_inf.c,1.20,1.21 pfkey.c,1.33,1.34 plainrsa-gen.c,1.5,1.6 racoonctl.c,1.3,1.4 sockmisc.c,1.17,1.18 sockmisc.h,1.5,1.6
|
From: Aidas K. <mo...@us...> - 2005-04-21 09:08:51
|
Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3388/src/racoon Modified Files: cfparse.y cftoken.l crypto_openssl.c getcertsbyname.c grabmyaddr.c ipsec_doi.c isakmp.c isakmp_inf.c pfkey.c plainrsa-gen.c racoonctl.c sockmisc.c sockmisc.h Log Message: made compile with gcc-4.0 Index: getcertsbyname.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/getcertsbyname.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- getcertsbyname.c 12 Jan 2004 21:38:10 -0000 1.2 +++ getcertsbyname.c 21 Apr 2005 09:08:39 -0000 1.3 @@ -58,12 +58,13 @@ /* XXX should it use ci_errno to hold errno instead of h_errno ? */ extern int h_errno; -static struct certinfo *getnewci __P((int, int, int, int, int, char *)); +static struct certinfo *getnewci __P((int, int, int, int, int, + unsigned char *)); static struct certinfo * getnewci(qtype, keytag, algorithm, flags, certlen, cert) int qtype, keytag, algorithm, flags, certlen; - char *cert; + unsigned char *cert; { struct certinfo *res; @@ -199,11 +200,11 @@ char *name; struct certinfo **res; { - caddr_t answer = NULL, p; + unsigned char *answer = NULL, *p; int buflen, anslen, len; HEADER *hp; int qdcount, ancount, rdlength; - char *cp, *eom; + unsigned char *cp, *eom; char hostbuf[1024]; /* XXX */ int qtype, qclass, keytag, algorithm; struct certinfo head, *cur; @@ -255,7 +256,7 @@ h_errno = NO_RECOVERY; goto end; } - cp = (char *)(hp + 1); + cp = (unsigned char *)(hp + 1); len = dn_expand(answer, eom, cp, hostbuf, sizeof(hostbuf)); if (len < 0) { #ifdef DNSSEC_DEBUG Index: racoonctl.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/racoonctl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- racoonctl.c 7 Mar 2005 00:30:39 -0000 1.3 +++ racoonctl.c 21 Apr 2005 09:08:40 -0000 1.4 @@ -81,7 +81,7 @@ #include "ipsec_doi.h" #include "evt.h" -static char *adminsock_path = ADMINSOCK_PATH; +char *adminsock_path = ADMINSOCK_PATH; static void usage __P((void)); static vchar_t *get_combuf __P((int, char **)); Index: ipsec_doi.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/ipsec_doi.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- ipsec_doi.c 18 Apr 2005 10:12:54 -0000 1.32 +++ ipsec_doi.c 21 Apr 2005 09:08:39 -0000 1.33 @@ -3605,7 +3605,7 @@ if (loglevel >= LLV_DEBUG) { X509_NAME *xn; BIO *bio; - unsigned char *ptr = new->v, *buf; + unsigned char *ptr = (unsigned char *) new->v, *buf; size_t len; char save; @@ -3759,7 +3759,8 @@ /* set prefix */ if (len2) { - u_char *p = new->v + sizeof(struct ipsecdoi_id_b) + len1; + u_char *p = (unsigned char *) new->v + + sizeof(struct ipsecdoi_id_b) + len1; u_int bits = prefixlen; while (bits >= 8) { @@ -3869,7 +3870,7 @@ plen = 0; max = alen <<3; - p = buf->v + p = (unsigned char *) buf->v + sizeof(struct ipsecdoi_id_b) + alen; Index: isakmp.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- isakmp.c 18 Apr 2005 10:04:25 -0000 1.43 +++ isakmp.c 21 Apr 2005 09:08:39 -0000 1.44 @@ -191,8 +191,8 @@ } x; struct sockaddr_storage remote; struct sockaddr_storage local; - int remote_len = sizeof(remote); - int local_len = sizeof(local); + unsigned int remote_len = sizeof(remote); + unsigned int local_len = sizeof(local); int len = 0, extralen = 0; u_short port; vchar_t *buf = NULL, *tmpbuf = NULL; Index: crypto_openssl.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/crypto_openssl.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- crypto_openssl.c 18 Apr 2005 16:50:20 -0000 1.43 +++ crypto_openssl.c 21 Apr 2005 09:08:39 -0000 1.44 @@ -159,7 +159,7 @@ if (!X509_NAME_add_entry_by_txt(name, field, (value[0] == '*' && value[1] == 0) ? V_ASN1_PRINTABLESTRING : MBSTRING_ASC, - value, -1, -1, 0)) { + (unsigned char *) value, -1, -1, 0)) { plog(LLV_ERROR, LOCATION, NULL, "Invalid DN field: %s=%s\n", field, value); @@ -185,7 +185,7 @@ if (!X509_NAME_add_entry_by_txt(name, field, (value[0] == '*' && value[1] == 0) ? V_ASN1_PRINTABLESTRING : MBSTRING_ASC, - value, -1, -1, 0)) { + (unsigned char *) value, -1, -1, 0)) { plog(LLV_ERROR, LOCATION, NULL, "Invalid DN field: %s=%s\n", field, value); @@ -244,7 +244,7 @@ } binbuf = ret->v; - BN_bn2bin(bn, binbuf); + BN_bn2bin(bn, (unsigned char *) binbuf); out: BN_free(bn); @@ -594,7 +594,7 @@ int len; int error = -1; - bp = cert->v; + bp = (unsigned char *) cert->v; x509 = mem2x509(cert); if (x509 == NULL) @@ -606,7 +606,7 @@ if (!name) goto end; /* get the name */ - bp = name->v; + bp = (unsigned char *) name->v; len = i2d_X509_NAME(x509->cert_info->subject, &bp); error = 0; @@ -678,7 +678,7 @@ if (!*altname) goto end; - strlcpy(*altname, gen->d.ia5->data, len); + strlcpy(*altname, (char *) gen->d.ia5->data, len); *type = gen->type; error = 0; } @@ -795,7 +795,7 @@ { u_char *bp; - bp = cert->v; + bp = (unsigned char *) cert->v; x509 = d2i_X509(NULL, &bp, cert->l); } @@ -853,7 +853,7 @@ X509_free(x509); return NULL; } - bp = cert->v; + bp = (unsigned char *) cert->v; error = i2d_X509(x509, &bp); X509_free(x509); @@ -883,7 +883,7 @@ EVP_PKEY *evp; int res; - bp = cert->v; + bp = (unsigned char *) cert->v; x509 = d2i_X509(NULL, &bp, cert->l); if (x509 == NULL) { @@ -950,7 +950,7 @@ pkey = vmalloc(pkeylen); if (pkey == NULL) goto end; - bp = pkey->v; + bp = (unsigned char *) pkey->v; pkeylen = i2d_PrivateKey(evp, &bp); if (pkeylen == 0) goto end; @@ -1006,7 +1006,7 @@ pkey = vmalloc(pkeylen); if (pkey == NULL) goto end; - bp = pkey->v; + bp = (unsigned char *) pkey->v; pkeylen = i2d_PublicKey(evp, &bp); if (pkeylen == 0) goto end; @@ -1028,7 +1028,7 @@ vchar_t *src, *privkey; { EVP_PKEY *evp; - u_char *bp = privkey->v; + u_char *bp = (unsigned char *) privkey->v; vchar_t *sig = NULL; int len; int pad = RSA_PKCS1_PADDING; @@ -1066,7 +1066,8 @@ if (sig == NULL) return NULL; - len = RSA_private_encrypt(src->l, src->v, sig->v, rsa, pad); + len = RSA_private_encrypt(src->l, (unsigned char *) src->v, + (unsigned char *) sig->v, rsa, pad); if (len == 0 || len != sig->l) { vfree(sig); @@ -1093,7 +1094,8 @@ return -1; } - len = RSA_public_decrypt(sig->l, sig->v, xbuf->v, rsa, pad); + len = RSA_public_decrypt(sig->l, (unsigned char *) sig->v, + (unsigned char *) xbuf->v, rsa, pad); if (len == 0 || len != src->l) { plog(LLV_ERROR, LOCATION, NULL, "%s\n", eay_strerror()); vfree(xbuf); @@ -1157,7 +1159,8 @@ EVP_CIPHER_CTX_init(&ctx); - if (!EVP_CipherInit(&ctx, e, key->v, iv->v, enc)) { + if (!EVP_CipherInit(&ctx, e, (u_char *) key->v, + (u_char *) iv->v, enc)) { OpenSSL_BUG(); vfree(res); return NULL; @@ -1166,7 +1169,7 @@ /* disable openssl padding */ EVP_CIPHER_CTX_set_padding(&ctx, 0); - if (!EVP_Cipher(&ctx, res->v, data->v, data->l)) { + if (!EVP_Cipher(&ctx, (u_char *) res->v, (u_char *) data->v, data->l)) { OpenSSL_BUG(); vfree(res); return NULL; @@ -1663,7 +1666,7 @@ caddr_t c; vchar_t *data; { - HMAC_Update((HMAC_CTX *)c, data->v, data->l); + HMAC_Update((HMAC_CTX *)c, (unsigned char *) data->v, data->l); } vchar_t * @@ -1676,7 +1679,7 @@ if ((res = vmalloc(SHA512_DIGEST_LENGTH)) == 0) return NULL; - HMAC_Final((HMAC_CTX *)c, res->v, &l); + HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); res->l = l; HMAC_cleanup((HMAC_CTX *)c); (void)racoon_free(c); @@ -1720,7 +1723,7 @@ caddr_t c; vchar_t *data; { - HMAC_Update((HMAC_CTX *)c, data->v, data->l); + HMAC_Update((HMAC_CTX *)c, (unsigned char *) data->v, data->l); } vchar_t * @@ -1733,7 +1736,7 @@ if ((res = vmalloc(SHA384_DIGEST_LENGTH)) == 0) return NULL; - HMAC_Final((HMAC_CTX *)c, res->v, &l); + HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); res->l = l; HMAC_cleanup((HMAC_CTX *)c); (void)racoon_free(c); @@ -1777,7 +1780,7 @@ caddr_t c; vchar_t *data; { - HMAC_Update((HMAC_CTX *)c, data->v, data->l); + HMAC_Update((HMAC_CTX *)c, (unsigned char *) data->v, data->l); } vchar_t * @@ -1790,7 +1793,7 @@ if ((res = vmalloc(SHA256_DIGEST_LENGTH)) == 0) return NULL; - HMAC_Final((HMAC_CTX *)c, res->v, &l); + HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); res->l = l; HMAC_cleanup((HMAC_CTX *)c); (void)racoon_free(c); @@ -1835,7 +1838,7 @@ caddr_t c; vchar_t *data; { - HMAC_Update((HMAC_CTX *)c, data->v, data->l); + HMAC_Update((HMAC_CTX *)c, (unsigned char *) data->v, data->l); } vchar_t * @@ -1848,7 +1851,7 @@ if ((res = vmalloc(SHA_DIGEST_LENGTH)) == 0) return NULL; - HMAC_Final((HMAC_CTX *)c, res->v, &l); + HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); res->l = l; HMAC_cleanup((HMAC_CTX *)c); (void)racoon_free(c); @@ -1892,7 +1895,7 @@ caddr_t c; vchar_t *data; { - HMAC_Update((HMAC_CTX *)c, data->v, data->l); + HMAC_Update((HMAC_CTX *)c, (unsigned char *) data->v, data->l); } vchar_t * @@ -1905,7 +1908,7 @@ if ((res = vmalloc(MD5_DIGEST_LENGTH)) == 0) return NULL; - HMAC_Final((HMAC_CTX *)c, res->v, &l); + HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); res->l = l; HMAC_cleanup((HMAC_CTX *)c); (void)racoon_free(c); @@ -1939,7 +1942,7 @@ caddr_t c; vchar_t *data; { - SHA512_Update((SHA512_CTX *)c, data->v, data->l); + SHA512_Update((SHA512_CTX *)c, (unsigned char *) data->v, data->l); return; } @@ -1953,7 +1956,7 @@ if ((res = vmalloc(SHA512_DIGEST_LENGTH)) == 0) return(0); - SHA512_Final(res->v, (SHA512_CTX *)c); + SHA512_Final((unsigned char *) res->v, (SHA512_CTX *)c); (void)racoon_free(c); return(res); @@ -1999,7 +2002,7 @@ caddr_t c; vchar_t *data; { - SHA384_Update((SHA384_CTX *)c, data->v, data->l); + SHA384_Update((SHA384_CTX *)c, (unsigned char *) data->v, data->l); return; } @@ -2013,7 +2016,7 @@ if ((res = vmalloc(SHA384_DIGEST_LENGTH)) == 0) return(0); - SHA384_Final(res->v, (SHA384_CTX *)c); + SHA384_Final((unsigned char *) res->v, (SHA384_CTX *)c); (void)racoon_free(c); return(res); @@ -2059,7 +2062,7 @@ caddr_t c; vchar_t *data; { - SHA256_Update((SHA256_CTX *)c, data->v, data->l); + SHA256_Update((SHA256_CTX *)c, (unsigned char *) data->v, data->l); return; } @@ -2073,7 +2076,7 @@ if ((res = vmalloc(SHA256_DIGEST_LENGTH)) == 0) return(0); - SHA256_Final(res->v, (SHA256_CTX *)c); + SHA256_Final((unsigned char *) res->v, (SHA256_CTX *)c); (void)racoon_free(c); return(res); @@ -2132,7 +2135,7 @@ if ((res = vmalloc(SHA_DIGEST_LENGTH)) == 0) return(0); - SHA1_Final(res->v, (SHA_CTX *)c); + SHA1_Final((unsigned char *) res->v, (SHA_CTX *)c); (void)racoon_free(c); return(res); @@ -2190,7 +2193,7 @@ if ((res = vmalloc(MD5_DIGEST_LENGTH)) == 0) return(0); - MD5_Final(res->v, (MD5_CTX *)c); + MD5_Final((unsigned char *) res->v, (MD5_CTX *)c); (void)racoon_free(c); return(res); @@ -2297,7 +2300,7 @@ BIGNUM *dh_pub = NULL; DH *dh = NULL; int l; - caddr_t v = NULL; + unsigned char *v = NULL; int error = -1; /* make public number to compute */ @@ -2321,7 +2324,7 @@ if (!BN_set_word(dh->g, g)) goto end; - if ((v = (caddr_t)racoon_calloc(prime->l, sizeof(u_char))) == NULL) + if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL) goto end; if ((l = DH_compute_key(v, dh_pub, dh)) == -1) goto end; @@ -2357,7 +2360,7 @@ BIGNUM **bn; vchar_t *var; { - if ((*bn = BN_bin2bn(var->v, var->l, NULL)) == NULL) + if ((*bn = BN_bin2bn((unsigned char *) var->v, var->l, NULL)) == NULL) return -1; return 0; @@ -2372,7 +2375,7 @@ if (*var == NULL) return(-1); - (*var)->l = BN_bn2bin(bn, (*var)->v); + (*var)->l = BN_bn2bin(bn, (unsigned char *) (*var)->v); return 0; } @@ -2462,8 +2465,9 @@ goto out; } - exp = BN_bin2bn(binbuf->v + 1, binbuf->v[0], NULL); - mod = BN_bin2bn(binbuf->v + binbuf->v[0] + 1, binbuf->l - binbuf->v[0] - 1, NULL); + exp = BN_bin2bn((unsigned char *) (binbuf->v + 1), binbuf->v[0], NULL); + mod = BN_bin2bn((unsigned char *) (binbuf->v + binbuf->v[0] + 1), + binbuf->l - binbuf->v[0] - 1, NULL); rsa_pub = RSA_new(); if (!exp || !mod || !rsa_pub) { @@ -2529,7 +2533,7 @@ return NULL; } - BN_bn2bin(in, binbuf->v); + BN_bn2bin(in, (unsigned char *) binbuf->v); rsa_pub = binbuf_pubkey2rsa(binbuf); Index: isakmp_inf.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_inf.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- isakmp_inf.c 17 Apr 2005 16:53:38 -0000 1.20 +++ isakmp_inf.c 21 Apr 2005 09:08:39 -0000 1.21 @@ -906,7 +906,7 @@ "invalid spi_size in notification payload.\n"); return -1; } - spi = val2str((u_char *)(n + 1), n->spi_size); + spi = val2str((char *)(n + 1), n->spi_size); plog(LLV_DEBUG, LOCATION, iph1->remote, "notification message %d:%s, " Index: plainrsa-gen.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/plainrsa-gen.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- plainrsa-gen.c 18 Feb 2005 10:16:50 -0000 1.5 +++ plainrsa-gen.c 21 Apr 2005 09:08:40 -0000 1.6 @@ -89,8 +89,8 @@ binlen = 1 + BN_num_bytes(key->e) + BN_num_bytes(key->n); binbuf = malloc(binlen); memset(binbuf, 0, binlen); - binbuf[0] = BN_bn2bin(key->e, &binbuf[1]); - ret = BN_bn2bin(key->n, &binbuf[binbuf[0] + 1]); + binbuf[0] = BN_bn2bin(key->e, (unsigned char *) &binbuf[1]); + ret = BN_bn2bin(key->n, (unsigned char *) (&binbuf[binbuf[0] + 1])); if (1 + binbuf[0] + ret != binlen) { plog(LLV_ERROR, LOCATION, NULL, "Pubkey generation failed. This is really strange...\n"); Index: pfkey.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/pfkey.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- pfkey.c 5 Apr 2005 13:20:16 -0000 1.33 +++ pfkey.c 21 Apr 2005 09:08:39 -0000 1.34 @@ -981,7 +981,7 @@ { struct saproto *pr; struct sockaddr *src = NULL, *dst = NULL; - int e_type, e_keylen, a_type, a_keylen, flags; + u_int e_type, e_keylen, a_type, a_keylen, flags; u_int satype, mode; u_int64_t lifebyte = 0; u_int wsize = 4; /* XXX static size of window */ @@ -1273,7 +1273,7 @@ { struct saproto *pr; struct sockaddr *src = NULL, *dst = NULL; - int e_type, e_keylen, a_type, a_keylen, flags; + u_int e_type, e_keylen, a_type, a_keylen, flags; u_int satype, mode; u_int64_t lifebyte = 0; u_int wsize = 4; /* XXX static size of window */ Index: sockmisc.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/sockmisc.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- sockmisc.c 20 Nov 2004 16:16:59 -0000 1.17 +++ sockmisc.c 21 Apr 2005 09:08:40 -0000 1.18 @@ -259,7 +259,7 @@ struct sockaddr *remote; { struct sockaddr *local; - int local_len = sizeof(struct sockaddr_storage); + u_int local_len = sizeof(struct sockaddr_storage); int s; /* for dummy connection */ /* allocate buffer */ @@ -312,12 +312,12 @@ size_t buflen; int flags; struct sockaddr *from; - int *fromlen; + u_int *fromlen; struct sockaddr *to; - int *tolen; + u_int *tolen; { int otolen; - int len; + u_int len; struct sockaddr_storage ss; struct msghdr m; struct cmsghdr *cm; @@ -458,7 +458,7 @@ struct sockaddr *dst; { struct sockaddr_storage ss; - int len; + u_int len; int i; if (src->sa_family != dst->sa_family) { Index: grabmyaddr.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/grabmyaddr.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- grabmyaddr.c 20 Nov 2004 15:53:27 -0000 1.23 +++ grabmyaddr.c 21 Apr 2005 09:08:39 -0000 1.24 @@ -840,7 +840,7 @@ #ifdef __linux__ { struct sockaddr_nl nl; - int addr_len; + u_int addr_len; memset(&nl, 0, sizeof(nl)); nl.nl_family = AF_NETLINK; Index: cfparse.y =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/cfparse.y,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- cfparse.y 18 Apr 2005 10:04:24 -0000 1.45 +++ cfparse.y 21 Apr 2005 09:08:39 -0000 1.46 @@ -1773,7 +1773,7 @@ struct secprotospec *s; int prop_no = 1; int trns_no = 1; - u_int32_t types[MAXALGCLASS]; + int32_t types[MAXALGCLASS]; p = prspec; if (p->next != 0) { Index: sockmisc.h =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/sockmisc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- sockmisc.h 12 Jul 2004 20:43:51 -0000 1.5 +++ sockmisc.h 21 Apr 2005 09:08:40 -0000 1.6 @@ -50,7 +50,7 @@ extern struct sockaddr *getlocaladdr __P((struct sockaddr *)); extern int recvfromto __P((int, void *, size_t, int, - struct sockaddr *, int *, struct sockaddr *, int *)); + struct sockaddr *, unsigned int *, struct sockaddr *, unsigned int *)); extern int sendfromto __P((int, const void *, size_t, struct sockaddr *, struct sockaddr *, int)); Index: cftoken.l =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/cftoken.l,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- cftoken.l 18 Apr 2005 10:04:25 -0000 1.37 +++ cftoken.l 21 Apr 2005 09:08:39 -0000 1.38 @@ -545,7 +545,7 @@ } {quotedstring} { - u_char *p = yytext; + char *p = yytext; YYD; while (*++p != '"') ; |