Merge pull request #766 from KostasTsiounis/md5_native

Add support for native MD5 digest

closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java

@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
+ * (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
  * ===========================================================================
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class NativeCrypto {
  public static final int SHA2_256 = 2;
  public static final int SHA5_384 = 3;
  public static final int SHA5_512 = 4;
+ public static final int MD5 = 5;
 
  /* Define constants for the EC field types. */
  public static final int ECField_Fp = 0;
@@ -201,6 +202,8 @@ public void run() {
 
  private static final native long loadCrypto(boolean trace);
 
+ public static final native boolean isMD5Available();
+
  public final native long DigestCreateContext(long nativeBuffer,
  int algoIndex);
 

closed/src/java.base/share/classes/sun/security/provider/NativeMD5.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
+package sun.security.provider;
+
+import jdk.crypto.jniprovider.NativeCrypto;
+
+public final class NativeMD5 extends NativeDigest {
+
+ public NativeMD5() {
+ super("MD5", 16, NativeCrypto.MD5);
+ }
+}

closed/src/java.base/share/native/libjncrypto/NativeCrypto.c

@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
+ * (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
  * ===========================================================================
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,6 +200,7 @@ static OSSL_CRYPTO_THREADID_set_callback_t* OSSL_CRYPTO_THREADID_set_callback =
 static OSSL_CRYPTO_set_locking_callback_t* OSSL_CRYPTO_set_locking_callback = NULL;
 
 /* Define pointers for OpenSSL functions to handle Message Digest algorithms. */
+OSSL_sha_t* OSSL_md5;
 OSSL_sha_t* OSSL_sha1;
 OSSL_sha_t* OSSL_sha256;
 OSSL_sha_t* OSSL_sha224;
@@ -445,6 +446,7 @@ JNIEXPORT jlong JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_loadCrypto
  }
 
  /* Load the function symbols for OpenSSL Message Digest algorithms. */
+ OSSL_md5 = (OSSL_sha_t*)find_crypto_symbol(crypto_library, "EVP_md5");
  OSSL_sha1 = (OSSL_sha_t*)find_crypto_symbol(crypto_library, "EVP_sha1");
  OSSL_sha256 = (OSSL_sha_t*)find_crypto_symbol(crypto_library, "EVP_sha256");
  OSSL_sha224 = (OSSL_sha_t*)find_crypto_symbol(crypto_library, "EVP_sha224");
@@ -850,6 +852,18 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM * vm, void * reserved)
  crypto_library = NULL;
 }
 
+/* Check whether MD5 is available.
+ *
+ * Class: jdk_crypto_jniprovider_NativeCrypto
+ * Method: isMD5Available
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_isMD5Available
+ (JNIEnv *env, jclass thisClass)
+{
+ return (NULL != OSSL_md5) ? JNI_TRUE : JNI_FALSE;
+}
+
 /* Create Digest context
  *
  * Class: jdk_crypto_jniprovider_NativeCrypto
@@ -864,6 +878,9 @@ JNIEXPORT jlong JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_DigestCreateCon
  OpenSSLMDContext *context = NULL;
 
  switch (algoIdx) {
+ case jdk_crypto_jniprovider_NativeCrypto_MD5:
+ digestAlg = (*OSSL_md5)();
+ break;
  case jdk_crypto_jniprovider_NativeCrypto_SHA1_160:
  digestAlg = (*OSSL_sha1)();
  break;

src/java.base/share/classes/sun/security/provider/SunEntries.java

@@ -25,7 +25,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
+ * (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
  * ===========================================================================
  */
 
@@ -91,6 +91,9 @@ public final class SunEntries {
  */
  private static final boolean useNativeDigest = NativeCrypto.isAlgorithmEnabled("jdk.nativeDigest", "MessageDigest");
 
+ // Flag indicating whether the operating system is AIX.
+ private static final boolean isAIX = "AIX".equals(GetPropertyAction.privilegedGetProperty("os.name"));
+
  // the default algo used by SecureRandom class for new SecureRandom() calls
  public static final String DEF_SECURE_RANDOM_ALGO;
 
@@ -190,6 +193,7 @@ public final class SunEntries {
  /*
  * Digest engines
  */
+ String providerMD5;
  String providerSHA;
  String providerSHA224;
  String providerSHA256;
@@ -199,6 +203,17 @@ public final class SunEntries {
  * Set the digest provider based on whether native crypto is
  * enabled or not.
  */
+ /* Don't use native MD5 on AIX due to an observed performance regression. */
+ if (useNativeDigest
+ && NativeCrypto.isAllowedAndLoaded()
+ && NativeCrypto.isMD5Available()
+ && !isAIX
+ ) {
+ providerMD5 = "sun.security.provider.NativeMD5";
+ } else {
+ providerMD5 = "sun.security.provider.MD5";
+ }
+
  if (useNativeDigest && NativeCrypto.isAllowedAndLoaded()) {
  providerSHA = "sun.security.provider.NativeSHA";
  providerSHA224 = "sun.security.provider.NativeSHA2$SHA224";
@@ -214,7 +229,7 @@ public final class SunEntries {
  }
 
  add(p, "MessageDigest", "MD2", "sun.security.provider.MD2", attrs);
- add(p, "MessageDigest", "MD5", "sun.security.provider.MD5", attrs);
+ add(p, "MessageDigest", "MD5", providerMD5, attrs);
  addWithAlias(p, "MessageDigest", "SHA-1", providerSHA,
  attrs);