diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fa1c0b..247d09f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(fun VERSION 0.38.8 LANGUAGES C) +project(fun VERSION 0.38.9 LANGUAGES C) set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED ON) diff --git a/lib/crypt/aes256.fun b/lib/crypt/aes256.fun index 3833399..3afd93e 100644 --- a/lib/crypt/aes256.fun +++ b/lib/crypt/aes256.fun @@ -27,33 +27,20 @@ class AES256() // ---------- Hex helpers ---------- - fun byte_from_hex_pair(this, hh) - hi = hex_val(substr(hh, 0, 1)) - lo = hex_val(substr(hh, 1, 1)) - return hi * 16 + lo - fun from_hex(this, hex) arr = [] i = 0 n = len(hex) while i + 1 < n - push(arr, this.byte_from_hex_pair(substr(hex, i, 2))) + push(arr, byte_from_hex_pair(substr(hex, i, 2))) i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/crc32.fun b/lib/crypt/crc32.fun index c581b9c..81cb7d2 100644 --- a/lib/crypt/crc32.fun +++ b/lib/crypt/crc32.fun @@ -49,34 +49,21 @@ class CRC32() return band(this.u32(a), this.u32(b)) // hex helpers (mirroring style from lib/crypt/md5.fun) - fun byte_from_hex_pair(this, hh) - hi = hex_val(substr(hh, 0, 1)) - lo = hex_val(substr(hh, 1, 1)) - return hi * 16 + lo - fun from_hex(this, hex) arr = [] i = 0 n = len(hex) while i + 1 < n - b = this.byte_from_hex_pair(substr(hex, i, 2)) + b = byte_from_hex_pair(substr(hex, i, 2)) push(arr, b) i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/crc32c.fun b/lib/crypt/crc32c.fun index 458c597..87840d4 100644 --- a/lib/crypt/crc32c.fun +++ b/lib/crypt/crc32c.fun @@ -49,44 +49,23 @@ class CRC32C() return band(this.u32(a), this.u32(b)) // hex helpers (mirroring style from lib/crypt/md5.fun) - fun byte_from_hex_pair(this, hh) - hi = hex_val(substr(hh, 0, 1)) - lo = hex_val(substr(hh, 1, 1)) - return hi * 16 + lo - fun from_hex(this, hex) arr = [] i = 0 n = len(hex) while i + 1 < n - b = this.byte_from_hex_pair(substr(hex, i, 2)) + b = byte_from_hex_pair(substr(hex, i, 2)) push(arr, b) i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - - fun bytes_to_hex(this, arr) - i = 0 - out = [] - while i < len(arr) - push(out, this.two_hex(arr[i])) - i = i + 1 - return join(out, "") - fun u32_to_hex8(this, n) // big-endian printing (MSB first), common for CRC displays b3 = this.and32(this.shr32(n, 24), 255) b2 = this.and32(this.shr32(n, 16), 255) b1 = this.and32(this.shr32(n, 8), 255) b0 = this.and32(n, 255) - return this.bytes_to_hex([b3, b2, b1, b0]) + return bytes_to_hex([b3, b2, b1, b0]) // Bitwise update (no table needed) using reflected polynomial 0x82F63B78 POLY = 2197175160 // 0x82F63B78 diff --git a/lib/crypt/md5.fun b/lib/crypt/md5.fun index 717b27a..36ae7bd 100644 --- a/lib/crypt/md5.fun +++ b/lib/crypt/md5.fun @@ -80,34 +80,21 @@ class MD5() return this.u32(this.u32(this.u32(a + b) + c) + d) // hex helpers - fun byte_from_hex_pair(this, hh) - hi = hex_val(substr(hh, 0, 1)) - lo = hex_val(substr(hh, 1, 1)) - return hi * 16 + lo - fun from_hex(this, hex) arr = [] i = 0 n = len(hex) while i + 1 < n - b = this.byte_from_hex_pair(substr(hex, i, 2)) + b = byte_from_hex_pair(substr(hex, i, 2)) push(arr, b) i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/ripemd160.fun b/lib/crypt/ripemd160.fun index 773aed7..2958f86 100644 --- a/lib/crypt/ripemd160.fun +++ b/lib/crypt/ripemd160.fun @@ -94,16 +94,11 @@ class RIPEMD160() i = i + 2 return arr - fun two_hex(this, n) - n = band(n, 0xFF) - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - return join([d[shr(n, 4)], d[band(n, 0xF)]], "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/ripemd160_new_try.fun b/lib/crypt/ripemd160_new_try.fun index 9489f17..5e1addd 100644 --- a/lib/crypt/ripemd160_new_try.fun +++ b/lib/crypt/ripemd160_new_try.fun @@ -69,19 +69,11 @@ class RIPEMD160() i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/sha1.fun b/lib/crypt/sha1.fun index 398a3a9..6611f1c 100644 --- a/lib/crypt/sha1.fun +++ b/lib/crypt/sha1.fun @@ -53,19 +53,11 @@ class SHA1() i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/sha256.fun b/lib/crypt/sha256.fun index 04f102b..6d6c113 100644 --- a/lib/crypt/sha256.fun +++ b/lib/crypt/sha256.fun @@ -102,19 +102,11 @@ class SHA256() i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - d = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"] - hi = n / 16 - lo = n % 16 - parts = [d[hi], d[lo]] - return join(parts, "") - fun bytes_to_hex(this, arr) i = 0 out = [] while i < len(arr) - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/crypt/sha512.fun b/lib/crypt/sha512.fun index 5401c0a..b9b2095 100644 --- a/lib/crypt/sha512.fun +++ b/lib/crypt/sha512.fun @@ -45,21 +45,12 @@ class SHA512() i = i + 2 return arr - fun two_hex(this, n) - n = n % 256 - hexd = "0123456789abcdef" - number hi = (n / 16) % 16 - number lo = n % 16 - c1 = substr(hexd, hi, 1) - c2 = substr(hexd, lo, 1) - return join([c1, c2], "") - fun bytes_to_hex(this, arr) out = [] number i = 0 number L = len(arr) while i < L - push(out, this.two_hex(arr[i])) + push(out, two_hex(arr[i])) i = i + 1 return join(out, "") diff --git a/lib/hex.fun b/lib/hex.fun index 819ce3f..913466c 100644 --- a/lib/hex.fun +++ b/lib/hex.fun @@ -12,6 +12,10 @@ */ // Hex utility functions +fun byte_from_hex_pair(hh) + hi = hex_val(substr(hh, 0, 1)) + lo = hex_val(substr(hh, 1, 1)) + return hi * 16 + lo fun hex_val(ch) if (ch == "0")