Changeset 96763 in vbox for trunk/src/VBox/Runtime/common/crypto

Timestamp:

Sep 16, 2022 9:10:51 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Put the optional OpenSSL related members in RTCRKEYINT at the end of the structure and added a flag to indicate whether they're there or not. This means users of the structure other than key.cpp and key-openssl.cpp can safely ignore the IPRT_WITH_OPENSSL flag. This is relevant for build programs like bldRTSignTool. bugref:8691

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• key-internal.h (modified) (3 diffs)
• key-openssl.cpp (modified) (2 diffs)
• key.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/crypto/key-internal.h

@@ -61 +61 @@
     uint32_t                    cBits;
 
-#if defined(IPRT_WITH_OPENSSL)
-    /** Size of raw key copy. */
-    uint32_t                    cbEncoded;
-    /** Raw copy of the key, for openssl and such.
-     * If sensitive, this is a safer allocation, otherwise it follows the structure. */
-    uint8_t                    *pbEncoded;
-#endif
-
     /** Type specific data. */
     union
@@ -93 +85 @@
         } RsaPublic;
     } u;
+
+#if defined(IPRT_WITH_OPENSSL)
+    /** Size of raw key copy. */
+    uint32_t                    cbEncoded;
+    /** Raw copy of the key, for openssl and such.
+     * If sensitive, this is a safer allocation, otherwise it follows the structure. */
+    uint8_t                    *pbEncoded;
+#endif
 } RTCRKEYINT;
 /** Pointer to a crypographic key. */
@@ -109 +109 @@
 /** Set if public key bits are present. */
 #define RTCRKEYINT_F_PUBLIC             UINT32_C(0x00000004)
+/** Set if the cbEncoded/pbEncoded members are present. */
+#define RTCRKEYINT_F_INCLUDE_ENCODED    UINT32_C(0x00000008)
 /** @} */
 

trunk/src/VBox/Runtime/common/crypto/key-openssl.cpp

@@ -77 +77 @@
     AssertReturn(hKey->u32Magic == RTCRKEYINT_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(fNeedPublic == !(hKey->fFlags & RTCRKEYINT_F_PRIVATE), VERR_WRONG_TYPE);
+    AssertReturn(hKey->fFlags & RTCRKEYINT_F_INCLUDE_ENCODED, VERR_WRONG_TYPE); /* build misconfig */
 
     rtCrOpenSslInit();
@@ -140 +141 @@
     AssertReturn(hKey->u32Magic == RTCRKEYINT_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(fNeedPublic == !(hKey->fFlags & RTCRKEYINT_F_PRIVATE), VERR_WRONG_TYPE);
+    AssertReturn(hKey->fFlags & RTCRKEYINT_F_INCLUDE_ENCODED, VERR_WRONG_TYPE); /* build misconfig */
 
     rtCrOpenSslInit();

trunk/src/VBox/Runtime/common/crypto/key.cpp

@@ -76 +76 @@
         pThis->fFlags       = fFlags;
 #if defined(IPRT_WITH_OPENSSL)
+        pThis->fFlags      |= RTCRKEYINT_F_INCLUDE_ENCODED;
         pThis->cbEncoded    = cbEncoded;
         if (!(fFlags & RTCRKEYINT_F_SENSITIVE))