Changeset 74712 in vbox for trunk/src/VBox

Timestamp:

Oct 9, 2018 10:02:18 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/crypto: 2nd attempt at dealing with system openssl where RC4_INT is defined as something other than "unsigned int" (which isn't available in include/iprt/crypto/rc4.h, so there's no other option than relaxing the compile time assertion) in these cases.

File:

• trunk/src/VBox/Runtime/common/crypto/rc4-openssl.cpp (modified) (2 diffs)

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

@@ -42 +42 @@
 RTDECL(void) RTCrRc4SetKey(PRTCRRC4KEY pKey, size_t cbData, void const *pvData)
 {
-    AssertCompile(sizeof(pKey->au64Padding) == sizeof(pKey->Ossl));
+
+    AssertCompile(sizeof(RC4_INT) == 4 ? sizeof(pKey->au64Padding) == sizeof(pKey->Ossl) : sizeof(pKey->au64Padding) >= sizeof(pKey->Ossl));
     Assert((int)cbData == (ssize_t)cbData);
     AssertPtr(pKey);
@@ -52 +53 @@
 RTDECL(void) RTCrRc4(PRTCRRC4KEY pKey, size_t cbData, void const *pvDataIn, void *pvDataOut)
 {
-    AssertCompile(sizeof(pKey->au64Padding) == sizeof(pKey->Ossl));
+    AssertCompile(sizeof(RC4_INT) == 4 ? sizeof(pKey->au64Padding) == sizeof(pKey->Ossl) : sizeof(pKey->au64Padding) >= sizeof(pKey->Ossl));
     Assert((int)cbData == (ssize_t)cbData);
     AssertPtr(pKey);