diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2020-08-05 20:49:27 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2020-08-05 20:49:27 +0000 |
| commit | 1d4c24c0edf3453aae20d13bce49f358330965b3 (patch) | |
| tree | 64e39239d500f18a25c21ec5477a56c48b8c1581 | |
| parent | 4fa500c3dc139ae00800889444b2100e167c755e (diff) | |
| download | VirtualBox-svn-1d4c24c0edf3453aae20d13bce49f358330965b3.tar.gz | |
IPRT: SHA-3 nits. bugref:9734
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@85623 cfe28804-0f27-0410-a406-dd0f0b0b656f
| -rw-r--r-- | src/VBox/Runtime/common/checksum/openssl-sha3.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/VBox/Runtime/common/checksum/openssl-sha3.cpp b/src/VBox/Runtime/common/checksum/openssl-sha3.cpp index 1be441eb3ad..62fc60c7f57 100644 --- a/src/VBox/Runtime/common/checksum/openssl-sha3.cpp +++ b/src/VBox/Runtime/common/checksum/openssl-sha3.cpp @@ -26,6 +26,7 @@ #if 1 /* For now: */ # include "alt-sha3.cpp" + #else @@ -33,12 +34,26 @@ * Header Files * *********************************************************************************************************************************/ #include "internal/iprt.h" +#include <iprt/assert.h> +#include <iprt/err.h> +#include <iprt/string.h> #include "internal/openssl-pre.h" #include <openssl/evp.h> #include "internal/openssl-post.h" +/********************************************************************************************************************************* +* Defined Constants And Macros * +*********************************************************************************************************************************/ +#define RTSHA3PRIVATECTX_MAGIC UINT64_C(0xb6362d323c56b758) +#define RTSHA3PRIVATECTX_MAGIC_FINAL UINT64_C(0x40890fe0e474215d) +#define RTSHA3PRIVATECTX_MAGIC_DEAD UINT64_C(0xdead7a05081cbeef) + + +/********************************************************************************************************************************* +* Structures and Typedefs * +*********************************************************************************************************************************/ /* Internal EVP structure that we fake here to avoid lots of casting. */ struct evp_md_ctx_st { @@ -58,17 +73,6 @@ typedef struct RTSHA3PRIVATECTX #include <iprt/sha.h> AssertCompile(RT_SIZEOFMEMB(RTSHA3CONTEXT, abPadding) >= RT_SIZEOFMEMB(RTSHA3CONTEXT, Private)); -#include <iprt/assert.h> -#include <iprt/err.h> -#include <iprt/string.h> - - -/********************************************************************************************************************************* -* Defined Constants And Macros * -*********************************************************************************************************************************/ -#define RTSHA3PRIVATECTX_MAGIC UINT64_C(0xb6362d323c56b758) -#define RTSHA3PRIVATECTX_MAGIC_FINAL UINT64_C(0x40890fe0e474215d) -#define RTSHA3PRIVATECTX_MAGIC_DEAD UINT64_C(0xdead7a05081cbeef) static int rtSha3Init(PRTSHA3CONTEXT pCtx, const EVP_MD *pMdType) |