commit 3cfd4a4a70bcfd2fbf0db3e2854524ff518d3881
author Janis Danisevskis <jdanis@google.com> Mon Nov 23 13:42:38 2020 -0800
committer Janis Danisevskis <jdanis@google.com> Thu Dec 17 13:38:10 2020 -0800
tree facf3a9a6f22d91b0417af0dd25d21d281bf736f
parent cf550ed45f320de6cc4f9441fe833b08c5a2ab2c

Keystore 2.0: KeyMint returns empty blobs on update

Instead of None, keymint returns empty blobs on update.

Test: Keystore CTS test suite
Change-Id: I8b4890c9172c7541fe1dc7eb79865fa75f0087f2

keystore2/src/operation.rs

diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs
index 13a9b0c..7c3d201 100644
--- a/keystore2/src/operation.rs
+++ b/keystore2/src/operation.rs
@@ -377,7 +377,13 @@
         .context("In update: KeyMint::update failed.")?;
 
         match output {
-            Some(blob) => Ok(Some(blob.data)),
+            Some(blob) => {
+                if blob.data.is_empty() {
+                    Ok(None)
+                } else {
+                    Ok(Some(blob.data))
+                }
+            }
             None => Ok(None),
         }
     }