Changeset 94119 in vbox for trunk/src/libs

Timestamp:

Mar 7, 2022 7:00:43 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150368

Message:

libs/openssl-3.0.1: Some Windows build fixes, bugref:10128

Location:

trunk/src/libs/openssl-3.0.1

Files:

• Config.kmk (modified) (2 diffs)
• crypto/Makefile.kmk (modified) (1 diff)
• crypto/chacha/Makefile.kmk (modified) (1 diff)
• crypto/engine/eng_list.c (modified) (1 diff)
• crypto/poly1305/poly1305.c (modified) (1 diff)
• include/crypto/chacha.h (modified) (1 diff)
• include/crypto/poly1305.h (modified) (1 diff)

trunk/src/libs/openssl-3.0.1/Config.kmk

@@ -36 +36 @@
 VBOX_PATH_CRYPTO_MD5        := $(VBOX_PATH_CRYPTO)/md5
 VBOX_PATH_CRYPTO_MODES      := $(VBOX_PATH_CRYPTO)/modes
+VBOX_PATH_CRYPTO_POLY1305   := $(VBOX_PATH_CRYPTO)/poly1305
 VBOX_PATH_CRYPTO_RC4        := $(VBOX_PATH_CRYPTO)/rc4
 VBOX_PATH_CRYPTO_SHA        := $(VBOX_PATH_CRYPTO)/sha
@@ -212 +213 @@
         VPAES_ASM \
         ECP_NISTZ256_ASM \
-        PADLOCK_ASM
-#       POLY1305_ASM @todo Later
+        PADLOCK_ASM \
+        POLY1305_ASM
 TEMPLATE_LIBCRYPTO_DEFS.amd64 = \
         BSAES_ASM \

trunk/src/libs/openssl-3.0.1/crypto/Makefile.kmk

@@ -161 +161 @@
         recreate-md5-asm \
         recreate-modes-asm \
+        recreate-poly1305-asm \
         recreate-rc4-asm \
         recreate-sha-asm

trunk/src/libs/openssl-3.0.1/crypto/chacha/Makefile.kmk

@@ -17 +17 @@
 crypto_chacha_TEMPLATE = SUBLIBCRYPTO
 crypto_chacha_DEFS = OPENSSL_NO_DEPRECATED
-ifdef VBOX_WITH_CRYPTO_ASM
- crypto_chacha_SOURCES.x86 += \
-        $(VBOX_PATH_CRYPTO_GENASM)/chacha-x86.S
- crypto_chacha_SOURCES.amd64 += \
-        $(VBOX_PATH_CRYPTO_GENASM)/chacha-x86_64.S
-else
+#ifdef VBOX_WITH_CRYPTO_ASM
+# crypto_chacha_SOURCES.x86 += \
+#       $(VBOX_PATH_CRYPTO_GENASM)/chacha-x86.S
+# crypto_chacha_SOURCES.amd64 += \
+#       $(VBOX_PATH_CRYPTO_GENASM)/chacha-x86_64.S
+#else
  crypto_chacha_SOURCES += chacha_enc.c
-endif
+#endif
 $(evalcall VBOX_OPENSSL_X86,crypto_chacha)
 

trunk/src/libs/openssl-3.0.1/crypto/engine/eng_list.c

@@ -427 +427 @@
         return iterator;
     }
+
+ notfound:
 #endif
- notfound:
     ENGINE_free(iterator);
     ERR_raise_data(ERR_LIB_ENGINE, ENGINE_R_NO_SUCH_ENGINE, "id=%s", id);

trunk/src/libs/openssl-3.0.1/crypto/poly1305/poly1305.c

@@ -458 +458 @@
 
 #ifdef POLY1305_ASM
+
+#ifdef ___openssl_mangling_h___        /* aeichner */
+# undef poly1305_blocks
+# undef poly1305_emit
+#endif /* !___openssl_mangling_h___*/   /* aeichner */
+
 /*
  * This "eclipses" poly1305_blocks and poly1305_emit, but it's

trunk/src/libs/openssl-3.0.1/include/crypto/chacha.h

@@ -12 +12 @@
 # pragma once
 
-#ifdef VBOX
+#if defined(VBOX) && !defined(RT_OS_WINDOWS)
 # include "openssl-mangling.h"
 #endif

trunk/src/libs/openssl-3.0.1/include/crypto/poly1305.h

@@ -12 +12 @@
 # pragma once
 
-#ifdef VBOX
-# include "openssl-mangling.h"
+#if defined(VBOX)
+# include <openssl/opensslconf.h>
 #endif
 #include <stddef.h>