--- ipsec-tools-0.6.7/src/libipsec/policy_token.c.werror 2007-04-06 20:07:32 +1100 +++ ipsec-tools-0.6.7/src/libipsec/policy_token.c 2008-08-27 22:26:36 +1100 @@ -232,6 +232,7 @@ static int yy_n_chars; /* number of cha int yyleng; +int yy_temp; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -620,7 +621,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO (int) fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -969,7 +970,7 @@ YY_RULE_SETUP case 34: YY_RULE_SETUP #line 168 "policy_token.l" -ECHO; +yy_temp = ECHO; YY_BREAK #line 975 "policy_token.c" case YY_STATE_EOF(INITIAL): --- ipsec-tools-0.6.7/src/racoon/algorithm.c.werror 2005-06-29 09:38:02 +1100 +++ ipsec-tools-0.6.7/src/racoon/algorithm.c 2008-08-27 22:26:36 +1100 @@ -394,7 +394,7 @@ alg_oakley_hmacdef_one(doi, key, buf) #ifdef ENABLE_STATS gettimeofday(&end, NULL); - syslog(LOG_NOTICE, "%s(%s size=%d): %8.6f", __func__, + syslog(LOG_NOTICE, "%s(%s size=%zd): %8.6f", __func__, f->name, buf->l, timedelta(&start, &end)); #endif @@ -506,7 +506,7 @@ alg_oakley_encdef_decrypt(doi, buf, key, #ifdef ENABLE_STATS gettimeofday(&end, NULL); - syslog(LOG_NOTICE, "%s(%s klen=%d size=%d): %8.6f", __func__, + syslog(LOG_NOTICE, "%s(%s klen=%zd size=%zd): %8.6f", __func__, f->name, key->l << 3, buf->l, timedelta(&start, &end)); #endif return res; @@ -535,7 +535,7 @@ alg_oakley_encdef_encrypt(doi, buf, key, #ifdef ENABLE_STATS gettimeofday(&end, NULL); - syslog(LOG_NOTICE, "%s(%s klen=%d size=%d): %8.6f", __func__, + syslog(LOG_NOTICE, "%s(%s klen=%zd size=%zd): %8.6f", __func__, f->name, key->l << 3, buf->l, timedelta(&start, &end)); #endif return res; --- ipsec-tools-0.6.7/src/racoon/cftoken.c.werror 2007-04-06 20:07:33 +1100 +++ ipsec-tools-0.6.7/src/racoon/cftoken.c 2008-08-27 22:26:36 +1100 @@ -215,7 +215,7 @@ static int yy_n_chars; /* number of cha int yyleng; - +int yy_temp; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; static int yy_init = 1; /* whether we need to initialize */ @@ -1504,7 +1504,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO (int) fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -3137,7 +3137,7 @@ YY_RULE_SETUP case 260: YY_RULE_SETUP #line 582 "./cftoken.l" -ECHO; +yy_temp = ECHO; YY_BREAK #line 3143 "cftoken.c" --- ipsec-tools-0.6.7/src/racoon/missing/crypto/sha2/sha2.c.werror 2004-09-22 01:35:25 +1100 +++ ipsec-tools-0.6.7/src/racoon/missing/crypto/sha2/sha2.c 2008-08-27 22:26:36 +1100 @@ -50,8 +50,8 @@ #include #include -#define bcopy(a, b, c) memcpy((b), (a), (c)) -#define bzero(a, b) memset((a), 0, (b)) +/* #define bcopy(a, b, c) memcpy((b), (a), (c)) +#define bzero(a, b) memset((a), 0, (b)) */ #define panic(a) err(1, (a)) #if OPENSSL_VERSION_NUMBER >= 0x00907000L --- ipsec-tools-0.6.7/src/racoon/oakley.c.werror 2005-10-04 20:54:27 +1100 +++ ipsec-tools-0.6.7/src/racoon/oakley.c 2008-08-27 22:26:36 +1100 @@ -252,7 +252,7 @@ oakley_dh_compute(dh, pub, priv, pub_p, #ifdef ENABLE_STATS gettimeofday(&end, NULL); - syslog(LOG_NOTICE, "%s(%s%d): %8.6f", __func__, + syslog(LOG_NOTICE, "%s(%s%zd): %8.6f", __func__, s_attr_isakmp_group(dh->type), dh->prime->l << 3, timedelta(&start, &end)); #endif @@ -299,7 +299,7 @@ oakley_dh_generate(dh, pub, priv) #ifdef ENABLE_STATS gettimeofday(&end, NULL); - syslog(LOG_NOTICE, "%s(%s%d): %8.6f", __func__, + syslog(LOG_NOTICE, "%s(%s%zd): %8.6f", __func__, s_attr_isakmp_group(dh->type), dh->prime->l << 3, timedelta(&start, &end)); #endif --- ipsec-tools-0.6.7/src/racoon/prsa_tok.c.werror 2007-04-06 20:07:33 +1100 +++ ipsec-tools-0.6.7/src/racoon/prsa_tok.c 2008-08-27 22:26:36 +1100 @@ -233,6 +233,7 @@ static int yy_n_chars; /* number of cha int yyleng; +int yy_temp; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -729,7 +730,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO (int) fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1016,7 +1017,7 @@ YY_RULE_SETUP case 25: YY_RULE_SETUP #line 87 "./prsa_tok.l" -ECHO; +yy_temp = ECHO; YY_BREAK #line 1022 "prsa_tok.c" case YY_STATE_EOF(INITIAL): --- ipsec-tools-0.6.7/src/setkey/setkey.c.werror 2005-12-05 06:41:47 +1000 +++ ipsec-tools-0.6.7/src/setkey/setkey.c 2008-08-27 22:27:19 +1100 @@ -303,7 +303,7 @@ stdin_loop() { char line[1024], *semicolon, *comment; size_t linelen = 0; - + char *tmp; memset (line, 0, sizeof(line)); parse_init(); @@ -316,7 +316,7 @@ stdin_loop() #else char rbuf[1024]; rbuf[0] = '\0'; - fgets (rbuf, sizeof(rbuf), stdin); + tmp=fgets (rbuf, sizeof(rbuf), stdin); if (!rbuf[0]) break; if (rbuf[strlen(rbuf)-1] == '\n') --- ipsec-tools-0.6.7/src/setkey/token.c.werror 2007-04-06 20:07:33 +1100 +++ ipsec-tools-0.6.7/src/setkey/token.c 2008-08-27 22:26:36 +1100 @@ -214,6 +214,7 @@ static int yy_n_chars; /* number of cha int yyleng; +int yy_temp; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -1052,7 +1053,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO (int) fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1735,7 +1736,7 @@ YY_RULE_SETUP case 87: YY_RULE_SETUP #line 303 "token.l" -ECHO; +yy_temp = ECHO; YY_BREAK #line 1741 "token.c" case YY_STATE_EOF(INITIAL):