Changes for standardization

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

@@ -1548,7 +1548,7 @@ static jlong NativeCrypto_EVP_PKEY_from_private_seed(JNIEnv* env, jclass, jint p
     return reinterpret_cast<uintptr_t>(pkey.release());
 }
 
-static jbyteArray NativeCrypto_EVP_PKEY_get_private_seed(JNIEnv* env, jclass cls, jobject pkeyRef) {
+static jbyteArray NativeCrypto_EVP_PKEY_get_private_seed(JNIEnv* env, jclass, jobject pkeyRef) {
     CHECK_ERROR_QUEUE_ON_RETURN;
     JNI_TRACE("EVP_PKEY_get_private_seed(%p)", pkeyRef);
 
@@ -11752,8 +11752,6 @@ static void NativeCrypto_SSL_CTX_set_spake_credential(
         jbyteArray id_verifier_array, jboolean is_client, jint handshake_limit,
         jlong ssl_ctx_address, CONSCRYPT_UNUSED jobject holder) {
     CHECK_ERROR_QUEUE_ON_RETURN;
-    JNI_TRACE("SSL_CTX_set_spake_credential(%p, %p, %p, %p, %d, %d, %ld)", context, pw_array,
-              id_prover_array, id_verifier_array, is_client, handshake_limit, ssl_ctx_address);
 
     SSL_CTX* ssl_ctx = to_SSL_CTX(env, ssl_ctx_address, true);
 

common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java

@@ -81,6 +81,7 @@ public void test_getInstance() throws Exception {
             .skipProvider("SunPKCS11-NSS")
             .run(new ServiceTester.Test() {
                 @Override
+		// @SuppressWarnings("InsecureCryptoUsage")
                 public void test(Provider provider, String algorithm) throws Exception {
                     AlgorithmParameterSpec params = null;
 
@@ -295,6 +296,7 @@ private void test_Key(KeyPairGenerator kpg, Key k) throws Exception {
         test_KeyWithAllKeyFactories(k);
     }
 
+    // @SuppressWarnings("InsecureCryptoUsage")
     private void test_KeyWithAllKeyFactories(Key k) throws Exception {
         byte[] encoded = k.getEncoded();
 
@@ -440,6 +442,7 @@ private static DHParameterSpec getDHParams() {
     });
 
     @Test
+    // @SuppressWarnings("InsecureCryptoUsage")
     public void testDSAGeneratorWithParams() throws Exception {
         final DSAParameterSpec dsaSpec = new DSAParameterSpec(DSA_P, DSA_Q, DSA_G);
 

common/src/test/java/org/conscrypt/javax/net/ssl/HttpsURLConnectionTest.java

@@ -118,7 +118,8 @@ public void failedUrlConnect() throws Exception {
         Future<Void> future = executor.submit(server.run(op));
 
         HttpsURLConnection connection = server.tlsConnection("/file");
-        int response = connection.getResponseCode();
+        // google3-add: broken HTTPS hostname verification
+	int response = connection.getResponseCode();
         assertEquals(404, response);
 
         future.get(2000, TimeUnit.MILLISECONDS);
@@ -151,6 +152,7 @@ public void urlReadTimeout() throws Exception {
         Future<Void> future = executor.submit(server.run(op));
 
         HttpsURLConnection connection = server.tlsConnection("/file");
+	// google3-add: broken HTTPS hostname verification
         connection.setConnectTimeout(0);
         connection.setReadTimeout(1000);
 

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

@@ -27,6 +27,7 @@
 import javax.net.ssl.SSLContext;
 
 import org.conscrypt.java.security.StandardNames;
+// import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -38,6 +39,7 @@ public class ConscryptTest {
      * This confirms that the version machinery is working.
      */
     @Test
+    // @Ignore("Failing on google3. TODO(b/309186591)")
     public void testVersionIsSensible() {
         Conscrypt.Version version = Conscrypt.version();
         assertNotNull(version);