summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Esser2012-02-12 11:03:06 +0100
committerStefan Esser2012-02-12 11:03:06 +0100
commitbb630acdb0019e4bd2fdd0ade18cb77288d9422d (patch)
tree80b0b03b727a700a2555d4d222d5feeed4f0ff32
parentfbab5b88bc9edecb26ede9bc3bf94331af2e559e (diff)
Silence some more compiler warnings
-rw-r--r--execute.c2
-rw-r--r--session.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/execute.c b/execute.c
index bb092db..1ec38cd 100644
--- a/execute.c
+++ b/execute.c
@@ -1344,7 +1344,7 @@ static void suhosin_gen_entropy(php_uint32 *seedbuf TSRMLS_DC)
1344 1344
1345 suhosin_SHA256Init(&context); 1345 suhosin_SHA256Init(&context);
1346 suhosin_SHA256Update(&context, (void *) seedbuf, sizeof(php_uint32) * 8); 1346 suhosin_SHA256Update(&context, (void *) seedbuf, sizeof(php_uint32) * 8);
1347 suhosin_SHA256Final(seedbuf, &context); 1347 suhosin_SHA256Final((void *)seedbuf, &context);
1348} 1348}
1349/* }}} */ 1349/* }}} */
1350 1350
diff --git a/session.c b/session.c
index 4786afa..f045a36 100644
--- a/session.c
+++ b/session.c
@@ -426,7 +426,7 @@ char *suhosin_encrypt_string(char *str, int len, char *var, int vlen, char *key
426 } 426 }
427 427
428 /* store ip value */ 428 /* store ip value */
429 suhosin_get_ipv4(crypted+4 TSRMLS_CC); 429 suhosin_get_ipv4((char *)crypted+4 TSRMLS_CC);
430 430
431 /* store check value */ 431 /* store check value */
432 crypted[8] = check & 0xff; 432 crypted[8] = check & 0xff;
@@ -544,7 +544,7 @@ error_out:
544 if (check_ra > 4) { 544 if (check_ra > 4) {
545 check_ra = 4; 545 check_ra = 4;
546 } 546 }
547 suhosin_get_ipv4(&buf TSRMLS_CC); 547 suhosin_get_ipv4(&buf[0] TSRMLS_CC);
548 if (memcmp(buf, decrypted+4, check_ra) != 0) { 548 if (memcmp(buf, decrypted+4, check_ra) != 0) {
549 goto error_out; 549 goto error_out;
550 } 550 }