summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Sloan <varomodt@google.com>2017-06-27 17:45:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-27 17:45:37 +0000
commitae9fa426cbcfe1ca809db06e2b5af37cbf70d5cd (patch)
treef64350eda8fa79c9b6ca2d75d56ac8aeed628516
parentfc764df649a1427e29fd1e445d5e70068aedd129 (diff)
parent7d6eedfc471ddbaf16ee9a6e15211e621dca5098 (diff)
downloadsecurity-ae9fa426cbcfe1ca809db06e2b5af37cbf70d5cd.tar.gz
Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c
am: 7d6eedfc47 Change-Id: Ib22db541b587fdde996d51660eb6f21e19875c13
-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,
};