commit a20e53c35d5db314cae263d0fd8847dc4ca988c1
author Kenny Root <kroot@google.com> Thu Sep 15 21:15:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 15 21:15:44 2016 +0000
tree ac0f133632b6f643880059c6e83302a2998f0737
parent 873e12c3f2113a85aaf013e2369e3b49d6bec357
parent ff993fed915a37526f7458d285074690f92f84e3

Fix typo in name of des-ede mapping am: 0af37f8ed6 am: a31bc9eed5 am: 74fe0c16fe am: b4a7437015 am: b3935d5691
am: ff993fed91

Change-Id: I4c6c07b1a813e41148bb65f9b04ba68e705c7a89

src/main/java/org/conscrypt/OpenSSLProvider.java

diff --git a/src/main/java/org/conscrypt/OpenSSLProvider.java b/src/main/java/org/conscrypt/OpenSSLProvider.java
index c3c6374..2b7a98e 100644
--- a/src/main/java/org/conscrypt/OpenSSLProvider.java
+++ b/src/main/java/org/conscrypt/OpenSSLProvider.java
@@ -265,7 +265,7 @@
 
         // id-hmacWithSHA224 (8)
         putMacImplClass("HmacSHA224", "OpenSSLMac$HmacSHA224");
-        put("Alg.Alias.Mac.1.2.840.113549.2.9", "HmacSHA224");
+        put("Alg.Alias.Mac.1.2.840.113549.2.8", "HmacSHA224");
         put("Alg.Alias.Mac.HMAC-SHA224", "HmacSHA224");
         put("Alg.Alias.Mac.HMAC/SHA224", "HmacSHA224");
 

src/main/native/org_conscrypt_NativeCrypto.cpp

diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp
index 9af0cda..bd26fd5 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -8113,14 +8113,6 @@
     SSL_CTX_set_tmp_rsa_callback(sslCtx.get(), tmp_rsa_callback);
     SSL_CTX_set_tmp_dh_callback(sslCtx.get(), tmp_dh_callback);
 
-    // If negotiating ECDH, use P-256.
-    Unique_EC_KEY ec(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
-    if (ec.get() == nullptr) {
-        throwExceptionIfNecessary(env, "EC_KEY_new_by_curve_name");
-        return 0;
-    }
-    SSL_CTX_set_tmp_ecdh(sslCtx.get(), ec.get());
-
     JNI_TRACE("NativeCrypto_SSL_CTX_new => %p", sslCtx.get());
     return (jlong) sslCtx.release();
 }