From 00d182088cecefc08ca80b1faee9bed3f215f40b Mon Sep 17 00:00:00 2001 From: vnugent Date: Fri, 15 Mar 2024 01:05:27 -0400 Subject: chore: #6 Use utils filewatcher instead of built-in --- lib/Utils.Cryptography/monocypher/CMakeLists.txt | 1 + lib/Utils.Cryptography/monocypher/argon2.c | 6 +- lib/Utils.Cryptography/monocypher/blake2b.h | 3 +- lib/Utils.Cryptography/monocypher/util.h | 71 ++++++++++------------ .../monocypher/vnlib_monocypher.h | 4 +- 5 files changed, 40 insertions(+), 45 deletions(-) (limited to 'lib/Utils.Cryptography') diff --git a/lib/Utils.Cryptography/monocypher/CMakeLists.txt b/lib/Utils.Cryptography/monocypher/CMakeLists.txt index 9b17ea7..8cec60b 100644 --- a/lib/Utils.Cryptography/monocypher/CMakeLists.txt +++ b/lib/Utils.Cryptography/monocypher/CMakeLists.txt @@ -39,6 +39,7 @@ message(STATUS "Build type is '${CMAKE_BUILD_TYPE}'") #if debug add_compile_definitions($<$:DEBUG>) +add_compile_definitions(VNLIB_EXPORTING) #setup flags for windows compilation diff --git a/lib/Utils.Cryptography/monocypher/argon2.c b/lib/Utils.Cryptography/monocypher/argon2.c index 9b13ce0..2606e73 100644 --- a/lib/Utils.Cryptography/monocypher/argon2.c +++ b/lib/Utils.Cryptography/monocypher/argon2.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * vnlib_monocypher is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -18,9 +18,11 @@ #include "argon2.h" #include +#define ARGON2_WORK_AREA_MULTIPLIER 1024 + VNLIB_EXPORT uint32_t VNLIB_CC Argon2CalcWorkAreaSize(const argon2Ctx* context) { - return context->m_cost * 1024; + return context->m_cost * ARGON2_WORK_AREA_MULTIPLIER; } /* diff --git a/lib/Utils.Cryptography/monocypher/blake2b.h b/lib/Utils.Cryptography/monocypher/blake2b.h index 4167aca..0a0b4f8 100644 --- a/lib/Utils.Cryptography/monocypher/blake2b.h +++ b/lib/Utils.Cryptography/monocypher/blake2b.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * vnlib_monocypher is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -17,6 +17,7 @@ #pragma once #ifndef VN_MONOCYPHER_BLAKE2_H +#define VN_MONOCYPHER_BLAKE2_H #include #include "util.h" diff --git a/lib/Utils.Cryptography/monocypher/util.h b/lib/Utils.Cryptography/monocypher/util.h index 68b3e51..7a9f638 100644 --- a/lib/Utils.Cryptography/monocypher/util.h +++ b/lib/Utils.Cryptography/monocypher/util.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * vnlib_monocypher is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -16,47 +16,38 @@ */ #pragma once -#ifndef VN_MONOCYPHER_UTIL_H +#ifndef VN_MONOCYPHER_UTIL_H +#define VN_MONOCYPHER_UTIL_H -#if defined(__GNUC__) - #define inline __inline__ - #define VNLIB_EXPORT __attribute__((visibility("default"))) - #define VNLIB_CC -#elif defined(_MSC_VER) - #define VNLIB_EXPORT __declspec(dllexport) - #define VNLIB_CC __cdecl -#endif /* WIN32 */ - -#ifdef USE_MEM_UTIL - - /* Include stdlib for malloc */ - #include - - /* If a custom allocator is not defined, set macros for built-in function */ - #ifndef CUSTOM_ALLOCATOR - - /* malloc and friends fallback if not defined */ - #define vnmalloc(size) malloc(size) - #define vncalloc(count, size) calloc(count, size) - #define vnrealloc(ptr, size) realloc(ptr, size) - #define vnfree(ptr) free(ptr) - - #endif /* !CUSTOM_ALLOCATOR */ - - #ifdef WIN32 - - /* required for memove on windows */ - #include - - #define _memmove(dst, src, size) memmove_s(dst, size, src, size) - #else - /* use string.h posix on non-win platforms */ - #include - - #define _memmove memmove - #endif /* WIN32 */ +#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) + #define _P_IS_WINDOWS +#endif -#endif // USE_MEM_UTIL +//Set api export calling convention (allow used to override) +#ifndef VNLIB_CC + #ifdef _P_IS_WINDOWS + //STD for importing to other languages such as .NET + #define VNLIB_CC __stdcall + #else + #define VNLIB_CC + #endif +#endif // !NC_CC + +#ifndef VNLIB_EXPORT //Allow users to disable the export/impoty macro if using source code directly + #ifdef VNLIB_EXPORTING + #ifdef _P_IS_WINDOWS + #define VNLIB_EXPORT __declspec(dllexport) + #else + #define VNLIB_EXPORT __attribute__((visibility("default"))) + #endif // _NC_IS_WINDOWS + #else + #ifdef _P_IS_WINDOWS + #define VNLIB_EXPORT __declspec(dllimport) + #else + #define VNLIB_EXPORT + #endif // _P_IS_WINDOWS + #endif // !VNLIB_EXPORTING +#endif // !VNLIB_EXPORT #ifndef _In_ #define _In_ diff --git a/lib/Utils.Cryptography/monocypher/vnlib_monocypher.h b/lib/Utils.Cryptography/monocypher/vnlib_monocypher.h index 920def9..943431a 100644 --- a/lib/Utils.Cryptography/monocypher/vnlib_monocypher.h +++ b/lib/Utils.Cryptography/monocypher/vnlib_monocypher.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * vnlib_monocypher is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -16,7 +16,7 @@ */ #pragma once -#ifndef VNLIB_MONOCYPHER_H +#ifndef VNLIB_MONOCYPHER_H #define VNLIB_MONOCYPHER_H #include "util.h" -- cgit