commit dfcdf6d80d5187bc3d93e0b6fab8985df4d42803
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 19 03:29:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 19 03:29:41 2020 +0000
tree facf3a9a6f22d91b0417af0dd25d21d281bf736f
parent cf550ed45f320de6cc4f9441fe833b08c5a2ab2c
parent 3cfd4a4a70bcfd2fbf0db3e2854524ff518d3881

Merge "Keystore 2.0: KeyMint returns empty blobs on update"

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),
         }
     }