Added OpenSSL RIPEMD-160 fun. (0.38.14)
This commit is contained in:
parent
38968a9a51
commit
6fa95f0d47
15 changed files with 144 additions and 9 deletions
|
|
@ -45,6 +45,7 @@ FUN_LIB_DIR="$(pwd)/lib" fun examples/crypto/openssl_md5.fun
|
||||||
Browse the `examples/` tree for areas of interest:
|
Browse the `examples/` tree for areas of interest:
|
||||||
|
|
||||||
- crypto — crypto demonstrations (e.g., OpenSSL MD5/SHA-256/SHA-512 helpers; requires build with `-DFUN_WITH_OPENSSL=ON`)
|
- crypto — crypto demonstrations (e.g., OpenSSL MD5/SHA-256/SHA-512 helpers; requires build with `-DFUN_WITH_OPENSSL=ON`)
|
||||||
|
- crypto — crypto demonstrations (e.g., OpenSSL MD5/SHA-256/SHA-512/RIPEMD‑160 helpers; requires build with `-DFUN_WITH_OPENSSL=ON`)
|
||||||
- blocking / interactive — I/O or user-interactive patterns
|
- blocking / interactive — I/O or user-interactive patterns
|
||||||
- error / broken — negative tests and error showcases
|
- error / broken — negative tests and error showcases
|
||||||
- math — numeric operations
|
- math — numeric operations
|
||||||
|
|
|
||||||
2
docs/external/README.md
vendored
2
docs/external/README.md
vendored
|
|
@ -18,7 +18,7 @@ Extensions:
|
||||||
- [PC/SC (Smart cards)](./pcsc.md)
|
- [PC/SC (Smart cards)](./pcsc.md)
|
||||||
- [Notcurses (TUI)](./notcurses.md)
|
- [Notcurses (TUI)](./notcurses.md)
|
||||||
- [Tcl/Tk (GUI)](./tcltk.md)
|
- [Tcl/Tk (GUI)](./tcltk.md)
|
||||||
- [OpenSSL (MD5 helper)](./openssl.md)
|
- [OpenSSL](./openssl.md)
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
- These integrations are optional; the VM compiles without them.
|
- These integrations are optional; the VM compiles without them.
|
||||||
|
|
|
||||||
11
docs/external/openssl.md
vendored
11
docs/external/openssl.md
vendored
|
|
@ -1,7 +1,7 @@
|
||||||
# OpenSSL extension (optional)
|
# OpenSSL extension (optional)
|
||||||
|
|
||||||
- CMake option: FUN_WITH_OPENSSL=ON
|
- CMake option: FUN_WITH_OPENSSL=ON
|
||||||
- Purpose: provide small crypto helpers backed by OpenSSL. Includes md5, sha256, sha512 helpers.
|
- Purpose: provide small crypto helpers backed by OpenSSL. Includes md5, sha256, sha512, ripemd160 helpers.
|
||||||
- Homepage: https://www.openssl.org/
|
- Homepage: https://www.openssl.org/
|
||||||
|
|
||||||
Build notes:
|
Build notes:
|
||||||
|
|
@ -12,7 +12,8 @@ Provided helper/opcodes:
|
||||||
- Function: openssl_md5(data:string) -> string (lowercase hex). Falls back to empty string when the extension is disabled, mirroring other optional modules.
|
- Function: openssl_md5(data:string) -> string (lowercase hex). Falls back to empty string when the extension is disabled, mirroring other optional modules.
|
||||||
- Function: openssl_sha256(data:string) -> string (lowercase hex).
|
- Function: openssl_sha256(data:string) -> string (lowercase hex).
|
||||||
- Function: openssl_sha512(data:string) -> string (lowercase hex).
|
- Function: openssl_sha512(data:string) -> string (lowercase hex).
|
||||||
- Opcodes: OP_OPENSSL_MD5, OP_OPENSSL_SHA256, OP_OPENSSL_SHA512 (internal mappings for the functions above).
|
- Function: openssl_ripemd160(data:string) -> string (lowercase hex). Note: On OpenSSL 3.x this may require the legacy provider; if the digest is unavailable, the helper returns an empty string.
|
||||||
|
- Opcodes: OP_OPENSSL_MD5, OP_OPENSSL_SHA256, OP_OPENSSL_SHA512, OP_OPENSSL_RIPEMD160 (internal mappings for the functions above).
|
||||||
|
|
||||||
Quickstart:
|
Quickstart:
|
||||||
- Configure: cmake -S . -B build -DFUN_WITH_OPENSSL=ON
|
- Configure: cmake -S . -B build -DFUN_WITH_OPENSSL=ON
|
||||||
|
|
@ -21,6 +22,7 @@ Quickstart:
|
||||||
- ./build/fun examples/crypto/openssl_md5.fun
|
- ./build/fun examples/crypto/openssl_md5.fun
|
||||||
- ./build/fun examples/crypto/openssl_sha256.fun
|
- ./build/fun examples/crypto/openssl_sha256.fun
|
||||||
- ./build/fun examples/crypto/openssl_sha512.fun
|
- ./build/fun examples/crypto/openssl_sha512.fun
|
||||||
|
- ./build/fun examples/crypto/openssl_ripemd160.fun
|
||||||
|
|
||||||
Example output:
|
Example output:
|
||||||
- md5(abc) = 900150983cd24fb0d6963f7d28e17f72
|
- md5(abc) = 900150983cd24fb0d6963f7d28e17f72
|
||||||
|
|
@ -29,3 +31,8 @@ Example output:
|
||||||
- sha256("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
|
- sha256("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
|
||||||
- sha512(abc) = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
|
- sha512(abc) = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
|
||||||
- sha512("") = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
|
- sha512("") = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
|
||||||
|
- ripemd160(abc) = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
|
||||||
|
- ripemd160("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- The OpenSSL 3.x provider configuration on your system determines availability of RIPEMD‑160. If the legacy provider is not enabled, openssl_ripemd160() will return an empty string.
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,7 @@ This document provides an overview of the available VM opcodes implemented under
|
||||||
- OP_OPENSSL_MD5: Compute MD5 digest and return lowercase hex string; pops data:string; pushes md5:string.
|
- OP_OPENSSL_MD5: Compute MD5 digest and return lowercase hex string; pops data:string; pushes md5:string.
|
||||||
- OP_OPENSSL_SHA256: Compute SHA‑256 digest and return lowercase hex string; pops data:string; pushes sha256:string.
|
- OP_OPENSSL_SHA256: Compute SHA‑256 digest and return lowercase hex string; pops data:string; pushes sha256:string.
|
||||||
- OP_OPENSSL_SHA512: Compute SHA‑512 digest and return lowercase hex string; pops data:string; pushes sha512:string.
|
- OP_OPENSSL_SHA512: Compute SHA‑512 digest and return lowercase hex string; pops data:string; pushes sha512:string.
|
||||||
|
- OP_OPENSSL_RIPEMD160: Compute RIPEMD‑160 digest and return lowercase hex string; pops data:string; pushes ripemd160:string. On OpenSSL 3.x this may require the legacy provider; if unavailable, the helper returns an empty string.
|
||||||
- Requires building with `-DFUN_WITH_OPENSSL=ON`. When disabled, these opcodes still exist but return an empty string to match other optional extensions’ fallback behavior.
|
- Requires building with `-DFUN_WITH_OPENSSL=ON`. When disabled, these opcodes still exist but return an empty string to match other optional extensions’ fallback behavior.
|
||||||
|
|
||||||
## PCRE2 (Regex)
|
## PCRE2 (Regex)
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
* This file is part of the Fun programming language.
|
* This file is part of the Fun programming language.
|
||||||
* https://fun-lang.xyz/
|
* https://fun-lang.xyz/
|
||||||
*
|
*
|
||||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
* Licensed under the terms of the Apache-2.0 license.
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
* https://opensource.org/license/apache-2-0
|
* https://opensource.org/license/apache-2-0
|
||||||
*
|
*
|
||||||
|
|
|
||||||
28
examples/crypto/openssl_ripemd160.fun
Normal file
28
examples/crypto/openssl_ripemd160.fun
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
#!/usr/bin/env fun
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Fun programming language.
|
||||||
|
* https://fun-lang.xyz/
|
||||||
|
*
|
||||||
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
|
* https://opensource.org/license/apache-2-0
|
||||||
|
*
|
||||||
|
* Added: 2026-02-19
|
||||||
|
*/
|
||||||
|
|
||||||
|
// OpenSSL RIPEMD-160 example
|
||||||
|
// Enable with -DFUN_WITH_OPENSSL=ON during build for real hashing.
|
||||||
|
|
||||||
|
s = "abc"
|
||||||
|
d = openssl_ripemd160(s)
|
||||||
|
print("ripemd160(abc) = " + d)
|
||||||
|
|
||||||
|
// Another quick check (empty string)
|
||||||
|
e = ""
|
||||||
|
print("ripemd160(\"\") = " + openssl_ripemd160(e))
|
||||||
|
|
||||||
|
/* Expected output (if RIPEMD-160 is available in your OpenSSL build):
|
||||||
|
ripemd160(abc) = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
|
||||||
|
ripemd160("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31
|
||||||
|
*/
|
||||||
|
|
@ -172,6 +172,7 @@ static const char *opcode_name(OpCode op) {
|
||||||
case OP_OPENSSL_MD5: return "OPENSSL_MD5";
|
case OP_OPENSSL_MD5: return "OPENSSL_MD5";
|
||||||
case OP_OPENSSL_SHA256: return "OPENSSL_SHA256";
|
case OP_OPENSSL_SHA256: return "OPENSSL_SHA256";
|
||||||
case OP_OPENSSL_SHA512: return "OPENSSL_SHA512";
|
case OP_OPENSSL_SHA512: return "OPENSSL_SHA512";
|
||||||
|
case OP_OPENSSL_RIPEMD160: return "OPENSSL_RIPEMD160";
|
||||||
case OP_INI_LOAD: return "INI_LOAD";
|
case OP_INI_LOAD: return "INI_LOAD";
|
||||||
case OP_INI_FREE: return "INI_FREE";
|
case OP_INI_FREE: return "INI_FREE";
|
||||||
case OP_INI_GET_STRING: return "INI_GET_STRING";
|
case OP_INI_GET_STRING: return "INI_GET_STRING";
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,7 @@ typedef enum {
|
||||||
OP_OPENSSL_MD5, // pops data string; pushes md5 hex string
|
OP_OPENSSL_MD5, // pops data string; pushes md5 hex string
|
||||||
OP_OPENSSL_SHA256, // pops data string; pushes sha256 hex string
|
OP_OPENSSL_SHA256, // pops data string; pushes sha256 hex string
|
||||||
OP_OPENSSL_SHA512, // pops data string; pushes sha512 hex string
|
OP_OPENSSL_SHA512, // pops data string; pushes sha512 hex string
|
||||||
|
OP_OPENSSL_RIPEMD160, // pops data string; pushes ripemd160 hex string
|
||||||
|
|
||||||
// INI (iniparser 4.2.6) optional
|
// INI (iniparser 4.2.6) optional
|
||||||
OP_INI_LOAD, // pops path; pushes handle (>0) or 0
|
OP_INI_LOAD, // pops path; pushes handle (>0) or 0
|
||||||
|
|
|
||||||
44
src/external/openssl.c
vendored
44
src/external/openssl.c
vendored
|
|
@ -2,7 +2,7 @@
|
||||||
* This file is part of the Fun programming language.
|
* This file is part of the Fun programming language.
|
||||||
* https://fun-lang.xyz/
|
* https://fun-lang.xyz/
|
||||||
*
|
*
|
||||||
* Copyright 2025 Johannes Findeisen <you@hanez.org>
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
* Licensed under the terms of the Apache-2.0 license.
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
* https://opensource.org/license/apache-2-0
|
* https://opensource.org/license/apache-2-0
|
||||||
*
|
*
|
||||||
|
|
@ -10,11 +10,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OpenSSL integration helpers (MD5, SHA-256, SHA-512)
|
* OpenSSL integration helpers (MD5, RIPEMD-160, SHA-256, SHA-512)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef FUN_WITH_OPENSSL
|
#ifdef FUN_WITH_OPENSSL
|
||||||
# include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#endif
|
#endif
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
@ -128,3 +128,41 @@ static char *fun_openssl_sha512_hex(const unsigned char *data, size_t len) {
|
||||||
return hex;
|
return hex;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Compute RIPEMD-160 hex of input buffer; returns malloc'ed C string (lowercase hex).
|
||||||
|
* Note: On OpenSSL 3.x, RIPEMD160 may require the legacy provider; if unavailable,
|
||||||
|
* EVP_ripemd160() can return NULL. In that case we return NULL and the VM opcode
|
||||||
|
* will fall back to empty string behavior. When OpenSSL is disabled, return empty string. */
|
||||||
|
static char *fun_openssl_ripemd160_hex(const unsigned char *data, size_t len) {
|
||||||
|
static const char hexdig[] = "0123456789abcdef";
|
||||||
|
if (!data && len != 0) return NULL;
|
||||||
|
#ifdef FUN_WITH_OPENSSL
|
||||||
|
const EVP_MD *md = EVP_ripemd160();
|
||||||
|
if (!md) return NULL;
|
||||||
|
int dlen = EVP_MD_get_size(md);
|
||||||
|
if (dlen <= 0) return NULL;
|
||||||
|
unsigned char *digest = (unsigned char*)malloc((size_t)dlen);
|
||||||
|
if (!digest) return NULL;
|
||||||
|
unsigned int out_len = 0;
|
||||||
|
int ok;
|
||||||
|
if (len == 0) {
|
||||||
|
ok = EVP_Digest(NULL, 0, digest, &out_len, md, NULL);
|
||||||
|
} else {
|
||||||
|
ok = EVP_Digest(data, len, digest, &out_len, md, NULL);
|
||||||
|
}
|
||||||
|
if (ok != 1 || (int)out_len != dlen) { free(digest); return NULL; }
|
||||||
|
char *hex = (char*)malloc((size_t)dlen * 2 + 1);
|
||||||
|
if (!hex) { free(digest); return NULL; }
|
||||||
|
for (int i = 0; i < dlen; ++i) {
|
||||||
|
hex[2*i] = hexdig[(digest[i] >> 4) & 0xF];
|
||||||
|
hex[2*i+1] = hexdig[digest[i] & 0xF];
|
||||||
|
}
|
||||||
|
hex[dlen * 2] = '\0';
|
||||||
|
free(digest);
|
||||||
|
return hex;
|
||||||
|
#else
|
||||||
|
char *hex = (char*)malloc(1);
|
||||||
|
if (hex) hex[0] = '\0';
|
||||||
|
return hex;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1222,6 +1222,14 @@ static int emit_primary(Bytecode *bc, const char *src, size_t len, size_t *pos)
|
||||||
free(name);
|
free(name);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
if (strcmp(name, "openssl_ripemd160") == 0) {
|
||||||
|
(*pos)++; /* '(' */
|
||||||
|
if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "openssl_ripemd160 expects (data)"); free(name); return 0; }
|
||||||
|
if (!consume_char(src, len, pos, ')')) { parser_fail(*pos, "Expected ')' after openssl_ripemd160 arg"); free(name); return 0; }
|
||||||
|
bytecode_add_instruction(bc, OP_OPENSSL_RIPEMD160, 0);
|
||||||
|
free(name);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
/* PCSC builtins */
|
/* PCSC builtins */
|
||||||
if (strcmp(name, "pcsc_establish") == 0) {
|
if (strcmp(name, "pcsc_establish") == 0) {
|
||||||
(*pos)++; /* '(' */
|
(*pos)++; /* '(' */
|
||||||
|
|
|
||||||
3
src/vm.c
3
src/vm.c
|
|
@ -869,10 +869,11 @@ void vm_run(VM *vm, Bytecode *entry) {
|
||||||
#include "vm/curl/download.c"
|
#include "vm/curl/download.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* OpenSSL ops (md5/sha256/sha512) */
|
/* OpenSSL ops (md5/sha256/sha512/ripemd160) */
|
||||||
#include "vm/openssl/md5.c"
|
#include "vm/openssl/md5.c"
|
||||||
#include "vm/openssl/sha256.c"
|
#include "vm/openssl/sha256.c"
|
||||||
#include "vm/openssl/sha512.c"
|
#include "vm/openssl/sha512.c"
|
||||||
|
#include "vm/openssl/ripemd160.c"
|
||||||
|
|
||||||
/* Tk (Tcl/Tk) ops */
|
/* Tk (Tcl/Tk) ops */
|
||||||
#ifdef FUN_WITH_TCLTK
|
#ifdef FUN_WITH_TCLTK
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,15 @@
|
||||||
/**
|
/*
|
||||||
|
* This file is part of the Fun programming language.
|
||||||
|
* https://fun-lang.xyz/
|
||||||
|
*
|
||||||
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
|
* https://opensource.org/license/apache-2-0
|
||||||
|
*
|
||||||
|
* Added: 2026-02-19
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
* OpenSSL MD5 builtin
|
* OpenSSL MD5 builtin
|
||||||
*/
|
*/
|
||||||
case OP_OPENSSL_MD5: {
|
case OP_OPENSSL_MD5: {
|
||||||
|
|
|
||||||
16
src/vm/openssl/ripemd160.c
Normal file
16
src/vm/openssl/ripemd160.c
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
/*
|
||||||
|
* OpenSSL RIPEMD-160 builtin
|
||||||
|
*/
|
||||||
|
case OP_OPENSSL_RIPEMD160: {
|
||||||
|
Value vdata = pop_value(vm);
|
||||||
|
char *s = value_to_string_alloc(&vdata);
|
||||||
|
free_value(vdata);
|
||||||
|
if (!s) { push_value(vm, make_string("")); break; }
|
||||||
|
char *hex = fun_openssl_ripemd160_hex((const unsigned char*)s, strlen(s));
|
||||||
|
free(s);
|
||||||
|
if (!hex) { push_value(vm, make_string("")); break; }
|
||||||
|
Value out = make_string(hex);
|
||||||
|
free(hex);
|
||||||
|
push_value(vm, out);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
@ -1,3 +1,14 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the Fun programming language.
|
||||||
|
* https://fun-lang.xyz/
|
||||||
|
*
|
||||||
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
|
* https://opensource.org/license/apache-2-0
|
||||||
|
*
|
||||||
|
* Added: 2026-02-19
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* OpenSSL SHA-256 builtin
|
* OpenSSL SHA-256 builtin
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,14 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the Fun programming language.
|
||||||
|
* https://fun-lang.xyz/
|
||||||
|
*
|
||||||
|
* Copyright 2026 Johannes Findeisen <you@hanez.org>
|
||||||
|
* Licensed under the terms of the Apache-2.0 license.
|
||||||
|
* https://opensource.org/license/apache-2-0
|
||||||
|
*
|
||||||
|
* Added: 2026-02-19
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* OpenSSL SHA-512 builtin
|
* OpenSSL SHA-512 builtin
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue