implemented additional changes requested in the pr

Author: mnbogner

common/src/jni/main/cpp/conscrypt/native_crypto.cc

@@ -11869,7 +11869,7 @@ static jbyteArray NativeCrypto_SSL_get0_ech_retry_configs(JNIEnv* env, jclass, j
     }
     env->SetByteArrayRegion(result, 0, static_cast<jsize>(retry_configs_len),
                             reinterpret_cast<const jbyte*>(retry_configs));
-    JNI_TRACE("ssl=%p NativeCrypto_SSL_get0_ech_retry_configs(%p) => %p", ssl, ssl, result);
+    JNI_TRACE("ssl=%p NativeCrypto_SSL_get0_ech_retry_configs() => %p", ssl, result);
     return result;
 }
 

openjdk/src/test/java/org/conscrypt/NativeCryptoTest.java

@@ -524,8 +524,6 @@ public long beforeHandshake(long c) throws SSLException {
             @Override
             public void afterHandshake(long session, long ssl, long context, Socket socket,
                                        FileDescriptor fd, SSLHandshakeCallbacks callback) throws Exception {
-                assertFalse(NativeCrypto.SSL_ech_accepted(ssl, null));
-                assertNull(NativeCrypto.SSL_get0_ech_name_override(ssl, null));
                 byte[] retryConfigs = NativeCrypto.SSL_get0_ech_retry_configs(ssl, null);
                 assertEquals(5, retryConfigs.length);  // should be the invalid ECH Config List
                 super.afterHandshake(session, ssl, context, socket, fd, callback);
@@ -748,12 +746,19 @@ public void test_SSL_set_enable_ech_grease() throws Exception {
     }
 
     @Test
-    public void test_SSL_set1_ech_config_list() throws Exception {
+    public void test_SSL_set1_ech_valid_config_list() throws Exception {
         long c = NativeCrypto.SSL_CTX_new();
         long s = NativeCrypto.SSL_new(c, null);
 
         final byte[] configList = readTestFile("boringssl-ech-config-list.bin");
         assertTrue(NativeCrypto.SSL_set1_ech_config_list(s, null, configList));
+    }
+
+    @Test
+    public void test_SSL_set1_ech_invalid_config_list() throws Exception {
+        long c = NativeCrypto.SSL_CTX_new();
+        long s = NativeCrypto.SSL_new(c, null);
+
         byte[] badConfigList = {
                 0x00, 0x05, (byte) 0xfe, 0x0d, (byte) 0xff, (byte) 0xff, (byte) 0xff
         };