summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Sloan <varomodt@google.com>2017-06-27 17:41:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-27 17:41:45 +0000
commit7d6eedfc471ddbaf16ee9a6e15211e621dca5098 (patch)
treec7e3671bae64efefcd6052de01659069db5c9e74
parent067111a62570831dbcb79e1bb4e1755a399aac9a (diff)
parent78505bae4ce8d571d8543e9066d6f6a85ebefa95 (diff)
downloadsecurity-7d6eedfc471ddbaf16ee9a6e15211e621dca5098.tar.gz
Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69
am: 78505bae4c Change-Id: I52d0f14d8a842504b01a681eaa1dfa8e9253b675
-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 25d426fe..d4d1e840 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -206,23 +206,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) {
@@ -282,7 +273,6 @@ const ECDSA_METHOD keystore_ecdsa_method = {
NULL /* finish */,
NULL /* group_order_size */,
ecdsa_sign,
- NULL /* verify */,
ECDSA_FLAG_OPAQUE,
};