Merge branch 'main' into main

WillChilds-Klein · web-flow · commit 5e890cb9c24f · 2026-03-19T12:07:36.000-04:00
diff --git a/NOTICE b/NOTICE
@@ -1,3 +1,30 @@
 AWS Crt Java
 Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
 SPDX-License-Identifier: Apache-2.0.
+
+** XXHash - https://xxhash.com/
+Copyright (c) 2012-2021 Yann Collet
+All rights reserved.
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -298,3 +298,6 @@ To debug native code with VSCode or CLion or any other IDE:
 3. Set the parameters to be the ones used by the ```mvn``` script, as per above
 4. Set the working directory to the `aws-crt-java` directory
 5. On windows, you will need to manually load the PDB via the Modules window in Visual Studio, as it is not embedded in the JAR. It will be in the ```target/cmake-build/lib/windows/<arch>``` folder.
+
+## Attribution
+This library exposes native XXHash implementation (https://github.com/Cyan4973/xxHash) through JNI interface.
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
@@ -1 +1 @@
-Subproject commit a4409b95dad40a45b81e5fc9ff96f41386845e4f
+Subproject commit 5aefd277cfbf049933df13b1ee8439edccbf0964
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit f43a3d24a7c1f8b50f709ccb4fdf4c7fd2827fff
+Subproject commit c741f95e9050a1a4bed4b3aa7543bd3e024f6e56
diff --git a/crt/aws-c-http b/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit a9745ea9998f679cd7456e7d23cc8820e38c97d4
+Subproject commit 0d8e1a933f46b8af984dfc8168ebcdf32748c184
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 1d512d92709f60b74e2cafa018e69a2e647f28e9
+Subproject commit 41b6a7d6d566a56eff69743df66c077d56a80c9d
diff --git a/crt/aws-checksums b/crt/aws-checksums
@@ -1 +1 @@
-Subproject commit 270b15acc1b2125340ec1c6dda6cc3c28ef0fa44
+Subproject commit 1d5f2f1f3e5d013aae8810878ceb5b3f6f258c4e
diff --git a/crt/aws-lc b/crt/aws-lc
@@ -1 +1 @@
-Subproject commit ae0cd62f49db4c32b77cb8ed080013bfb44ed90d
+Subproject commit e50a5f29ee416a7c99be4e72957e8f96aa51dbb9
diff --git a/crt/s2n b/crt/s2n
@@ -1 +1 @@
-Subproject commit 3276a0876054e9efbeab4a42f34ef60b0bf58c91
+Subproject commit f5e5e83031be60691f22442373fb8371274fcd56
diff --git a/src/main/java/software/amazon/awssdk/crt/CRT.java b/src/main/java/software/amazon/awssdk/crt/CRT.java
@@ -492,16 +492,16 @@ private static native void awsCrtInit(int memoryTracingLevel, boolean debugWait,
      * Given an error code, get a boolean to check if an error is transient or not.
      *
      * Transient errors are defined as IO level errors where we are unable to read an HTTP response.
-     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without 
+     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without
      * sending a response. This method helps identify CRT error codes that are not generic or widely adopted.
      *
-     * This is not the complete logic to identify transient or retryable errors, this includes only IO level 
+     * This is not the complete logic to identify transient or retryable errors, this includes only IO level
      * errors that are transient.
      *
      * @param errorCode An error code returned from an exception or other native function call
      * @return A boolean for if the error is transient or not
      */
-    public static native Boolean awsIsTransientError(int errorCode);
+    public static native boolean awsIsTransientError(int errorCode);
 
     /**
      * @return The number of bytes allocated in native resources. If
diff --git a/src/main/java/software/amazon/awssdk/crt/checksums/CRC64NVME.java b/src/main/java/software/amazon/awssdk/crt/checksums/CRC64NVME.java
@@ -94,5 +94,5 @@ public void update(int b) {
     /*******************************************************************************
      * native methods
      ******************************************************************************/
-    private static native long crc64nvme(byte[] input, long previous, int offset, int length);;
+    private static native long crc64nvme(byte[] input, long previous, int offset, int length);
 }
diff --git a/src/main/java/software/amazon/awssdk/crt/checksums/XXHash.java b/src/main/java/software/amazon/awssdk/crt/checksums/XXHash.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package software.amazon.awssdk.crt.checksums;
+import software.amazon.awssdk.crt.CrtResource;
+
+public class XXHash extends CrtResource {
+    
+    private XXHash(long nativeHandle) {
+        acquireNativeHandle(nativeHandle);
+    }
+
+    /**
+     * Determines whether a resource releases its dependencies at the same time the native handle is released or if it waits.
+     * Resources that wait are responsible for calling releaseReferences() manually.
+     */
+    @Override
+    protected boolean canReleaseReferencesImmediately() { return true; }
+
+    /**
+     * Releases the instance's reference to the underlying native key pair
+     */
+    @Override
+    protected void releaseNativeHandle() {
+        if (!isNull()) {
+            xxHashRelease(getNativeHandle());
+        }
+    }
+
+    /**
+     * Create new streaming XXHash64.
+     * @param seed seed to use for the hash
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash64(long seed) {
+        long nativeHandle = xxHash64Create(seed);
+        return new XXHash(nativeHandle);
+    }
+
+
+    /**
+     * Create new streaming XXHash64.
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash64() {
+        long nativeHandle = xxHash64Create(0);
+        return new XXHash(nativeHandle);
+    }
+
+    /**
+     * Create new streaming XXHash3_64.
+     * @param seed seed to use for the hash
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash3_64(long seed) {
+        long nativeHandle = xxHash364Create(seed);
+        return new XXHash(nativeHandle);
+    }
+
+    /**
+     * Create new streaming XXHash3_64.
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash3_64() {
+        long nativeHandle = xxHash364Create(0);
+        if (nativeHandle != 0) {
+            return new XXHash(nativeHandle);
+        }
+
+        return null;
+    }
+
+    /**
+     * Create new streaming XXHash3_128.
+     * @param seed seed to use for the hash
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash3_128(long seed) {
+        long nativeHandle = xxHash3128Create(seed);
+        if (nativeHandle != 0) {
+            return new XXHash(nativeHandle);
+        }
+
+        return null;
+    }
+
+    /**
+     * Create new streaming XXHash3_128.
+     * @return new XXHash instance
+     */
+    static public XXHash newXXHash3_128() {
+        long nativeHandle = xxHash3128Create(0);
+        if (nativeHandle != 0) {
+            return new XXHash(nativeHandle);
+        }
+
+        return null;
+    }
+
+    /**
+     * Update xxhash state from input
+     * @param input input to update with
+     */
+    public void update(byte[] input) {
+        this.update(input, 0, input.length);
+        
+    }
+
+    /**
+     * Update xxhash state with a single byte
+     * @param b input to update with
+     */
+    public void update(int b) {
+        if (b < 0 || b > 0xff) {
+            throw new IllegalArgumentException();
+        }
+        byte[] buf = { (byte) (b & 0x000000ff) };
+        this.update(buf);
+    }
+
+    /**
+     * Update xxhash state with a subrange of input
+     * @param input input to update with
+     * @param offset to start update with
+     * @param length of data
+     */
+    public void update(byte[] input, int offset, int length) {
+        if (input == null) {
+            throw new NullPointerException();
+        }
+        if (offset < 0 || length < 0 || offset > input.length - length) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        xxHashUpdate(getNativeHandle(), input, offset, length);
+    }
+
+    /**
+     * Return digest for the current state of hash.
+     * @return hash as bytes in big endian
+     */
+    public byte[] digest() {
+        return xxHashFinalize(getNativeHandle());
+    }
+
+    /**
+     * Oneshot compute XXHash64.
+     * @param input input input to hash
+     * @param seed seed
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash64(byte[] input, long seed) {
+        return xxHash64Compute(input, seed);
+    }
+
+    /**
+     * Oneshot compute XXHash64.
+     * @param input input input to hash
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash64(byte[] input) {
+        return xxHash64Compute(input, 0);
+    }
+
+
+    /**
+     * Oneshot compute XXHash3_64.
+     * @param input input input to hash
+     * @param seed seed
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash3_64(byte[] input, long seed) {
+        return xxHash364Compute(input, seed);
+    }
+
+    /**
+     * Oneshot compute XXHash3_64.
+     * @param input input input to hash
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash3_64(byte[] input) {
+        return xxHash364Compute(input, 0);
+    }
+
+    /**
+     * Oneshot compute XXHash3_128.
+     * @param input input input to hash
+     * @param seed seed
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash3_128(byte[] input, long seed) {
+        return xxHash3128Compute(input, seed);
+    }
+
+    /**
+     * Oneshot compute XXHash3_128.
+     * @param input input input to hash
+     * @return xxhash64 hash
+     */
+    static public byte[] computeXXHash3_128(byte[] input) {
+        return xxHash3128Compute(input, 0);
+    }
+
+    /*******************************************************************************
+     * native methods
+     ******************************************************************************/
+    private static native byte[] xxHash64Compute(byte[] input, long seed);
+    private static native byte[] xxHash364Compute(byte[] input, long seed);
+    private static native byte[] xxHash3128Compute(byte[] input, long seed);
+
+    private static native long xxHash64Create(long seed);
+    private static native long xxHash364Create(long seed);
+    private static native long xxHash3128Create(long seed);
+    private static native void xxHashRelease(long xxhash);
+
+    private static native void xxHashUpdate(long xxhash, byte[] input, int offset, int length);
+    private static native byte[] xxHashFinalize(long xxhash);
+}
diff --git a/src/main/java/software/amazon/awssdk/crt/http/HttpClientConnectionManager.java b/src/main/java/software/amazon/awssdk/crt/http/HttpClientConnectionManager.java
@@ -62,6 +62,24 @@ private HttpClientConnectionManager(HttpClientConnectionManagerOptions options)
                 if (HTTPS.equals(uri.getScheme())) { port = DEFAULT_HTTPS_PORT; }
             }
         }
