commit b570de568adbc2a8ffcb356a56373c10be03b650
author Kenny Root <kroot@android.com> Tue Sep 30 08:52:17 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 30 08:52:18 2014 +0000
tree 50393e00b345f137738bb1a4874dd95bac367fcb
parent d9adda97221fe2b7a1be38d8ab1dc954c630a1b9
parent 1fb05838c437314355b098a2dfe520a661f82105

Merge "Add ENGINE for BoringSSL."

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index bda6948..27ced71 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -225,7 +225,7 @@
     return uid / AID_USER;
 }
 
-static bool keystore_selinux_check_access(uid_t uid, perm_t perm, pid_t spid) {
+static bool keystore_selinux_check_access(uid_t /*uid*/, perm_t perm, pid_t spid) {
     if (!ks_is_selinux_enabled) {
         return true;
     }

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());