erts,erl_interface: Add alternative to openssl for MD5

Backported from 29(master) to 28
from af62c54
and 6281ea6

Made optional with configure --disable-builtin-openssl
or with --enable-use-embedded-3pp-alternatives.

Author: sverker

erts/config.h.in

@@ -81,6 +81,9 @@
 /* Define if builtin errno id should be used */
 #undef ERTS_USE_BUILTIN_ERRNO_ID
 
+/* Define if builtin OpenSSL should be used for MD5 */
+#undef ERTS_USE_BUILTIN_OPENSSL
+
 /* Define if builtin ryu should be used */
 #undef ERTS_USE_BUILTIN_RYU
 

erts/configure

@@ -672,6 +672,7 @@ SYSTEMD_DAEMON_LIBS
 SOCKET_LIBS
 Z_LIB
 LIBZSTD
+ERTS_USE_BUILTIN_OPENSSL
 ERTS_USE_BUILTIN_ERRNO_ID
 TERMCAP_LIB
 THR_DEFS
@@ -858,6 +859,7 @@ with_threadnames
 enable_use_embedded_3pp_alternatives
 enable_builtin_errno_id
 enable_builtin_ryu
+enable_builtin_openssl
 enable_builtin_zstd
 enable_builtin_zlib
 enable_esock
@@ -1622,6 +1624,10 @@ Optional Features:
   --enable-builtin-ryu    use our own built-in ryu for float to short string
                           (default)
   --disable-builtin-ryu   use C++17 as an alternative for built-in ryu
+  --enable-builtin-openssl
+                          use our own built-in OpenSSL for MD5 (default)
+  --disable-builtin-openssl
+                          use an alternative for built-in OpenSSL
   --enable-builtin-zstd   force use of our own built-in zstd (default)
   --disable-builtin-zstd  try to find a static libzstd on the system to use
   --enable-builtin-zlib   force use of our own built-in zlib
@@ -16682,12 +16688,14 @@ then :
     no)
       builtin_errno_id=yes
       builtin_ryu=yes
+      builtin_openssl=yes
       builtin_zstd=yes
       builtin_zlib=yes
       ;;
     *)
       builtin_errno_id=no
       builtin_ryu=no
+      builtin_openssl=no
       builtin_zstd=no
       builtin_zlib=no
       ;;
@@ -16750,6 +16758,33 @@ fi
 
 
 
+# Check whether --enable-builtin-openssl was given.
+if test ${enable_builtin_openssl+y}
+then :
+  enableval=$enable_builtin_openssl; case "$enableval" in
+      no) builtin_openssl=no ;;
+      *)  builtin_openssl=yes ;;
+   esac
+fi
+
+
+if test "$builtin_openssl" = "no"
+then :
+
+        ERTS_USE_BUILTIN_OPENSSL=no
+
+else case e in #(
+  e)
+
+printf "%s\n" "#define ERTS_USE_BUILTIN_OPENSSL 1" >>confdefs.h
+
+        ERTS_USE_BUILTIN_OPENSSL=yes
+       ;;
+esac
+fi
+
+
+
 # Check whether --enable-builtin-zstd was given.
 if test ${enable_builtin_zstd+y}
 then :

erts/configure.ac

@@ -1264,12 +1264,14 @@ AS_HELP_STRING([--disable-use-embedded-3pp-alternatives],
     no)
       builtin_errno_id=yes
       builtin_ryu=yes
+      builtin_openssl=yes
       builtin_zstd=yes
       builtin_zlib=yes
       ;;
     *)
       builtin_errno_id=no
       builtin_ryu=no
+      builtin_openssl=no
       builtin_zstd=no
       builtin_zlib=no
       ;;
@@ -1321,6 +1323,30 @@ AS_HELP_STRING([--disable-builtin-ryu],
       *)  builtin_ryu=yes ;;
    esac])
 
+dnl -------------
+dnl openssl (MD5)
+dnl -------------
+
+AC_ARG_ENABLE(builtin-openssl,
+AS_HELP_STRING([--enable-builtin-openssl],
+               [use our own built-in OpenSSL for MD5 (default)])
+AS_HELP_STRING([--disable-builtin-openssl],
+               [use an alternative for built-in OpenSSL]),
+  [case "$enableval" in
+      no) builtin_openssl=no ;;
+      *)  builtin_openssl=yes ;;
+   esac])
+
+AS_IF([test "$builtin_openssl" = "no"],
+      [
+        ERTS_USE_BUILTIN_OPENSSL=no
+      ],
+      [
+        AC_DEFINE(ERTS_USE_BUILTIN_OPENSSL, [1], [Define if builtin OpenSSL should be used for MD5])
+        ERTS_USE_BUILTIN_OPENSSL=yes
+      ])
+AC_SUBST(ERTS_USE_BUILTIN_OPENSSL)
+
 dnl -------------
 dnl zstd
 dnl -------------

erts/emulator/Makefile.in

@@ -39,6 +39,7 @@ NO_INLINE_FUNCTIONS=false
 USING_VC=@MIXED_VC@
 VISIBILITY_HIDDEN=@VISIBILITY_HIDDEN@
 ERTS_USE_BUILTIN_RYU=@ERTS_USE_BUILTIN_RYU@