+        /**
+         * Per RFC 3986 Section 3.2.2, IPv6 addresses in URIs MUST be enclosed in square brackets
+         * (e.g., "http://[2001:db8::1]:8080/path"). However, when connecting to a host, the brackets
+         * must be removed to get the actual IPv6 address.
+         * 
+         * Since Java's URI.getHost() returns IPv6 addresses WITH brackets (e.g., "[2001:db8::1]"),
+         * but the underlying CRT library expects the hostname WITHOUT brackets (e.g., "2001:db8::1").
+         * Manually strip the brackets before passing the hostname to CRT.
+         * 
+         * Note: Different language implementations handle bracket stripping inconsistently eg: Python
+         * (urlparse().hostname) strip brackets automatically, while Java (URI.getHost()) keeps brackets, 
+         * thus we strip the brackets based on the language behavior.
+         */
+
+        String host = uri.getHost();
+        if (host.startsWith("[") && host.endsWith("]")) {
+            host = host.substring(1, host.length() - 1);
+        }
 
         HttpProxyOptions proxyOptions = options.getProxyOptions();
 
@@ -115,7 +133,7 @@ private HttpClientConnectionManager(HttpClientConnectionManagerOptions options)
                                             useTls && tlsContext!=null ? tlsContext.getNativeHandle() : 0,
                                             useTls && tlsConnectionOptions!=null ? tlsConnectionOptions.getNativeHandle() : 0,
                                             windowSize,
