Merge tag 'jdk-25.0.4+7' into sapmachine25

Author: RealCLanger

make/conf/version-numbers.conf

@@ -39,4 +39,4 @@ DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=25
-DEFAULT_PROMOTED_VERSION_PRE=ea
+DEFAULT_PROMOTED_VERSION_PRE=

src/java.base/share/classes/java/util/jar/JarVerifier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, 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
@@ -68,7 +68,7 @@ class JarVerifier {
     private ArrayList<SignatureFileVerifier> pendingBlocks;
 
     /* cache of CodeSigner objects */
-    private ArrayList<CodeSigner[]> signerCache;
+    private List<CodeSigner[]> signerCache;
 
     /* Are we parsing a block? */
     private boolean parsingBlockOrSF = false;
@@ -288,7 +288,7 @@ private void processEntry(ManifestEntryVerifier mev)
                 String key = uname.substring(0, uname.lastIndexOf('.'));
 
                 if (signerCache == null)
-                    signerCache = new ArrayList<>();
+                    signerCache = new LinkedList<>();
 
                 if (manDig == null) {
                     synchronized(manifestRawBytes) {

src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java

@@ -570,8 +570,8 @@ public void setRequestMethod(String method)
                         throws ProtocolException {
         lock();
         try {
-            if (connecting) {
-                throw new IllegalStateException("connect in progress");
+            if (connected || connecting) {
+                throw new IllegalStateException("Already connected");
             }
             super.setRequestMethod(method);
         } finally {

src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java

@@ -178,7 +178,7 @@ public void setConnected(boolean conn) {
     public void connect() throws IOException {
         if (connected)
             return;
-        plainConnect();
+        super.connect();
         if (cachedResponse != null) {
             // using cached response
             return;

src/java.base/share/classes/sun/security/pkcs/SignerInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, 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
@@ -336,6 +336,21 @@ SignerInfo verify(PKCS7 block, byte[] data)
             // if there are authenticated attributes, get the message
             // digest and compare it with the digest of data
             if (authenticatedAttributes == null) {
+                // RFC 5652 Section 5.3. "[signedAttrs] MUST be present if the
+                // content type of the EncapsulatedContentInfo value being
+                // signed is not id-data."
+                if (!content.getContentType().equals(ContentInfo.DATA_OID)) {
+                    throw new SignatureException("Missing authenticatedAttributes");
+                } else {
+                    try {
+                        var c = new DerValue(data);
+                        if (c.tag == DerValue.tag_Set) {
+                            throw new SignatureException("Not a .SF file content");
+                        }
+                    } catch (IOException e) {
+                        // Expected or ignored
+                    }
+                }
                 dataSigned = data;
             } else {
 
@@ -668,6 +683,12 @@ public Timestamp getTimestamp()
             return null;
         }
 
+        // RFC 3161 Section 2.4.2. id-ct-TSTInfo.
+        if (!tsToken.getContentInfo().getContentType()
+                .equals(ContentInfo.TIMESTAMP_TOKEN_INFO_OID)) {
+            throw new SignatureException("Not using id-ct-TSTInfo");
+        }
+
         // Extract the content (an encoded timestamp token info)
         byte[] encTsTokenInfo = tsToken.getContentInfo().getData();
         // Extract the signer (the Timestamping Authority)

src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, 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
@@ -25,6 +25,7 @@
 
 package sun.security.provider.certpath;
 
+import java.io.FilterInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -188,6 +189,16 @@ private static int initializeTimeout(String prop, int def) {
         return timeoutVal;
     }
 
+    /**
+     * Maximum size for a CRL downloaded through a URICertStore
+     * in bytes. This can be controlled by the com.sun.security.crl.maxSize
+     * Security or System property. The System property, if set, overrides
+     * the Security property. The default size is 20MiB.
+     */
+    private static final long MAX_CRL_DOWNLOAD_SIZE =
+            SecurityProperties.getOverridableLongProp(
+                    "com.sun.security.crl.maxSize", 20971520, debug);
+
     /**
      * Enumeration for the allowed schemes we support when following a
      * URI from an authorityInfoAccess extension on a certificate.
@@ -228,6 +239,13 @@ static AllowedScheme nameOf(String name) {
     private static final boolean CA_ISS_ALLOW_ANY;
 
     static {
+        // Add a debug message for the configured CRL download limit
+        if (debug != null) {
+            debug.println("Maximum downloadable CRL size: " +
+                    MAX_CRL_DOWNLOAD_SIZE +
+                    ((MAX_CRL_DOWNLOAD_SIZE < 0) ? " (DISABLED)" : ""));
+        }
+
         boolean allowAny = false;
         try {
             if (Builder.USE_AIA) {
@@ -623,7 +641,19 @@ public synchronized Collection<X509CRL> engineGetCRLs(CRLSelector selector)
                 if (debug != null) {
                     debug.println("Downloading new CRL...");
                 }
-                crl = (X509CRL) factory.generateCRL(in);
+                InputStream crlIn = (MAX_CRL_DOWNLOAD_SIZE > -1) ?
+                        new SizeLimitedInputStream(in, MAX_CRL_DOWNLOAD_SIZE) :
+                        in;
+                try {
+                    crl = (X509CRL) factory.generateCRL(crlIn);
+                } catch (IllegalArgumentException iae) {
+                    // IAE should only be thrown when the CRL exceeds a
+                    // configured maximum length.
+                    if (debug != null) {
+                        debug.println("Discarding CRL: " + iae.getMessage());
+                        crl = null;
+                    }
+                }
             }
             return getMatchingCRLs(crl, selector);
         } catch (IOException | CRLException e) {
@@ -816,4 +846,59 @@ boolean matchRule(URI filterRule, URI caIssuer) {
             return true;
         }
     }
+
+    /**
+     * Stream wrapper used when an InputStream passed into a CertificateFactory
+     * needs to be size limited.  It will throw IllegalArgumentException when
+     * the downloaded resource via the underlying stream exceeds the maximum
+     * limit.
+     */
+    private static class SizeLimitedInputStream extends FilterInputStream {
+
+        private final long maxBytes;
+        private long bytesRead = 0;
+
+        private SizeLimitedInputStream(InputStream in, long maxBytes) {
+            super(in);
+            this.maxBytes = maxBytes;
+        }
+
+        @Override
+        public int read() throws IOException {
+            if (bytesRead >= maxBytes) {
+                // We will use IAE here to differentiate this special case
+                // from other IOEs that the underlying input stream might
+                // legitimately throw.
+                throw new IllegalArgumentException("InputStream exceeded max " +
+                        "size of " + maxBytes);
+            }
+
+            int b = super.read();
+            if (b != -1) {
+                bytesRead++;
+            }
+            return b;
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+
+            if (bytesRead >= maxBytes) {
+                // We will use IAE here to differentiate this special case
+                // from other IOEs that the underlying input stream might
+                // legitimately throw.
+                throw new IllegalArgumentException("InputStream exceeded max " +
+                        "size of " + maxBytes);
+            }
+
+            long remaining = maxBytes - bytesRead;
+            int toRead = (int) Math.min(len, remaining);
+
+            int n = super.read(b, off, toRead);
+            if (n != -1) {
+                bytesRead += n;
+            }
+            return n;
+        }
+    }
 }

src/java.base/share/classes/sun/security/ssl/Alert.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, 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
@@ -254,25 +254,37 @@ public void consume(ConnectionContext context,
             } else if ((level == Level.WARNING) && (alert != null)) {
                 // Terminate the connection if an alert with a level of warning
                 // is received during handshaking, except the no_certificate
-                // warning.
-                if (alert.handshakeOnly && (tc.handshakeContext != null)) {
-                    // It's OK to get a no_certificate alert from a client of
-                    // which we requested client authentication.  However,
-                    // if we required it, then this is not acceptable.
-                    if (tc.sslConfig.isClientMode ||
-                            alert != Alert.NO_CERTIFICATE ||
-                            (tc.sslConfig.clientAuthType !=
+                // warning for SSLv3.
+                HandshakeContext hc = tc.handshakeContext;
+                if (alert.handshakeOnly && (hc != null)) {
+                    // In SSLv3, it's OK to get a no_certificate alert from a
+                    // client where we requested (want) client authentication.
+                    // If we required it (need), this is not acceptable
+                    // and must fail.
+                    //
+                    // no_certificate alerts are not acceptable in TLSv1.*.
+                    //
+                    if (!tc.sslConfig.isClientMode &&
+                            (hc.negotiatedProtocol == ProtocolVersion.SSL30) &&
+                            (alert == Alert.NO_CERTIFICATE) &&
+                            (tc.sslConfig.clientAuthType ==
                                     ClientAuthType.CLIENT_AUTH_REQUESTED)) {
-                        throw tc.fatal(Alert.HANDSHAKE_FAILURE,
-                            "received handshake warning: " + alert.description);
-                    } else {
-                        // Otherwise, ignore the warning but remove the
-                        // Certificate and CertificateVerify handshake
-                        // consumer so the state machine doesn't expect it.
-                        tc.handshakeContext.handshakeConsumers.remove(
-                                SSLHandshake.CERTIFICATE.id);
-                        tc.handshakeContext.handshakeConsumers.remove(
+
+                        // We'll ignore the warning and remove the Certificate
+                        // and CertificateVerify handshake consumers so the
+                        // state machine isn't expecting them.
+                        if (hc.handshakeConsumers.remove(
+                                SSLHandshake.CERTIFICATE.id) != null) {
+                            hc.handshakeConsumers.remove(
                                 SSLHandshake.CERTIFICATE_VERIFY.id);
+                        } else {
+                            throw tc.fatal(Alert.HANDSHAKE_FAILURE,
+                                    "NO_CERTIFICATE alert received when certs" +
+                                    " were not expected or already received");
+                        }
+                    } else {
+                        throw tc.fatal(Alert.HANDSHAKE_FAILURE,
+                            "Received handshake warning: " + alert.description);
                     }
                 }  // Otherwise, ignore the warning
             } else {    // fatal or unknown

src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, 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
@@ -26,6 +26,7 @@
 package sun.security.ssl;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -121,6 +122,7 @@ abstract boolean isCookieValid(ServerHandshakeContext context,
     private static final
             class D10HelloCookieManager extends HelloCookieManager {
 
+        private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
         final SecureRandom secureRandom;
         private int               cookieVersion;  // allow to wrap, version + sequence
         private final byte[]      cookieSecret;
@@ -170,6 +172,7 @@ byte[] createCookie(ServerHandshakeContext context,
             }
             byte[] helloBytes = clientHello.getHelloCookieBytes();
             md.update(helloBytes);
+            md.update(getHostPortBytes(context));
             byte[] cookie = md.digest(secret);      // 32 bytes
             cookie[0] = (byte)((version >> 24) & 0xFF);
 
@@ -205,11 +208,30 @@ boolean isCookieValid(ServerHandshakeContext context,
             }
             byte[] helloBytes = clientHello.getHelloCookieBytes();
             md.update(helloBytes);
+            md.update(getHostPortBytes(context));
             byte[] target = md.digest(secret);      // 32 bytes
             target[0] = cookie[0];
 
             return MessageDigest.isEqual(target, cookie);
         }
+
+        /**
+         * Returns host and port bytes if those are set.
+         * Using ASCII unit separator character to separate host and port so we
+         * can differentiate between otherwise identical host and port string
+         * concatenations, for example host 172.0.0.1 with port 25 and host
+         * 172.0.0.12 with port 5.
+         */
+        private static byte[] getHostPortBytes(ServerHandshakeContext context) {
+            final String host = context.conContext.transport.getPeerHost();
+            final int port = context.conContext.transport.getPeerPort();
+            final String hostStr = host != null ? host : "";
+            final String portStr = port > -1 ? Integer.toString(port) : "";
+            return hostStr.isEmpty() && portStr.isEmpty() ?
+                    EMPTY_BYTE_ARRAY :
+                    (hostStr + '\u001F' + portStr).getBytes(
+                            StandardCharsets.UTF_8);
+        }
     }
 
     private static final

src/java.base/share/classes/sun/security/timestamp/TSResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, 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
@@ -26,6 +26,8 @@
 package sun.security.timestamp;
 
 import java.io.IOException;
+
+import sun.security.pkcs.ContentInfo;
 import sun.security.pkcs.PKCS7;
 import sun.security.util.Debug;
 import sun.security.util.DerValue;
@@ -357,6 +359,11 @@ private void parse(byte[] tsReply) throws IOException {
             DerValue timestampToken = derValue.data.getDerValue();
             encodedTsToken = timestampToken.toByteArray();
             tsToken = new PKCS7(encodedTsToken);
+            // RFC 3161 Section 2.4.2. id-ct-TSTInfo.
+            if (!tsToken.getContentInfo().getContentType()
+                    .equals(ContentInfo.TIMESTAMP_TOKEN_INFO_OID)) {
+                throw new TimestampException("Not using id-ct-TSTInfo");
+            }
             tstInfo = new TimestampToken(tsToken.getContentInfo().getData());
         }