+ERTS_USE_BUILTIN_OPENSSL=@ERTS_USE_BUILTIN_OPENSSL@
 
 OPCODE_TABLES = \
     $(ERL_TOP)/lib/compiler/src/genop.tab \
@@ -394,13 +395,15 @@ LIBS += $(RYU_LIBRARY)
 endif
 endif
 
+ifeq ($(ERTS_USE_BUILTIN_OPENSSL),yes)
 DEPLIBS += $(OPENSSL_LIB)
 ifeq ($(TARGET),win32)
 LIBS += -L$(OPENSSL_OBJDIR) -l$(OPENSSL_LIB_NAME)
 else
 # Build on darwin fails if -l$(OPENSSL_LIB_NAME) is used
 LIBS += $(OPENSSL_LIB)
 endif
+endif
 
 ifdef LIBZSTD
 # Use system libzstd
@@ -542,7 +545,9 @@ include pcre/pcre.mk
 ifeq ($(ERTS_USE_BUILTIN_RYU),yes)
 include ryu/ryu.mk
 endif
+ifeq ($(ERTS_USE_BUILTIN_OPENSSL),yes)
 include openssl/openssl.mk
+endif
 include zstd/zstd.mk
 
 $(ERTS_LIB):
@@ -859,7 +864,10 @@ endif
 ifeq ($(ERTS_USE_BUILTIN_RYU),yes)
 COMMON_INCLUDES += -Iryu
 endif
-COMMON_INCLUDES += -Ipcre -Iopenssl/include
+ifeq ($(ERTS_USE_BUILTIN_OPENSSL),yes)
+COMMON_INCLUDES += -Iopenssl/include
+endif
+COMMON_INCLUDES += -Ipcre
 COMMON_INCLUDES += -I../include -I../include/$(TARGET)
 COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)
 
@@ -1205,6 +1213,10 @@ RUN_OBJS += \
 	$(OBJDIR)/erl_iolist.o \
 	$(OBJDIR)/erl_etp.o
 
+ifneq ($(ERTS_USE_BUILTIN_OPENSSL),yes)
+RUN_OBJS += $(OBJDIR)/erl_md5.o
+endif
+
 LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o
 
 NIF_OBJS = \

erts/emulator/beam/beam_file.c

@@ -1262,23 +1262,23 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
 
     /* Compute module checksum. Please keep all parsing above this section */
     {
-        MD5_CTX md5;
+        erts_md5_state md5;
 
-        MD5Init(&md5);
+        erts_md5_init(&md5);
 
-        MD5Update(&md5,
+        erts_md5_update(&md5,
                   (byte*)chunks[UTF8_ATOM_CHUNK].data,
                   chunks[UTF8_ATOM_CHUNK].size);
-        MD5Update(&md5,
+        erts_md5_update(&md5,
                   (byte*)chunks[CODE_CHUNK].data,
                   chunks[CODE_CHUNK].size);
-        MD5Update(&md5,
+        erts_md5_update(&md5,
                   (byte*)chunks[STR_CHUNK].data,
                   chunks[STR_CHUNK].size);
-        MD5Update(&md5,
+        erts_md5_update(&md5,
                   (byte*)chunks[IMP_CHUNK].data,
                   chunks[IMP_CHUNK].size);
-        MD5Update(&md5,
+        erts_md5_update(&md5,
                   (byte*)chunks[EXP_CHUNK].data,
                   chunks[EXP_CHUNK].size);
 
@@ -1290,7 +1290,7 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
             * checksum hash, as it's derived using a (broken and superseded)
             * endian-dependent hash function. */
             if (left >= 4) {
-                MD5Update(&md5, (byte*)start, 4);
+                erts_md5_update(&md5, (byte*)start, 4);
 
                 start += 4;
                 left -= 4;
@@ -1299,9 +1299,9 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
                     static byte zero[4] = {0, 0, 0, 0};
 
                     /* Include: Function Arity Index NumFree */
-                    MD5Update(&md5, (byte*)start, 20);
+                    erts_md5_update(&md5, (byte*)start, 20);
                     /* Set to zero: OldUniq */
-                    MD5Update(&md5, (byte*)zero, 4);
+                    erts_md5_update(&md5, (byte*)zero, 4);
 
                     start += 24;
                     left -= 24;
@@ -1315,18 +1315,18 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         }
 
         if (chunks[LITERAL_CHUNK].size > 0) {
-            MD5Update(&md5,
+            erts_md5_update(&md5,
                       (byte*)chunks[LITERAL_CHUNK].data,
                       chunks[LITERAL_CHUNK].size);
         }
 
         if (chunks[META_CHUNK].size > 0) {
-            MD5Update(&md5,
+            erts_md5_update(&md5,
                       (byte*)chunks[META_CHUNK].data,
                       chunks[META_CHUNK].size);
         }
 
-        MD5Final(beam->checksum, &md5);
+        erts_md5_finish(beam->checksum, &md5);
     }
 
     return BEAMFILE_READ_SUCCESS;