diff options
| author | Dimitri Staessens <Dimitri.Staessens@Quantum.Com> | 2026-01-28 00:35:28 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2026-02-02 08:07:04 +0100 |
| commit | 37e3dbdd8206e4f0f03fab13ff3f38aa932be065 (patch) | |
| tree | c7508d4a50bb8a1e6025b489418a5f9aae4a308e /src/irmd | |
| parent | e9fb0eb1130a8efacab3add17f524197a9044a88 (diff) | |
| download | ouroboros-37e3dbdd8206e4f0f03fab13ff3f38aa932be065.tar.gz ouroboros-37e3dbdd8206e4f0f03fab13ff3f38aa932be065.zip | |
lib: Fix OpenSSL includes and explicit_bzero on OSX
The include headers and NIDs are different on macOS X. It also doesn't
have explicit_bzero.
The crypt.h includes are now guarded to work on OS X (trying to avoid
the includes by defining the OpenSSL mac header guard led to a whole
list of other issues).
The explicit zero'ing of buffers temporarily holding secrets has now
been abstracted in a crypt_secure_clear() function defaulting to
OpenSSL_cleanse, explicit_bzero (if present) or a best-effort option
using a volatile pointer.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/irmd')
| -rw-r--r-- | src/irmd/main.c | 2 | ||||
| -rw-r--r-- | src/irmd/oap/cli.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index e67fdd23..5b787a24 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1553,7 +1553,7 @@ static irm_msg_t * do_command_msg(irm_msg_t * msg) else ret_msg->result = res; - explicit_bzero(kbuf, SYMMKEYSZ); + crypt_secure_clear(kbuf, SYMMKEYSZ); return ret_msg; } diff --git a/src/irmd/oap/cli.c b/src/irmd/oap/cli.c index 12660d7f..ea2a25d1 100644 --- a/src/irmd/oap/cli.c +++ b/src/irmd/oap/cli.c @@ -191,7 +191,7 @@ static int do_client_kex_prepare_kem_encap(const char * server_name, return -ENOMEM; } memcpy(s->key, key_buf, SYMMKEYSZ); - explicit_bzero(key_buf, SYMMKEYSZ); + crypt_secure_clear(key_buf, SYMMKEYSZ); return 0; } @@ -395,7 +395,7 @@ static int do_client_kex_complete_kem(struct oap_cli_ctx * s, memcpy(sk->key, key_buf, SYMMKEYSZ); sk->nid = kcfg->c.nid; - explicit_bzero(key_buf, SYMMKEYSZ); + crypt_secure_clear(key_buf, SYMMKEYSZ); log_info_id(id, "Negotiated %s + %s.", kcfg->x.str, kcfg->c.str); @@ -425,7 +425,7 @@ static int do_client_kex_complete_dhe(struct oap_cli_ctx * s, memcpy(sk->key, key_buf, SYMMKEYSZ); sk->nid = kcfg->c.nid; - explicit_bzero(key_buf, SYMMKEYSZ); + crypt_secure_clear(key_buf, SYMMKEYSZ); log_info_id(id, "Negotiated %s + %s.", kcfg->x.str, kcfg->c.str); |