--- parser3/src/classes/math.C 2023/12/28 23:20:10 1.105 +++ parser3/src/classes/math.C 2026/04/25 13:38:46 1.112 @@ -1,7 +1,7 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian portions from gen_uuid.c, @@ -23,7 +23,7 @@ extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.105 2023/12/28 23:20:10 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.112 2026/04/25 13:38:46 moko Exp $"; // defines @@ -111,6 +111,27 @@ static void math2(Request& r, MethodPara MATH2(pow) MATH2(atan2) +static inline uint64_t ulp_key_double(double x) { + union { double d; uint64_t u; } v; v.d = x; + return (v.u & (1ull << 63)) ? (~v.u + 1ull) : (v.u | (1ull << 63)); +} + +static inline uint64_t ulp_distance_double(double a, double b) { + if (a == b) return 0; + uint64_t ka = ulp_key_double(a); + uint64_t kb = ulp_key_double(b); + return (ka > kb) ? (ka - kb) : (kb - ka); +} + +static void _eq(Request& r, MethodParams& params) { + double a=params.as_double(0, "parameter must be expression", r); + double b=params.as_double(1, "parameter must be expression", r); + uint64_t max_ulp=3; + if(params.count() == 3) + max_ulp=params.as_int(2, "max distance must be integer", r); + r.write(VBool::get(ulp_distance_double(a,b)<=max_ulp)); +} + inline bool is_salt_body_char(unsigned char c) { return pa_isalnum(c) || c == '.' || c=='/'; } @@ -318,7 +339,7 @@ void SHA1PadMessage(SHA1Context *context void SHA1ReadDigest(void *buf, SHA1Context *c) { if(!SHA1Result(c)) - throw Exception (PARSER_RUNTIME, 0, "Can not compute SHA1"); + 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]); @@ -356,13 +377,12 @@ void memxor(char *dest, const char *src, #define IPAD 0x36 #define OPAD 0x5c -#define HMAC(key,init,update,final,blocklen,digestlen){ \ +#define HMAC(key,keylen,init,update,final,blocklen,digestlen){ \ unsigned char tempdigest[digestlen], keydigest[digestlen]; \ - size_t keylen=strlen(key); \ /* Reduce the key's size, so that it becomes <= blocklen bytes. */ \ if (keylen > blocklen){ \ init(&c); \ - update(&c,(const unsigned char*)hmac, keylen); \ + update(&c,(const unsigned char*)key, keylen); \ final(keydigest, &c); \ key = (char *)keydigest; \ keylen = digestlen; \ @@ -397,19 +417,28 @@ static void _digest(Request& r, MethodPa else throw Exception(PARSER_RUNTIME, &smethod, "must be 'md5' or 'sha1' or 'sha256' or 'sha512'"); const char *hmac=0; - enum Format { F_HEX, F_BASE64 } format = F_HEX; + size_t hmac_len=0; + + enum Format { F_HEX, F_BASE64, F_FILE } format = F_HEX; if(params.count() == 3) if(HashStringValue* options=params.as_hash(2)) { int valid_options=0; if(Value* value=options->get("hmac")) { - hmac=value->as_string().cstr(); + if(VFile* vfile=dynamic_cast(value)){ + hmac=(const char* )vfile->value_ptr(); + hmac_len=vfile->value_size(); + } else { + hmac=value->as_string().cstr(); + hmac_len=strlen(hmac); + } 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'"); valid_options++; } @@ -422,7 +451,7 @@ static void _digest(Request& r, MethodPa if(method == M_MD5){ PA_MD5_CTX c; if(hmac){ - HMAC(hmac, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16); + HMAC(hmac, hmac_len, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16); } else { pa_MD5Init(&c); pa_MD5Update(&c, (const unsigned char*)data.str, data.length); @@ -435,7 +464,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA1){ SHA1Context c; if(hmac){ - HMAC(hmac, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); + HMAC(hmac, hmac_len, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20); } else { SHA1Reset(&c); SHA1Input(&c, (const unsigned char*)data.str, data.length); @@ -448,7 +477,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA256){ SHA256_CTX c; if(hmac){ - HMAC(hmac, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH); + HMAC(hmac, hmac_len, 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*)data.str, data.length); @@ -461,7 +490,7 @@ static void _digest(Request& r, MethodPa if(method == M_SHA512){ SHA512_CTX c; if(hmac){ - HMAC(hmac, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH); + HMAC(hmac, hmac_len, 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*)data.str, data.length); @@ -477,6 +506,11 @@ static void _digest(Request& r, MethodPa 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); + } } static void _uuid(Request& r, MethodParams& params) { @@ -647,7 +681,7 @@ static void _convert(Request& r, MethodP for(c=src;c=base_from) { for(unsigned char *s=c;s