--- parser3/src/classes/math.C 2026/09/15 20:48:14 1.113 +++ parser3/src/classes/math.C 2026/11/04 13:40:42 1.116 @@ -17,14 +17,16 @@ #include "pa_vfile.h" #include "pa_request.h" #include "pa_md5.h" +#include "pa_sha1.h" #include "pa_sha2.h" +#include "pa_xxhash.h" #include "pa_random.h" #ifdef HAVE_CRYPT extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.113 2026/09/15 20:48:14 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.116 2026/11/04 13:40:42 moko Exp $"; // defines @@ -121,6 +123,26 @@ static void _eq(Request& r, MethodParams r.write(VBool::get(ulp_eq_double(a, b, max_ulp))); } +static void _min(Request& r, MethodParams& params) { + double result=params.as_double(0, "parameter must be expression", r); + for(size_t i=1; iresult) + result=value; + } + r.write(*new VDouble(result)); +} + inline bool is_salt_body_char(unsigned char c) { return pa_isalnum(c) || c == '.' || c=='/'; } @@ -198,153 +220,14 @@ static void _md5(Request& r, MethodParam } -//SHA-1: - -struct SHA1Context { - unsigned Message_Digest[5], Length_Low, Length_High; - unsigned int Message_Block[64]; - int Message_Block_Index, Computed, Corrupted; -}; - -#define SHA1CircularShift(bits,word) ((((word) << (bits)) & 0xFFFFFFFF)|((word) >> (32-(bits)))) -void SHA1ProcessMessageBlock(SHA1Context *); -void SHA1PadMessage(SHA1Context *); -void SHA1Reset(SHA1Context *context) { - context->Length_Low = context->Length_High = context->Message_Block_Index = 0; - context->Message_Digest[0] = 0x67452301; - context->Message_Digest[1] = 0xEFCDAB89; - context->Message_Digest[2] = 0x98BADCFE; - context->Message_Digest[3] = 0x10325476; - context->Message_Digest[4] = 0xC3D2E1F0; - context->Computed = context->Corrupted = 0; -} - -int SHA1Result(SHA1Context *context) { - if (context->Corrupted) - return 0; - if (!context->Computed) { - SHA1PadMessage(context); - context->Computed = 1; - } - return 1; -} - -void SHA1Input(SHA1Context *context, const unsigned char *message_array, unsigned length) { - if (!length) - return; - if (context->Computed || context->Corrupted) { - context->Corrupted = 1; - return; - } - - while(length-- && !context->Corrupted) { - context->Message_Block[context->Message_Block_Index++] = (*message_array & 0xFF); - context->Length_Low += 8; - context->Length_Low &= 0xFFFFFFFF; - if (!context->Length_Low && !(context->Length_High=((1+context->Length_High)&0xFFFFFFFF))) - context->Corrupted = 1; // too long message - if (context->Message_Block_Index == 64) - SHA1ProcessMessageBlock(context); - message_array++; - } -} - -void SHA1ProcessMessageBlock(SHA1Context *context) { - const unsigned K[] = {0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6 }; - int t; - unsigned temp, W[80], buf[5]; - unsigned &A=buf[0], &B=buf[1], &C=buf[2], &D=buf[3], &E=buf[4]; - - for(t = 0; t < 16; t++) - W[t] = (((unsigned) context->Message_Block[t * 4]) << 24) | (((unsigned) context->Message_Block[t * 4 + 1]) << 16) | (((unsigned) context->Message_Block[t * 4 + 2]) << 8) | ((unsigned) context->Message_Block[t * 4 + 3]); - - for(t = 16; t < 80; t++) - W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); - - memcpy (buf, context->Message_Digest, sizeof(buf)); - for(t = 0; t < 20; t++) { - temp = (SHA1CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 20; t < 40; t++) { - temp = (SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 40; t < 60; t++) { - temp = (SHA1CircularShift(5,A) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for(t = 60; t < 80; t++) { - temp = (SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]) & 0xFFFFFFFF; - E = D; D = C; - C = SHA1CircularShift(30,B); - B = A; A = temp; - } - - for (t = 0; t < 5; t++) - context->Message_Digest[t] = (context->Message_Digest[t] + buf[t]) & 0xFFFFFFFF; - - context->Message_Block_Index = 0; -} - -void SHA1PadMessage(SHA1Context *context) { - context->Message_Block[context->Message_Block_Index++] = 0x80; - if (context->Message_Block_Index > 56) { - //was 55, one shift - while(context->Message_Block_Index < 64) - context->Message_Block[context->Message_Block_Index++] = 0; - SHA1ProcessMessageBlock(context); - while(context->Message_Block_Index < 56) - context->Message_Block[context->Message_Block_Index++] = 0; - } else - while(context->Message_Block_Index < 56) - context->Message_Block[context->Message_Block_Index++] = 0; - context->Message_Block[56] = (context->Length_High >> 24) & 0xFF; - context->Message_Block[57] = (context->Length_High >> 16) & 0xFF; - context->Message_Block[58] = (context->Length_High >> 8) & 0xFF; - context->Message_Block[59] = (context->Length_High) & 0xFF; - context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF; - context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF; - context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF; - context->Message_Block[63] = (context->Length_Low) & 0xFF; - SHA1ProcessMessageBlock(context); -} - -#ifdef PA_BIG_ENDIAN -#define SWAP(n) (n) -#else -#define SWAP(n) (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -#endif - -void SHA1ReadDigest(void *buf, SHA1Context *c) -{ - if(!SHA1Result(c)) - throw Exception (PARSER_RUNTIME, 0, "Cannot compute SHA1"); - - ((uint32_t *)buf)[0] = SWAP(c->Message_Digest[0]); - ((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]); - ((uint32_t *)buf)[2] = SWAP(c->Message_Digest[2]); - ((uint32_t *)buf)[3] = SWAP(c->Message_Digest[3]); - ((uint32_t *)buf)[4] = SWAP(c->Message_Digest[4]); -} - static void _sha1(Request& r, MethodParams& params) { 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; + PA_SHA1_CTX c; unsigned char digest[20]; - SHA1Reset (&c); - SHA1Input (&c, (const unsigned char*)string, strlen(string)); - SHA1ReadDigest(digest, &c); + pa_SHA1Reset (&c); + pa_SHA1Input (&c, (const unsigned char*)string, strlen(string)); + pa_SHA1ReadDigest(digest, &c); r.write(*new String(hex_string(digest, sizeof(digest), false))); } @@ -392,6 +275,30 @@ void memxor(char *dest, const char *src, update(&c, (const unsigned char*)tempdigest, digestlen); \ } +enum Format { F_HEX, F_BASE64, F_FILE }; + +static Format as_format(const String& sformat) { + if (sformat == "hex") return F_HEX; + if (sformat == "base64" ) return F_BASE64; + if (sformat == "file" ) return F_FILE; + throw Exception(PARSER_RUNTIME, &sformat, "must be 'hex' or 'base64'"); +} + +static void write_digest(Request& r, const String::C& digest, Format format) { + if(format == F_HEX){ + r.write(*new String(hex_string((unsigned char *)digest.str, digest.length, false))); + } + if(format == F_BASE64){ + r.write(*new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /*no wrap*/)))); + } + if(format == F_FILE){ + VFile& result=*new VFile; + // the file keeps the pointer, and the digest is in the caller's stack + result.set_binary(true, pa_strdup(digest.str, digest.length), digest.length); + r.write(result); + } +} + static void _digest(Request& r, MethodParams& params) { const String &smethod = params.as_string(0, PARAMETER_MUST_BE_STRING); @@ -408,7 +315,7 @@ static void _digest(Request& r, MethodPa const char *hmac=0; size_t hmac_len=0; - enum Format { F_HEX, F_BASE64, F_FILE } format = F_HEX; + Format format = F_HEX; if(params.count() == 3) if(HashStringValue* options=params.as_hash(2)) { @@ -424,17 +331,14 @@ static void _digest(Request& r, MethodPa valid_options++; } if(Value* value=options->get("format")) { - const String& sformat=value->as_string(); - if (sformat == "hex") format = F_HEX; - else if (sformat == "base64" ) format = F_BASE64; - else if (sformat == "file" ) format = F_FILE; - else throw Exception(PARSER_RUNTIME, &sformat, "must be 'hex' or 'base64'"); + format = as_format(value->as_string()); valid_options++; } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } + char str[SHA512_DIGEST_LENGTH]; // the longest digest String::C digest; if(method == M_MD5){ @@ -445,21 +349,19 @@ static void _digest(Request& r, MethodPa pa_MD5Init(&c); pa_MD5Update(&c, (const unsigned char*)data.str, data.length); } - char *str=(char *)pa_malloc(16); pa_MD5Final((unsigned char *)str, &c); digest = String::C(str, 16); } if(method == M_SHA1){ - SHA1Context c; + PA_SHA1_CTX c; if(hmac){ - HMAC(hmac, hmac_len, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); + HMAC(hmac, hmac_len, pa_SHA1Reset, pa_SHA1Input, pa_SHA1ReadDigest, 64, 20); } else { - SHA1Reset(&c); - SHA1Input(&c, (const unsigned char*)data.str, data.length); + pa_SHA1Reset(&c); + pa_SHA1Input(&c, (const unsigned char*)data.str, data.length); } - char *str=(char *)pa_malloc(20); - SHA1ReadDigest(str, &c); + pa_SHA1ReadDigest(str, &c); digest = String::C(str, 20); } @@ -471,7 +373,6 @@ static void _digest(Request& r, MethodPa pa_SHA256_Init(&c); 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); digest = String::C(str, SHA256_DIGEST_LENGTH); } @@ -484,22 +385,46 @@ static void _digest(Request& r, MethodPa pa_SHA512_Init(&c); 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); digest = String::C(str, SHA512_DIGEST_LENGTH); } - if(format == F_HEX){ - r.write(*new String(hex_string((unsigned char *)digest.str, digest.length, false))); - } - if(format == F_BASE64){ - r.write(*new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /*no wrap*/)))); - } - if(format == F_FILE){ - VFile& result=*new VFile; - result.set_binary(true, digest.str, digest.length); - r.write(result); - } + write_digest(r, digest, format); +} + +static void _xxhash(Request& r, MethodParams& params) { + const String &salgo = params.as_string(0, PARAMETER_MUST_BE_STRING); + + String::C data=getData(params.as_no_junction(1, "parameter must be string or file"), r); + + bool is_xxh64; + + if (salgo == "xxh32" || salgo == "32") is_xxh64 = false; + else if (salgo == "xxh64" || salgo == "64") is_xxh64 = true; + else throw Exception(PARSER_RUNTIME, &salgo, "must be 'xxh32' or 'xxh64'"); + + Format format = F_HEX; + + if(params.count() == 3) + if(HashStringValue* options=params.as_hash(2)) { + int valid_options=0; + if(Value* value=options->get("format")) { + format = as_format(value->as_string()); + valid_options++; + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + + size_t size=is_xxh64 ? 8 : 4; + uint64_t hash=is_xxh64 ? pa_xxh64(data.str, data.length, 0) : pa_xxh32(data.str, data.length, 0); + + // canonical form, as xxhsum prints it: the most significant byte first + char str[8]; + for(size_t i=0; i> (8*(size-1-i))); + + write_digest(r, String::C(str, size), format); } static void _uuid(Request& r, MethodParams& params) { @@ -781,6 +706,12 @@ MMath::MMath(): Methoded("math") { // ^math:eq(a;b[;precision]) add_native_method("eq", Method::CT_STATIC, _eq, 2, 3); + // ^math:min(a;b[;c...]) + add_native_method("min", Method::CT_STATIC, _min, 2, 10000); + + // ^math:max(a;b[;c...]) + add_native_method("max", Method::CT_STATIC, _max, 2, 10000); + // ^math:crypt[password;salt] ADDN(crypt, 2); @@ -792,6 +723,9 @@ MMath::MMath(): Methoded("math") { // ^math:digest[method;string|file;options] add_native_method("digest", Method::CT_STATIC, _digest, 2, 3); + + // ^math:xxhash[method;string|file;options] + add_native_method("xxhash", Method::CT_STATIC, _xxhash, 2, 3); // ^math:crc32[string] ADD1(crc32);