From 05cd3f86167e7a55fbcf9727ce07297fad59b12d Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 25 May 2019 21:12:29 +0800 Subject: ext4crypt: change to upgrade key if export fails Add support to upgrade key when export fails with KEY_REQUIRES_UPGRADE. Ported from https://source.codeaurora.org/quic/la/platform/system/vold/commit/?h=LA.UM.7.9.r1-06100-sm6150.0&id=85c46eaacc60290db5e71380d89eb4d99ed67995 Change-Id: Ic64be8ade00c0b0d014370ecc9341b1ecc9b0d7a --- crypto/ext4crypt/Keymaster4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/ext4crypt/Keymaster4.h') diff --git a/crypto/ext4crypt/Keymaster4.h b/crypto/ext4crypt/Keymaster4.h index 14c230bfd..704cc2c70 100644 --- a/crypto/ext4crypt/Keymaster4.h +++ b/crypto/ext4crypt/Keymaster4.h @@ -103,7 +103,7 @@ class Keymaster { // Generate a key in the keymaster from the given params. bool generateKey(const km::AuthorizationSet& inParams, std::string* key); // Export a key from keymaster. - bool exportKey(km::KeyFormat format, KeyBuffer& kmKey, const std::string& clientId, + km::ErrorCode exportKey(km::KeyFormat format, KeyBuffer& kmKey, const std::string& clientId, const std::string& appData, std::string* key); // If the keymaster supports it, permanently delete a key. bool deleteKey(const std::string& key); -- cgit v1.2.3