diff options
| author |  vnugent <public@vaughnnugent.com> | 2024-05-27 14:52:41 -0400 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2024-05-27 14:52:41 -0400 |
| commit | 718be80a4810b9352de7eb0707da54020aa6b649 (patch) | |
| tree | 434c302ffbea4c5417090de0bbe24b2af2125c52 /src | |
| parent | a8a6efb2319f739e5faae550561dc27d9dd1e88d (diff) | |
fix: Properly build mbedtls & cmake fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/nc-util.h | 4 | ||||
| -rw-r--r-- | src/noscrypt.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/nc-util.h b/src/nc-util.h index 8fb74ff..dd319c7 100644 --- a/src/nc-util.h +++ b/src/nc-util.h @@ -24,7 +24,7 @@ #ifndef _NC_UTIL_H #define _NC_UTIL_H -#include "platform.h" +#include <platform.h> /* NULL */ #ifndef NULL @@ -48,7 +48,7 @@ * so static_assret very likely will not be available. */ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #define STATIC_ASSERT(x, m) static_assert(x, m) + #define STATIC_ASSERT(x, m) static_assert(x, m); #elif !defined(STATIC_ASSERT) #define STATIC_ASSERT(x, m) #pragma message("Static assertions are not supported by this language version") diff --git a/src/noscrypt.c b/src/noscrypt.c index d1c7dca..258ba8d 100644 --- a/src/noscrypt.c +++ b/src/noscrypt.c @@ -21,6 +21,7 @@ #include "noscrypt.h" #include "nc-util.h" +#include "hkdf.h" #include "nc-crypto.h" #include <secp256k1/secp256k1_ecdh.h> @@ -103,13 +104,17 @@ STATIC_ASSERT(sizeof(struct nc_expand_keys) == sizeof(struct message_key), "Expe * Check that the fallback hkdf extract internal buffer is large enough * for full converstation key buffers */ -STATIC_ASSERT(HKDF_IN_BUF_SIZE >= NC_CONV_KEY_SIZE + 8, "HKDF Buffer size is too small for Safe HKDF operations") +STATIC_ASSERT(HKDF_IN_BUF_SIZE >= NC_CONV_KEY_SIZE + 8, "HKDF Buffer size is too small for safe HKDF operations") /* * Internal helper functions to do common structure conversions */ -static _nc_fn_inline int _convertToXonly(const NCContext* ctx, const NCPublicKey* compressedPubKey, secp256k1_xonly_pubkey* xonly) +static _nc_fn_inline int _convertToXonly( + const NCContext* ctx, + const NCPublicKey* compressedPubKey, + secp256k1_xonly_pubkey* xonly +) { DEBUG_ASSERT2(ctx != NULL, "Expected valid context") DEBUG_ASSERT2(compressedPubKey != NULL, "Expected a valid public 32byte key structure") @@ -456,6 +461,8 @@ NC_EXPORT NCResult NC_CC NCInitContext( CHECK_NULL_ARG(ctx, 0) CHECK_NULL_ARG(entropy, 1) + ZERO_FILL(ctx, sizeof(NCContext)); + ctx->secpCtx = secp256k1_context_create(SECP256K1_CONTEXT_NONE); /* |