aboutsummaryrefslogtreecommitdiff
path: root/lib/Utils.Cryptography/monocypher
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2024-03-24 21:01:06 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2024-03-24 21:01:06 -0400
commit55859158fbd0bf54473a0baeb486045a025c7c5d (patch)
tree380fe100af2b29246398237bfe95f392dc513ffe /lib/Utils.Cryptography/monocypher
parentdd0f384ec3b2fd86ec03aa0fb42387091b5430a7 (diff)
Squashed commit of the following:
commit 6c1667be23597513537f8190e2f55d65eb9b7c7a Author: vnugent <public@vaughnnugent.com> Date: Fri Mar 22 12:01:53 2024 -0400 refactor: Overhauled native library loading and lazy init commit ebf688f2f974295beabf7b5def7e6f6f150551d0 Author: vnugent <public@vaughnnugent.com> Date: Wed Mar 20 22:16:17 2024 -0400 refactor: Update compression header files and macros + Ci build commit 9c7b564911080ccd5cbbb9851a0757b05e1e9047 Author: vnugent <public@vaughnnugent.com> Date: Tue Mar 19 21:54:49 2024 -0400 refactor: JWK overhaul & add length getter to FileUpload commit 6d8c3444e09561e5957491b3cc1ae858e0abdd14 Author: vnugent <public@vaughnnugent.com> Date: Mon Mar 18 16:13:20 2024 -0400 feat: Add FNV1a software checksum and basic correction tests commit 00d182088cecefc08ca80b1faee9bed3f215f40b Author: vnugent <public@vaughnnugent.com> Date: Fri Mar 15 01:05:27 2024 -0400 chore: #6 Use utils filewatcher instead of built-in commit d513c10d9895c6693519ef1d459c6a5a76929436 Author: vnugent <public@vaughnnugent.com> Date: Sun Mar 10 21:58:14 2024 -0400 source tree project location updated
Diffstat (limited to 'lib/Utils.Cryptography/monocypher')
-rw-r--r--lib/Utils.Cryptography/monocypher/CMakeLists.txt1
-rw-r--r--lib/Utils.Cryptography/monocypher/argon2.c6
-rw-r--r--lib/Utils.Cryptography/monocypher/blake2b.h3
-rw-r--r--lib/Utils.Cryptography/monocypher/util.h71
-rw-r--r--lib/Utils.Cryptography/monocypher/vnlib_monocypher.h4
5 files changed, 40 insertions, 45 deletions
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($<$<CONFIG:Debug>: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 <monocypher.h>
+#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 <stdint.h>
#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 <stdlib.h>
-
- /* 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 <memory.h>
-
- #define _memmove(dst, src, size) memmove_s(dst, size, src, size)
- #else
- /* use string.h posix on non-win platforms */
- #include <string.h>
-
- #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"