diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-14 02:44:03 +0000 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-08-14 02:44:03 +0000 |
| commit | e748085f5ee441a2c0a1380e9da824fd07877873 (patch) | |
| tree | 2bf64c790c2272d1ef6a7f7af95b0117d21b5577 | |
| parent | 3fceedc788498733952279a97944f4ea22892577 (diff) | |
| download | android_system_keymaster-e748085f5ee441a2c0a1380e9da824fd07877873.tar.gz android_system_keymaster-e748085f5ee441a2c0a1380e9da824fd07877873.tar.bz2 android_system_keymaster-e748085f5ee441a2c0a1380e9da824fd07877873.zip | |
Revert "Hack to work around broken bullhead keymaster app."
This reverts commit 3fceedc788498733952279a97944f4ea22892577.
Change-Id: Ie17dd16f8689810af9efe071a0d006e026782af6
| -rw-r--r-- | soft_keymaster_device.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp index 6ffa6f8..9f3418e 100644 --- a/soft_keymaster_device.cpp +++ b/soft_keymaster_device.cpp @@ -73,14 +73,6 @@ static keymaster_error_t add_digests(keymaster1_device_t* dev, keymaster_algorit keymaster_digest_t* digests; size_t digests_length; - if (algorithm == KM_ALGORITHM_RSA && - (purpose == KM_PURPOSE_ENCRYPT || purpose == KM_PURPOSE_DECRYPT)) { - // Temporary hack: On bullhead there's a problem with the keymaster app. It rejects - // requests for digests for RSA and purpose ENCRYPT or DECRYPT. Since the result is the - // same as for SIGN or VERIFY, we just ask for SIGN in this case. - // TODO(swillden): Remove this hack when bullhead's keymaster is fixed. - purpose = KM_PURPOSE_SIGN; - } keymaster_error_t error = dev->get_supported_digests(dev, algorithm, purpose, &digests, &digests_length); if (error != KM_ERROR_OK) { |