Merge branch 'maint'

* maint:
  Update MD5 implementation from OpenSSL 3.5.0 to 3.6.0
  Add update script for OpenSSL MD5 implementation

Author: rickard-green

erts/emulator/openssl/README

@@ -1,27 +1,40 @@
-This directory contains a *very* small part of OpenSSL. Currently only parts
-of the OpenSSL MD5 implementation.
+%CopyrightBegin%
 
-The files that has been taken from the 3.1.4 version of OpenSSL:
+SPDX-License-Identifier: Apache-2.0
+
+Copyright Ericsson AB 2025. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+%CopyrightEnd%
+
+
+This directory contains a *very* small part of OpenSSL. Currently only
+parts of the OpenSSL MD5 implementation.
+
+The files that has been taken from OpenSSL:
 
 ./LICENSE.txt
 ./crypto/md5/md5_local.h
 ./crypto/md5/md5_dgst.c
 ./include/crypto/md32_common.h
 ./include/openssl_local/md5.h (renamed from include/openssl/md5.h)
 
-The openssl.diff file contains the diff between the original files and the ones
-included in OTP.
-
-Ignoring LICENSE.txt (which contains the full Apache 2.0 license) the
-copyright and license notice of the above OpenSSL files are as follows
-(copyright years differ a bit):
-
-/*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
+The OpenSSL version that these files currently has been taken from can
+be found in the ./vendor.info file.
 
+Update these files from the upstream OpenSSL repository by running the
+'./update' script. The script will update the files taken from OpenSSL
+and then mirror those to 'lib/erl_interface/src/openssl'. These two
+MD5 implementations should be kept in sync. Run "./update help" for
+more information about the script.

erts/emulator/openssl/crypto/md5/md5_local.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -20,9 +20,10 @@
 
 #ifdef MD5_ASM
 # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
-     defined(_M_X64) || defined(__aarch64__) || \
-     (defined(__loongarch__) && __loongarch_grlen == 64)
+    defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
+    defined(_M_X64) || defined(__aarch64__) || \
+    (defined(__loongarch__) && __loongarch_grlen == 64) || \
+    (defined(__riscv) && __riscv_xlen == 64)
 #  define md5_block_data_order ossl_md5_block_asm_data_order
 # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
 #  define md5_block_data_order ossl_md5_block_asm_data_order

erts/emulator/openssl/include/crypto/md32_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -65,6 +65,19 @@
 
 #if !defined(ERLANG_OPENSSL_INTEGRATION)
 #include <openssl/crypto.h>
+/*
+ * For ossl_(un)likely
+ */
+# include <internal/common.h>
+#else
+/* Cut from <internal/common.h> */
+# if defined(__GNUC__) || defined(__clang__)
+#  define ossl_likely(x)     __builtin_expect(!!(x), 1)
+#  define ossl_unlikely(x)   __builtin_expect(!!(x), 0)
+# else
+#  define ossl_likely(x)     (x)
+#  define ossl_unlikely(x)   (x)
+# endif
 #endif
 
 #if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
@@ -156,18 +169,18 @@ int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
     HASH_LONG l;
     size_t n;
 
-    if (len == 0)
+    if (ossl_unlikely(len == 0))
         return 1;
 
     l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
-    if (l < c->Nl)              /* overflow */
+    if (ossl_unlikely(l < c->Nl))              /* overflow */
         c->Nh++;
     c->Nh += (HASH_LONG) (len >> 29); /* might cause compiler warning on
                                        * 16-bit */
     c->Nl = l;
 
     n = c->num;
-    if (n != 0) {
+    if (ossl_likely(n != 0)) {
         p = (unsigned char *)c->data;
 
         if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {