mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 05:45:59 +03:00
Using uint64_t instead of u_int64_t
This commit is contained in:
parent
d15b57895b
commit
cf4deaa3a0
@ -56,7 +56,7 @@ std::string HtmlEntityDecode::evaluate(std::string value,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int HtmlEntityDecode::inplace(unsigned char *input, u_int64_t input_len) {
|
int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
|
||||||
unsigned char *d = input;
|
unsigned char *d = input;
|
||||||
int i, count;
|
int i, count;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ class HtmlEntityDecode : public Transformation {
|
|||||||
std::string evaluate(std::string exp,
|
std::string evaluate(std::string exp,
|
||||||
Transaction *transaction) override;
|
Transaction *transaction) override;
|
||||||
|
|
||||||
static int inplace(unsigned char *input, u_int64_t input_len);
|
static int inplace(unsigned char *input, uint64_t input_len);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ std::string JsDecode::evaluate(std::string value,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int JsDecode::inplace(unsigned char *input, u_int64_t input_len) {
|
int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
|
||||||
unsigned char *d = (unsigned char *)input;
|
unsigned char *d = (unsigned char *)input;
|
||||||
int64_t i, count;
|
int64_t i, count;
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class JsDecode : public Transformation {
|
|||||||
|
|
||||||
std::string evaluate(std::string exp,
|
std::string evaluate(std::string exp,
|
||||||
Transaction *transaction) override;
|
Transaction *transaction) override;
|
||||||
static int inplace(unsigned char *input, u_int64_t input_len);
|
static int inplace(unsigned char *input, uint64_t input_len);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace transformations
|
} // namespace transformations
|
||||||
|
@ -54,8 +54,8 @@ std::string ParityEven7bit::evaluate(std::string value,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ParityEven7bit::inplace(unsigned char *input, u_int64_t input_len) {
|
bool ParityEven7bit::inplace(unsigned char *input, uint64_t input_len) {
|
||||||
u_int64_t i;
|
uint64_t i;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < input_len) {
|
while (i < input_len) {
|
||||||
|
@ -33,7 +33,7 @@ class ParityEven7bit : public Transformation {
|
|||||||
explicit ParityEven7bit(std::string action) : Transformation(action) { }
|
explicit ParityEven7bit(std::string action) : Transformation(action) { }
|
||||||
|
|
||||||
std::string evaluate(std::string exp, Transaction *transaction) override;
|
std::string evaluate(std::string exp, Transaction *transaction) override;
|
||||||
static bool inplace(unsigned char *input, u_int64_t input_len);
|
static bool inplace(unsigned char *input, uint64_t input_len);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace transformations
|
} // namespace transformations
|
||||||
|
@ -54,8 +54,8 @@ std::string ParityOdd7bit::evaluate(std::string value,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ParityOdd7bit::inplace(unsigned char *input, u_int64_t input_len) {
|
bool ParityOdd7bit::inplace(unsigned char *input, uint64_t input_len) {
|
||||||
u_int64_t i;
|
uint64_t i;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < input_len) {
|
while (i < input_len) {
|
||||||
|
@ -33,7 +33,7 @@ class ParityOdd7bit : public Transformation {
|
|||||||
explicit ParityOdd7bit(std::string action) : Transformation(action) { }
|
explicit ParityOdd7bit(std::string action) : Transformation(action) { }
|
||||||
|
|
||||||
std::string evaluate(std::string exp, Transaction *transaction) override;
|
std::string evaluate(std::string exp, Transaction *transaction) override;
|
||||||
static bool inplace(unsigned char *input, u_int64_t input_len);
|
static bool inplace(unsigned char *input, uint64_t input_len);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace transformations
|
} // namespace transformations
|
||||||
|
@ -55,8 +55,8 @@ std::string ParityZero7bit::evaluate(std::string value,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool ParityZero7bit::inplace(unsigned char *input, u_int64_t input_len) {
|
bool ParityZero7bit::inplace(unsigned char *input, uint64_t input_len) {
|
||||||
u_int64_t i;
|
uint64_t i;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < input_len) {
|
while (i < input_len) {
|
||||||
|
@ -33,7 +33,7 @@ class ParityZero7bit : public Transformation {
|
|||||||
explicit ParityZero7bit(std::string action) : Transformation(action) { }
|
explicit ParityZero7bit(std::string action) : Transformation(action) { }
|
||||||
|
|
||||||
std::string evaluate(std::string exp, Transaction *transaction) override;
|
std::string evaluate(std::string exp, Transaction *transaction) override;
|
||||||
static bool inplace(unsigned char *input, u_int64_t input_len);
|
static bool inplace(unsigned char *input, uint64_t input_len);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace transformations
|
} // namespace transformations
|
||||||
|
@ -46,8 +46,8 @@ std::string RemoveComments::evaluate(std::string value,
|
|||||||
|
|
||||||
memcpy(input, value.c_str(), value.length()+1);
|
memcpy(input, value.c_str(), value.length()+1);
|
||||||
|
|
||||||
u_int64_t input_len = value.size();
|
uint64_t input_len = value.size();
|
||||||
u_int64_t i, j, incomment;
|
uint64_t i, j, incomment;
|
||||||
|
|
||||||
i = j = incomment = 0;
|
i = j = incomment = 0;
|
||||||
while (i < input_len) {
|
while (i < input_len) {
|
||||||
|
@ -62,7 +62,7 @@ std::string UrlDecodeUni::evaluate(std::string value,
|
|||||||
*
|
*
|
||||||
* IMP1 Assumes NUL-terminated
|
* IMP1 Assumes NUL-terminated
|
||||||
*/
|
*/
|
||||||
int UrlDecodeUni::inplace(unsigned char *input, u_int64_t input_len,
|
int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len,
|
||||||
Transaction *transaction) {
|
Transaction *transaction) {
|
||||||
unsigned char *d = input;
|
unsigned char *d = input;
|
||||||
int64_t i, count, fact, j, xv;
|
int64_t i, count, fact, j, xv;
|
||||||
|
@ -33,7 +33,7 @@ class UrlDecodeUni : public Transformation {
|
|||||||
explicit UrlDecodeUni(std::string action) : Transformation(action) { }
|
explicit UrlDecodeUni(std::string action) : Transformation(action) { }
|
||||||
|
|
||||||
std::string evaluate(std::string exp, Transaction *transaction) override;
|
std::string evaluate(std::string exp, Transaction *transaction) override;
|
||||||
static int inplace(unsigned char *input, u_int64_t input_len,
|
static int inplace(unsigned char *input, uint64_t input_len,
|
||||||
Transaction *transaction);
|
Transaction *transaction);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user