aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on 32bit

Browse Source
remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent ed3fee2bac
commit daf3078279
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
src/detect-bytetest.c
Unescape Escape View File

@ -657,11 +657,11 @@ int DetectBytetestTestParse13(void) {
int DetectBytetestTestParse14(void) { int DetectBytetestTestParse14(void) {
int result = 0; int result = 0;
DetectBytetestData *data = NULL; DetectBytetestData *data = NULL;
data = DetectBytetestParse("23,=,0xffffffffffffffff,0,string,oct"); data = DetectBytetestParse("23,=,0xffffffffffffffffULL,0,string,oct");
if (data != NULL) { if (data != NULL) {
if ( (data->op == DETECT_BYTETEST_OP_EQ) if ( (data->op == DETECT_BYTETEST_OP_EQ)
&& (data->nbytes == 23) && (data->nbytes == 23)
&& (data->value == 0xffffffffffffffff) && (data->value == 0xffffffffffffffffULL)
&& (data->offset == 0) && (data->offset == 0)
&& (data->flags == DETECT_BYTETEST_STRING) && (data->flags == DETECT_BYTETEST_STRING)
&& (data->base == DETECT_BYTETEST_BASE_OCT)) && (data->base == DETECT_BYTETEST_BASE_OCT))
@ -680,7 +680,7 @@ int DetectBytetestTestParse14(void) {
int DetectBytetestTestParse15(void) { int DetectBytetestTestParse15(void) {
int result = 0; int result = 0;
DetectBytetestData *data = NULL; DetectBytetestData *data = NULL;
data = DetectBytetestParse("24, =, 0xffffffffffffffff, 0, string"); data = DetectBytetestParse("24, =, 0xffffffffffffffffULL, 0, string");
if (data == NULL) { if (data == NULL) {
result = 1; result = 1;
} }
@ -694,7 +694,7 @@ int DetectBytetestTestParse15(void) {
int DetectBytetestTestParse16(void) { int DetectBytetestTestParse16(void) {
int result = 0; int result = 0;
DetectBytetestData *data = NULL; DetectBytetestData *data = NULL;
data = DetectBytetestParse("4,=,0,0xffffffffffffffff"); data = DetectBytetestParse("4,=,0,0xffffffffffffffffULL");
if (data == NULL) { if (data == NULL) {
result = 1; result = 1;
} }

12
src/util-byte.c
Unescape Escape View File

@ -390,8 +390,8 @@ static int ByteTest04 (void) {
} }
static int ByteTest05 (void) { static int ByteTest05 (void) {
uint64_t val = 0x0102030405060708; uint64_t val = 0x0102030405060708ULL;
uint64_t i64 = 0xbfbfbfbfbfbfbfbf; uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL;
uint8_t bytes[8] = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; uint8_t bytes[8] = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 };
int ret = ByteExtractUint64(&i64, BYTE_LITTLE_ENDIAN, sizeof(bytes), bytes); int ret = ByteExtractUint64(&i64, BYTE_LITTLE_ENDIAN, sizeof(bytes), bytes);
@ -403,8 +403,8 @@ static int ByteTest05 (void) {
} }
static int ByteTest06 (void) { static int ByteTest06 (void) {
uint64_t val = 0x0102030405060708; uint64_t val = 0x0102030405060708ULL;
uint64_t i64 = 0xbfbfbfbfbfbfbfbf; uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL;
uint8_t bytes[8] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; uint8_t bytes[8] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
int ret = ByteExtractUint64(&i64, BYTE_BIG_ENDIAN, sizeof(bytes), bytes); int ret = ByteExtractUint64(&i64, BYTE_BIG_ENDIAN, sizeof(bytes), bytes);
@ -418,7 +418,7 @@ static int ByteTest06 (void) {
static int ByteTest07 (void) { static int ByteTest07 (void) {
const char *str = "1234567890"; const char *str = "1234567890";
uint64_t val = 1234567890; uint64_t val = 1234567890;
uint64_t i64 = 0xbfbfbfbfbfbfbfbf; uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL;
int ret = ByteExtractStringUint64(&i64, 10, strlen(str), str); int ret = ByteExtractStringUint64(&i64, 10, strlen(str), str);
if ((ret == 10) && (i64 == val)) { if ((ret == 10) && (i64 == val)) {
@ -470,7 +470,7 @@ static int ByteTest10 (void) {
static int ByteTest11 (void) { static int ByteTest11 (void) {
const char *str = "-1234567890"; const char *str = "-1234567890";
int64_t val = -1234567890; int64_t val = -1234567890;
int64_t i64 = 0xbfbfbfbfbfbfbfbf; int64_t i64 = 0xbfbfbfbfbfbfbfbfULL;
int ret = ByteExtractStringInt64(&i64, 10, strlen(str), str); int ret = ByteExtractStringInt64(&i64, 10, strlen(str), str);
if ((ret == 11) && (i64 == val)) { if ((ret == 11) && (i64 == val)) {

Write Preview
Loading…
Cancel
Save