-                                            uri.getHost().getBytes(UTF8),
+                                            host.getBytes(UTF8),
                                             port,
                                             maxConnections,
                                             proxyConnectionType,
diff --git a/src/native/crt.c b/src/native/crt.c
@@ -709,7 +709,7 @@ void JNICALL Java_software_amazon_awssdk_crt_CRT_awsCrtInit(
 }
 
 JNIEXPORT
-bool JNICALL
+jboolean JNICALL
     Java_software_amazon_awssdk_crt_CRT_awsIsTransientError(JNIEnv *env, jclass jni_crt_class, jint error_code) {
     (void)env;
     (void)jni_crt_class;
diff --git a/src/native/http_connection_manager.c b/src/native/http_connection_manager.c
@@ -96,7 +96,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     jlong jni_tls_ctx,
     jlong jni_tls_connection_options,
     jlong jni_window_size,
-    jbyteArray jni_endpoint,
+    jbyteArray jni_host,
     jint jni_port,
     jint jni_max_conns,
     jint jni_proxy_connection_type,
@@ -141,7 +141,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     }
 
     struct aws_allocator *allocator = aws_jni_get_allocator();
-    struct aws_byte_cursor endpoint = aws_jni_byte_cursor_from_jbyteArray_acquire(env, jni_endpoint);
+    struct aws_byte_cursor host = aws_jni_byte_cursor_from_jbyteArray_acquire(env, jni_host);
 
     size_t window_size;
     if (aws_size_t_from_java(env, &window_size, jni_window_size, "Initial window size")) {
@@ -161,7 +161,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     AWS_ZERO_STRUCT(tls_conn_options);
     if (new_tls_conn_opts) {
         aws_tls_connection_options_init_from_ctx(&tls_conn_options, tls_ctx);
-        aws_tls_connection_options_set_server_name(&tls_conn_options, allocator, &endpoint);
+        aws_tls_connection_options_set_server_name(&tls_conn_options, allocator, &host);
         tls_connection_options = &tls_conn_options;
     }
 
@@ -180,7 +180,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     manager_options.initial_window_size = window_size;
     manager_options.socket_options = socket_options;
     manager_options.tls_connection_options = tls_connection_options;
-    manager_options.host = endpoint;
+    manager_options.host = host;
     manager_options.port = port;
     manager_options.max_connections = (size_t)jni_max_conns;
     manager_options.shutdown_complete_callback = &s_on_http_conn_manager_shutdown_complete_callback;
@@ -257,7 +257,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     }
 
 cleanup:
