diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hkdf.c (renamed from src/crypto/hkdf.c) | 0 | ||||
| -rw-r--r-- | src/hkdf.h | 61 | ||||
| -rw-r--r-- | src/nc-crypto.c (renamed from src/crypto/nc-crypto.c) | 9 | ||||
| -rw-r--r-- | src/nc-crypto.h | 59 | ||||
| -rw-r--r-- | src/nc-util.h | 95 | ||||
| -rw-r--r-- | src/noscrypt.c | 34 | ||||
| -rw-r--r-- | src/providers/bcrypt.c (renamed from src/crypto/impl/bcrypt.c) | 3 | ||||
| -rw-r--r-- | src/providers/mbedtls.c (renamed from src/crypto/impl/mbedtls.c) | 24 | ||||
| -rw-r--r-- | src/providers/monocypher.c (renamed from src/crypto/impl/monocypher.c) | 2 | ||||
| -rw-r--r-- | src/providers/openssl.c (renamed from src/crypto/impl/openssl.c) | 61 |
10 files changed, 321 insertions, 27 deletions
diff --git a/src/crypto/hkdf.c b/src/hkdf.c index 0d91d14..0d91d14 100644 --- a/src/crypto/hkdf.c +++ b/src/hkdf.c diff --git a/src/hkdf.h b/src/hkdf.h new file mode 100644 index 0000000..460e203 --- /dev/null +++ b/src/hkdf.h @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2024 Vaughn Nugent +* +* Package: noscrypt +* File: hkdf.h +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 +* of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License +* along with noscrypt. If not, see http://www.gnu.org/licenses/. +*/ + +#pragma once + +#ifndef _NC_HKDF_H +#define _NC_HKDF_H + +#include "nc-util.h" +#include "nc-crypto.h" + +/* +* IMPORTANT: +* The HKDF_IN_BUF_SIZE defintion sets the internal stack buffer size to use +* during fallback HKDF_Expand operations. +* +* 128 bytes should be more than enough for most use cases, without going +* overboard. Could be dialed in better for specific use cases later. +*/ + +#ifndef HKDF_IN_BUF_SIZE + #define HKDF_IN_BUF_SIZE 0x80 +#endif + + +/* typedefs for hdkf callback functions */ + +typedef cstatus_t (*hmac_hash_func)(void* ctx, const cspan_t* data); +typedef cstatus_t (*hmac_finish_fn)(void* ctx, sha256_t hmacOut32); + +struct nc_hkdf_fn_cb_struct +{ + hmac_hash_func update; + hmac_finish_fn finish; +}; + +cstatus_t hkdfExpandProcess( + const struct nc_hkdf_fn_cb_struct* handler, + void* ctx, + const cspan_t* info, + span_t* okm +); + +#endif /* !_NC_HKDF_H */ diff --git a/src/crypto/nc-crypto.c b/src/nc-crypto.c index 587d59d..97b59cb 100644 --- a/src/crypto/nc-crypto.c +++ b/src/nc-crypto.c @@ -20,6 +20,7 @@ #include "nc-util.h" #include "nc-crypto.h" +#include "hkdf.h" /* * Functions are not forced inline, just suggested. @@ -52,19 +53,19 @@ /* * Prioritize embedded builds with mbedtls */ -#include "impl/mbedtls.c" +#include "providers/mbedtls.c" /* * Include openssl as an alternative default * implementation */ -#include "impl/openssl.c" +#include "providers/openssl.c" /* * Include win32 platform specific fallback support * using bcrypt. */ -#include "impl/bcrypt.c" +#include "providers/bcrypt.c" /* * Handle default implementations of secure @@ -95,7 +96,7 @@ * and portable, but not optimized for any specific * platform. */ -#include "impl/monocypher.c" +#include "providers/monocypher.c" #ifdef _IMPL_CRYPTO_SHA256_HMAC diff --git a/src/nc-crypto.h b/src/nc-crypto.h new file mode 100644 index 0000000..f04ebe0 --- /dev/null +++ b/src/nc-crypto.h @@ -0,0 +1,59 @@ + +/* +* Copyright (c) 2024 Vaughn Nugent +* +* Package: noscrypt +* File: nc-crypto.h +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 +* of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License +* along with noscrypt. If not, see http://www.gnu.org/licenses/. +*/ + +#pragma once + +#ifndef _NC_CRYPTO_H +#define _NC_CRYPTO_H + +#include <stdint.h> + +#define CHACHA_NONCE_SIZE 0x0cu /* Size of 12 is set by the cipher spec */ +#define CHACHA_KEY_SIZE 0x20u /* Size of 32 is set by the cipher spec */ +#define SHA256_DIGEST_SIZE 0x20u /* Size of 32 is set by the cipher spec */ + +typedef uint8_t cstatus_t; +#define CSTATUS_OK ((cstatus_t)0x01u) +#define CSTATUS_FAIL ((cstatus_t)0x00u) + +typedef uint8_t sha256_t[SHA256_DIGEST_SIZE]; + +uint32_t ncCryptoFixedTimeComp(const uint8_t* a, const uint8_t* b, uint32_t size); + +void ncCryptoSecureZero(void* ptr, uint32_t size); + +cstatus_t ncCryptoDigestSha256(const cspan_t* data, sha256_t digestOut32); + +cstatus_t ncCryptoHmacSha256(const cspan_t* key, const cspan_t* data, sha256_t hmacOut32); + +cstatus_t ncCryptoSha256HkdfExpand(const cspan_t* prk, const cspan_t* info, span_t* okm); + +cstatus_t ncCryptoSha256HkdfExtract(const cspan_t* salt, const cspan_t* ikm, sha256_t prk); + +cstatus_t ncCryptoChacha20( + const uint8_t key[CHACHA_KEY_SIZE], + const uint8_t nonce[CHACHA_NONCE_SIZE], + const uint8_t* input, + uint8_t* output, + uint32_t dataSize +); + +#endif /* !_NC_CRYPTO_H */ diff --git a/src/nc-util.h b/src/nc-util.h new file mode 100644 index 0000000..dd319c7 --- /dev/null +++ b/src/nc-util.h @@ -0,0 +1,95 @@ + +/* +* Copyright (c) 2024 Vaughn Nugent +* +* Package: noscrypt +* File: nc-util.h +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 +* of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License +* along with noscrypt. If not, see http://www.gnu.org/licenses/. +*/ + +#pragma once + +#ifndef _NC_UTIL_H +#define _NC_UTIL_H + +#include <platform.h> + +/* NULL */ +#ifndef NULL + #define NULL ((void*)0) +#endif /* !NULL */ + +#ifdef DEBUG + /* Must include assert.h for assertions */ + #include <assert.h> + #define DEBUG_ASSERT(x) assert(x); + #define DEBUG_ASSERT2(x, message) assert(x && message); + + /* + * Compiler enabled static assertion keywords are + * only available in C11 and later. Later versions + * have macros built-in from assert.h so we can use + * the static_assert macro directly. + * + * Static assertions are only used for testing such as + * sanity checks and this library targets the c89 standard + * 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); + #elif !defined(STATIC_ASSERT) + #define STATIC_ASSERT(x, m) + #pragma message("Static assertions are not supported by this language version") + #endif + +#else + #define DEBUG_ASSERT(x) + #define DEBUG_ASSERT2(x, message) + #define STATIC_ASSERT(x, m) +#endif + +#include <stdint.h> + +#if SIZE_MAX < UINT32_MAX + #define _overflow_check(x) if(x > SIZE_MAX) return CSTATUS_FAIL; +#else + #define _overflow_check(x) +#endif + +typedef struct memory_span_struct +{ + uint8_t* data; + uint32_t size; +} span_t; + +typedef struct read_only_memory_span_struct +{ + const uint8_t* data; + uint32_t size; +} cspan_t; + +static _nc_fn_inline void ncSpanInitC(cspan_t* span, const uint8_t* data, uint32_t size) +{ + span->data = data; + span->size = size; +} + +static _nc_fn_inline void ncSpanInit(span_t* span, uint8_t* data, uint32_t size) +{ + span->data = data; + span->size = size; +} + +#endif /* !_NC_UTIL_H */
\ No newline at end of file diff --git a/src/noscrypt.c b/src/noscrypt.c index fac3dfb..f1aabd4 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> @@ -52,11 +53,24 @@ #endif /* !NC_DISABLE_INPUT_VALIDATION */ /* +* Actual, private defintion of the NCContext structure +* to allow for future development and ABI backords +* compatability. +*/ +struct nc_ctx_struct { + + void* secpCtx; + +}; + +/* * The Nip44 constant salt * https://github.com/nostr-protocol/nips/blob/master/44.md#encryption */ static const uint8_t Nip44ConstantSalt[8] = { 0x6e, 0x69, 0x70, 0x34, 0x34, 0x2d, 0x76, 0x32 }; +static struct nc_ctx_struct _ncSharedCtx; + struct shared_secret { uint8_t value[NC_SHARED_SEC_SIZE]; }; @@ -90,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") @@ -429,6 +447,12 @@ NC_EXPORT uint32_t NC_CC NCGetContextStructSize(void) return sizeof(NCContext); } +NC_EXPORT NCContext* NC_CC NCGetSharedContext(void) +{ + /*Return the global address of the shared context structure */ + return &_ncSharedCtx; +} + NC_EXPORT NCResult NC_CC NCInitContext( NCContext* ctx, const uint8_t entropy[NC_CONTEXT_ENTROPY_SIZE] @@ -437,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); /* @@ -516,7 +542,9 @@ NC_EXPORT NCResult NC_CC NCValidateSecretKey(const NCContext* ctx, const NCSecre CHECK_CONTEXT_STATE(ctx, 0) /* Validate the secret key */ - return secp256k1_ec_seckey_verify(ctx->secpCtx, sk->key); + return secp256k1_ec_seckey_verify(ctx->secpCtx, sk->key) == 1 + ? NC_SUCCESS + : E_OPERATION_FAILED; } /* Ecdsa Functions */ diff --git a/src/crypto/impl/bcrypt.c b/src/providers/bcrypt.c index 9b01cac..d1b9aa5 100644 --- a/src/crypto/impl/bcrypt.c +++ b/src/providers/bcrypt.c @@ -31,9 +31,6 @@ #include <Windows.h> #include <bcrypt.h> -#include "nc-util.h" -#include "hkdf.h" - #define IF_BC_FAIL(x) if(!BCRYPT_SUCCESS(x)) #define BC_FAIL(x) if(!BCRYPT_SUCCESS(x)) return CSTATUS_FAIL; diff --git a/src/crypto/impl/mbedtls.c b/src/providers/mbedtls.c index 057e7b4..df5201f 100644 --- a/src/crypto/impl/mbedtls.c +++ b/src/providers/mbedtls.c @@ -31,20 +31,22 @@ /* Inline errors on linux in header files on linux */ #ifndef inline #define inline __inline -#endif - -#include <mbedtls/md.h> -#include <mbedtls/hkdf.h> -#include <mbedtls/hmac_drbg.h> -#include <mbedtls/sha256.h> -#include <mbedtls/chacha20.h> -#include <mbedtls/constant_time.h> - -#ifndef inline + #include <mbedtls/md.h> + #include <mbedtls/hkdf.h> + #include <mbedtls/hmac_drbg.h> + #include <mbedtls/sha256.h> + #include <mbedtls/chacha20.h> + #include <mbedtls/constant_time.h> #undef inline +#else + #include <mbedtls/md.h> + #include <mbedtls/hkdf.h> + #include <mbedtls/hmac_drbg.h> + #include <mbedtls/sha256.h> + #include <mbedtls/chacha20.h> + #include <mbedtls/constant_time.h> #endif - _IMPLSTB const mbedtls_md_info_t* _mbed_sha256_alg(void) { const mbedtls_md_info_t* info; diff --git a/src/crypto/impl/monocypher.c b/src/providers/monocypher.c index 7c9faea..8ffe048 100644 --- a/src/crypto/impl/monocypher.c +++ b/src/providers/monocypher.c @@ -31,8 +31,6 @@ #include <monocypher.h> -#include "nc-util.h" - /* Export secure memse0 */ #ifndef _IMPL_SECURE_ZERO_MEMSET diff --git a/src/crypto/impl/openssl.c b/src/providers/openssl.c index fd3b4e6..1f31796 100644 --- a/src/crypto/impl/openssl.c +++ b/src/providers/openssl.c @@ -22,7 +22,6 @@ /* Setup openssl */ #ifdef OPENSSL_CRYPTO_LIB -#include "nc-util.h" #include <openssl/crypto.h> #define _OSSL_FAIL(x) if(!(x)) return CSTATUS_FAIL; @@ -114,7 +113,6 @@ #ifndef _IMPL_CRYPTO_SHA256_HKDF_EXPAND #include <openssl/hmac.h> - #include "hkdf.h" #define _IMPL_CRYPTO_SHA256_HKDF_EXPAND _ossl_sha256_hkdf_expand @@ -150,6 +148,8 @@ EVP_MD_CTX* ctx; cstatus_t result; struct nc_hkdf_fn_cb_struct handler; + + result = CSTATUS_FAIL; /* * NOTE! Hmac reusable flag must be set to allow for multiple @@ -161,15 +161,23 @@ return CSTATUS_FAIL; } - _OSSL_FAIL(EVP_DigestInit_ex2(ctx, EVP_sha256(), NULL)) + if (!EVP_DigestInit_ex2(ctx, EVP_sha256(), NULL)) + { + goto Cleanup; + } - _OSSL_FAIL(EVP_DigestUpdate(ctx, prk->data, prk->size)); + if (!EVP_DigestUpdate(ctx, prk->data, prk->size)) + { + goto Cleanup; + } handler.update = _ossl_hkdf_update; handler.finish = _ossl_hkdf_finish; result = hkdfExpandProcess(&handler, ctx, info, okm); + Cleanup: + EVP_MD_CTX_destroy(ctx); return result; @@ -177,4 +185,49 @@ #endif /* !_IMPL_CRYPTO_SHA256_HKDF_EXPAND */ +#ifndef _IMPL_CHACHA20_CRYPT + + #include <openssl/evp.h> + + #define _IMPL_CHACHA20_CRYPT _ossl_chacha20_crypt + + _IMPLSTB cstatus_t _ossl_chacha20_crypt( + const uint8_t* key, + const uint8_t* nonce, + const uint8_t* input, + uint8_t* output, + uint32_t dataLen + ) + { + cstatus_t result; + EVP_CIPHER_CTX* ctx; + + result = CSTATUS_FAIL; + + if ((ctx = EVP_CIPHER_CTX_new()) == NULL) + { + return CSTATUS_FAIL; + } + + if (!EVP_EncryptInit_ex(ctx, EVP_chacha20(), NULL, key, nonce)) + { + goto Cleanup; + } + + if (!EVP_EncryptUpdate(ctx, output, (int*)&dataLen, input, dataLen)) + { + goto Cleanup; + } + + result = CSTATUS_OK; + + Cleanup: + + EVP_CIPHER_CTX_free(ctx); + + return result; + } + +#endif + #endif /*!OPENSSL_CRYPTO_LIB */
\ No newline at end of file |