--- parser3/src/classes/math.C	2013/07/22 20:25:53	1.68
+++ parser3/src/classes/math.C	2015/10/06 22:20:50	1.78
@@ -12,6 +12,7 @@
 #include "pa_common.h"
 #include "pa_vint.h"
 #include "pa_vmath.h"
+#include "pa_vfile.h"
 #include "pa_request.h"
 #include "pa_md5.h"
 #include "pa_sha2.h"
@@ -21,7 +22,7 @@
 extern "C" char *crypt(const char* , const char* );
 #endif
 
-volatile const char * IDENT_MATH_C="$Id: math.C,v 1.68 2013/07/22 20:25:53 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.78 2015/10/06 22:20:50 moko Exp $";
 
 // defines
 
@@ -69,20 +70,31 @@ static void math1(Request& r, MethodPara
 	static void _##name(Request& r, MethodParams& params) {\
 		math1(r, params, &name);\
 	}
+
 #define MATH1P(name_parser, name_c) \
 	static void _##name_parser(Request& r, MethodParams& params) {\
 		math1(r, params, &name_c);\
 	}
-MATH1(round);	MATH1(floor);	MATH1P(ceiling, ceil);
-MATH1(trunc);	MATH1(frac);
-MATH1P(abs, fabs);	MATH1(sign);
-MATH1(exp);	
-MATH1(log);	MATH1(log10);
-MATH1(sin);	MATH1(asin);	
-MATH1(cos);	MATH1(acos);	
-MATH1(tan);	MATH1(atan);
-MATH1(degrees);	MATH1(radians);
-MATH1(sqrt);
+
+MATH1(round)
+MATH1(floor)
+MATH1P(ceiling, ceil)
+MATH1(trunc)
+MATH1(frac)
+MATH1P(abs, fabs)
+MATH1(sign)
+MATH1(exp)
+MATH1(log)
+MATH1(log10)
+MATH1(sin)
+MATH1(asin)
+MATH1(cos)
+MATH1(acos)
+MATH1(tan)
+MATH1(atan)
+MATH1(degrees)
+MATH1(radians)
+MATH1(sqrt)
 
 
 typedef double (*math2_func_ptr)(double, double);
@@ -97,11 +109,13 @@ static void math2(Request& r, MethodPara
 	static void _##name(Request& r, MethodParams& params) {\
 		math2(r, params, &name);\
 	}
-MATH2(pow);
 
