commit c7c4d777f08ecbd0d6d3fea334e7f652e548da2e
author Kenny Root <kroot@google.com> Mon Dec 15 22:21:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 15 22:21:55 2014 +0000
tree 0d361a41b370519a1fd02122d9a39e77065fb618
parent 77d71ca20c30a5e7ecfa20980ade9b90cc7ca65c
parent a4af2b61bb1cc308c6c7f03fb31d266399c7847d

am a4af2b61: am 6ab2fc83: Merge "system/security: sync with latest BoringSSL."

* commit 'a4af2b61bb1cc308c6c7f03fb31d266399c7847d':
  system/security: sync with latest BoringSSL.

keystore-engine/android_engine.cpp

diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index ee16312..b368a3f 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -220,6 +220,7 @@
   RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE | RSA_FLAG_EXT_PKEY,
 
   NULL /* keygen */,
+  NULL /* supports_digest */,
 };
 
 const char* ecdsa_get_key_id(const EC_KEY* ec_key) {

softkeymaster/keymaster_openssl.cpp

diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index 2dc4109..5864310 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -312,8 +312,8 @@
         return -1;
     }
 
-    EC_GROUP_set_point_conversion_form(group.get(), POINT_CONVERSION_UNCOMPRESSED);
 #if !defined(OPENSSL_IS_BORINGSSL)
+    EC_GROUP_set_point_conversion_form(group.get(), POINT_CONVERSION_UNCOMPRESSED);
     EC_GROUP_set_asn1_flag(group.get(), OPENSSL_EC_NAMED_CURVE);
 #endif