summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Sloan <varomodt@google.com>2017-06-27 17:47:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-27 17:47:42 +0000
commitccb75f720911cd5fa0288450276f3211b9e09e83 (patch)
treec6fa9e6d05921af363b65eac4052064386ada783
parent0143be76b9c54df1333d12c0b5cc8cd8cedf47c3 (diff)
parentae9fa426cbcfe1ca809db06e2b5af37cbf70d5cd (diff)
downloadsecurity-ccb75f720911cd5fa0288450276f3211b9e09e83.tar.gz
Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c am: 7d6eedfc47
am: ae9fa426cb Change-Id: I9a9d83f80afe33990769d6eb07b9b5374f9291e4
-rw-r--r--keystore-engine/android_engine.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index b7b81992..368590c0 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -207,23 +207,14 @@ const struct rsa_meth_st keystore_rsa_method = {
NULL /* size */,
NULL /* sign */,
- NULL /* verify */,
NULL /* encrypt */,
NULL /* sign_raw */,
NULL /* decrypt */,
- NULL /* verify_raw */,
rsa_private_transform,
- NULL /* mod_exp */,
- NULL /* bn_mod_exp */,
-
RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE,
-
- NULL /* keygen */,
- NULL /* multi_prime_keygen */,
- NULL /* supports_digest */,
};
const char* ecdsa_get_key_id(const EC_KEY* ec_key) {
@@ -283,7 +274,6 @@ const ECDSA_METHOD keystore_ecdsa_method = {
NULL /* finish */,
NULL /* group_order_size */,
ecdsa_sign,
- NULL /* verify */,
ECDSA_FLAG_OPAQUE,
};