-    aws_jni_byte_cursor_from_jbyteArray_release(env, jni_endpoint, endpoint);
+    aws_jni_byte_cursor_from_jbyteArray_release(env, jni_host, host);
 
     if (binding->manager == NULL) {
         s_destroy_manager_binding(binding, env);
diff --git a/src/native/mqtt5_packets.c b/src/native/mqtt5_packets.c
diff --git a/src/native/xxhash.c b/src/native/xxhash.c
diff --git a/src/test/java/software/amazon/awssdk/crt/test/ClientBootstrapTest.java b/src/test/java/software/amazon/awssdk/crt/test/ClientBootstrapTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/CrtStaticTest.java b/src/test/java/software/amazon/awssdk/crt/test/CrtStaticTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionManagerTest.java b/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionManagerTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java b/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java
diff --git a/src/test/java/software/amazon/awssdk/crt/test/XXHashTest.java b/src/test/java/software/amazon/awssdk/crt/test/XXHashTest.java

Original file line number	Diff line number	Diff line change
`@@ -492,16 +492,16 @@ private static native void awsCrtInit(int memoryTracingLevel, boolean debugWait,`
`492`	`492`	`* Given an error code, get a boolean to check if an error is transient or not.`
`493`	`493`	`*`
`494`	`494`	`* Transient errors are defined as IO level errors where we are unable to read an HTTP response.`
`495`		`- * This can occur due to connect timeouts, read timeouts, or the server closing the connection without`
	`495`	`+ * This can occur due to connect timeouts, read timeouts, or the server closing the connection without`
`496`	`496`	`* sending a response. This method helps identify CRT error codes that are not generic or widely adopted.`
`497`	`497`	`*`
`498`		`- * This is not the complete logic to identify transient or retryable errors, this includes only IO level`
	`498`	`+ * This is not the complete logic to identify transient or retryable errors, this includes only IO level`
`499`	`499`	`* errors that are transient.`
`500`	`500`	`*`
`501`	`501`	`* @param errorCode An error code returned from an exception or other native function call`
`502`	`502`	`* @return A boolean for if the error is transient or not`
`503`	`503`	`*/`
`504`		`- public static native Boolean awsIsTransientError(int errorCode);`
	`504`	`+ public static native boolean awsIsTransientError(int errorCode);`
`505`	`505`
`506`	`506`	`/**`
`507`	`507`	`* @return The number of bytes allocated in native resources. If`