commit 53d13c518521b219bb5fb6015820e638a4b7a5d7
author Adam Langley <agl@google.com> Tue Sep 23 17:40:53 2014 -0700
committer Adam Langley <agl@google.com> Tue Sep 23 17:43:09 2014 -0700
tree ed920677ce958bc21a9985595dbaeda0b8cdcd50
parent 4a16cd72102c5b0aeb2690edb5aac1c4d0e1b7fa

Update softkeymaster for BoringSSL.

* Disable an odd, 192-bit curve that BoringSSL no longer supports.
* Only set the "ASN.1 flag" when not using BoringSSL as it's the default
  now in BoringSSL.
* Use a non-deprecated function to free the thread's error queue.

Change-Id: I54a08724aef0344421fe9097e524d66550af0f81

softkeymaster/keymaster_openssl.cpp

diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index 85ecc6e..2dc4109 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -118,7 +118,7 @@
     }
 
     ERR_clear_error();
-    ERR_remove_state(0);
+    ERR_remove_thread_state(NULL);
 }
 
 static int wrap_key(EVP_PKEY* pkey, int type, uint8_t** keyBlob, size_t* keyBlobLength) {
@@ -291,9 +291,6 @@
 static int generate_ec_keypair(EVP_PKEY* pkey, const keymaster_ec_keygen_params_t* ec_params) {
     Unique_EC_GROUP group;
     switch (ec_params->field_size) {
-    case 192:
-        group.reset(EC_GROUP_new_by_curve_name(NID_X9_62_prime192v1));
-        break;
     case 224:
         group.reset(EC_GROUP_new_by_curve_name(NID_secp224r1));
         break;
@@ -316,7 +313,9 @@
     }
 
     EC_GROUP_set_point_conversion_form(group.get(), POINT_CONVERSION_UNCOMPRESSED);
+#if !defined(OPENSSL_IS_BORINGSSL)
     EC_GROUP_set_asn1_flag(group.get(), OPENSSL_EC_NAMED_CURVE);
+#endif
 
     /* initialize EC key */
     Unique_EC_KEY eckey(EC_KEY_new());