Changeset 85623 in vbox for trunk/src/VBox/Runtime/common/checksum

Timestamp:

Aug 5, 2020 8:49:27 PM (4 years ago)

Author:

vboxsync

Message:

IPRT: SHA-3 nits. bugref:9734

File:

• trunk/src/VBox/Runtime/common/checksum/openssl-sha3.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/checksum/openssl-sha3.cpp

@@ -27 +27 @@
 #if 1 /* For now: */
 # include "alt-sha3.cpp"
+
 #else
 
@@ -34 +35 @@
 *********************************************************************************************************************************/
 #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"
-
-
-/* Internal EVP structure that we fake here to avoid lots of casting. */
-struct evp_md_ctx_st
-{
-    void *apvWhatever[10];
-};
-
-/** The OpenSSL private context structure. */
-typedef struct RTSHA3PRIVATECTX
-{
-    /** RTSHA3PRIVATECTX_MAGIC / RTSHA3PRIVATECTX_MAGIC_FINAL / RTSHA3PRIVATECTX_MAGIC_DEAD */
-    uint64_t                u64Magic;
-    /** The OpenSSL context.  We cheat to avoid EVP_MD_CTX_new/free. */
-    struct evp_md_ctx_st    MdCtx;
-} RTSHA3PRIVATECTX;
-
-#define RT_SHA3_PRIVATE_CONTEXT
-#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>
 
 
@@ -70 +50 @@
 #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
+{
+    void *apvWhatever[10];
+};
+
+/** The OpenSSL private context structure. */
+typedef struct RTSHA3PRIVATECTX
+{
+    /** RTSHA3PRIVATECTX_MAGIC / RTSHA3PRIVATECTX_MAGIC_FINAL / RTSHA3PRIVATECTX_MAGIC_DEAD */
+    uint64_t                u64Magic;
+    /** The OpenSSL context.  We cheat to avoid EVP_MD_CTX_new/free. */
+    struct evp_md_ctx_st    MdCtx;
+} RTSHA3PRIVATECTX;
+
+#define RT_SHA3_PRIVATE_CONTEXT
+#include <iprt/sha.h>
+AssertCompile(RT_SIZEOFMEMB(RTSHA3CONTEXT, abPadding) >= RT_SIZEOFMEMB(RTSHA3CONTEXT, Private));
+