-inline bool is_salt_body_char(int c) {
-	return isalnum(c) || c == '.' || c=='/';
+MATH2(pow)
+
+inline bool is_salt_body_char(unsigned char c) {
+	return pa_isalnum(c) || c == '.' || c=='/';
 }
+
 static size_t calc_prefix_size(const char* salt) {
 	if(strlen(salt)) {
 		if(!is_salt_body_char((unsigned char)salt[0])) { // $...  {...
@@ -163,7 +177,7 @@ static void _crypt(Request& r, MethodPar
 }
 
 static void _md5(Request& r, MethodParams& params) {
-	const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
+	const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets).cstr();
 
 	PA_MD5_CTX context;
 	unsigned char digest[16];
@@ -315,7 +329,7 @@ void SHA1ReadDigest(void *buf, SHA1Conte
 }
 
 static void _sha1(Request& r, MethodParams& params) {
-	const char *string = params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
+	const char *string = params.as_string(0, PARAMETER_MUST_BE_STRING).cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets).cstr();
 
 	SHA1Context c;
 	unsigned char digest[20];
@@ -350,7 +364,7 @@ void memxor(char *dest, const char *src,
 	memxor (block, key, keylen);						\
 	init(&c);								\
 	update(&c, (const unsigned char*)block, blocklen);			\
-	update(&c, (const unsigned char*)string, strlen(string));		\
+	update(&c, (const unsigned char*)data.str, data.length);		\
 	final(tempdigest, &c);							\
 	/* Compute result from KEY and TEMP. */					\
 	memset (block, OPAD, blocklen);						\
@@ -362,7 +376,17 @@ void memxor(char *dest, const char *src,
 
 static void _digest(Request& r, MethodParams& params) {
 	const String &smethod = params.as_string(0, PARAMETER_MUST_BE_STRING);
-	const char *string = params.as_string(1, PARAMETER_MUST_BE_STRING).cstr();
+
+	Value& vdata=params.as_no_junction(1, "parameter must be string or file");
+
+	String::C data;
+	if(const String* sdata=vdata.get_string()){
+		String::Body body=sdata->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // explode content, honor tainting changes
+		data=String::C(body.cstr(), body.length());
+	} else {
+		VFile *file=vdata.as_vfile(String::L_AS_IS);
+		data=String::C(file->value_ptr(),file->value_size());
+	}
 
 	enum Method { M_MD5, M_SHA1, M_SHA256, M_SHA512 } method;
 
@@ -401,7 +425,7 @@ static void _digest(Request& r, MethodPa
 			HMAC(hmac, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16);
 		} else {
 			pa_MD5Init(&c);
-			pa_MD5Update(&c, (const unsigned char*)string, strlen(string));
+			pa_MD5Update(&c, (const unsigned char*)data.str, data.length);
 		}
 		char *str=(char *)pa_malloc(16);
 		pa_MD5Final((unsigned char *)str, &c);
@@ -414,7 +438,7 @@ static void _digest(Request& r, MethodPa
 			HMAC(hmac, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20);
 		} else {
 			SHA1Reset(&c);
-			SHA1Input(&c, (const unsigned char*)string, strlen(string));
+			SHA1Input(&c, (const unsigned char*)data.str, data.length);
 		}
 		char *str=(char *)pa_malloc(20);
 		SHA1ReadDigest(str, &c);
@@ -427,7 +451,7 @@ static void _digest(Request& r, MethodPa
 			HMAC(hmac, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH);
 		} else {
 			pa_SHA256_Init(&c);
-			pa_SHA256_Update(&c, (const unsigned char*)string, strlen(string));
+			pa_SHA256_Update(&c, (const unsigned char*)data.str, data.length);
 		}
 		char *str=(char *)pa_malloc(SHA256_DIGEST_LENGTH);
 		pa_SHA256_Final((unsigned char *)str, &c);
@@ -440,7 +464,7 @@ static void _digest(Request& r, MethodPa
 			HMAC(hmac, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH);
 		} else {
 			pa_SHA512_Init(&c);
-			pa_SHA512_Update(&c, (const unsigned char*)string, strlen(string));
+			pa_SHA512_Update(&c, (const unsigned char*)data.str, data.length);
 		}
 		char *str=(char *)pa_malloc(SHA512_DIGEST_LENGTH);
 		pa_SHA512_Final((unsigned char *)str, &c);
@@ -484,7 +508,7 @@ static void _crc32(Request& r, MethodPar
 	r.write_no_lang(*new VInt(pa_crc32(string, strlen(string))));
 }
 
-static void toBase(unsigned int value, unsigned int base, char*& ptr){
+static void toBase(unsigned long long int value, unsigned int base, char*& ptr){
 	static const char* hex="0123456789ABCDEF";
 	int rest = value % base;
 	if(value >= base)
@@ -517,9 +541,9 @@ static void _convert(Request& r, MethodP
 		str++;
 	}
 
-	unsigned int value=pa_atoui(str, base_from);
+	unsigned long long int value=pa_atoul(str, base_from);
 
-	char result_cstr[sizeof(unsigned int)*8+1/*minus for negative number*/+1/*terminator*/];
+	char result_cstr[sizeof(unsigned long long int)*8+1/*minus for negative number*/+1/*terminator*/];
 	char* ptr=result_cstr;
 	if(negative)
 		*ptr++='-';
@@ -563,7 +587,7 @@ MMath::MMath(): Methoded("math") {
 	// ^math:sha1[string]
 	ADD1(sha1);
 	
-	// ^math:digest[method;string;options]
+	// ^math:digest[method;string|file;options]
 	add_native_method("digest", Method::CT_STATIC, _digest, 2, 3);
 	
 	// ^math:crc32[string]