Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69

am: 78505bae4c

Change-Id: I52d0f14d8a842504b01a681eaa1dfa8e9253b675
This commit is contained in:
Rob Sloan 2017-06-27 17:41:45 +00:00 committed by android-build-merger
commit 7d6eedfc47

View file

@ -206,23 +206,14 @@ const struct rsa_meth_st keystore_rsa_method = {
NULL /* size */, NULL /* size */,
NULL /* sign */, NULL /* sign */,
NULL /* verify */,
NULL /* encrypt */, NULL /* encrypt */,
NULL /* sign_raw */, NULL /* sign_raw */,
NULL /* decrypt */, NULL /* decrypt */,
NULL /* verify_raw */,
rsa_private_transform, rsa_private_transform,
NULL /* mod_exp */,
NULL /* bn_mod_exp */,
RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE, 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) { const char* ecdsa_get_key_id(const EC_KEY* ec_key) {
@ -282,7 +273,6 @@ const ECDSA_METHOD keystore_ecdsa_method = {
NULL /* finish */, NULL /* finish */,
NULL /* group_order_size */, NULL /* group_order_size */,
ecdsa_sign, ecdsa_sign,
NULL /* verify */,
ECDSA_FLAG_OPAQUE, ECDSA_FLAG_OPAQUE,
}; };