1 files changed, 7 insertions, 4 deletions
diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
index ee45ec9776..3db3d29e69 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
@@ -15,7 +15,7 @@
   They will do basic validation for authentication data structure, then call crypto library
   to verify the signature.
 
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -478,8 +478,8 @@ AddPubKeyInStore (
              &mVariableModuleGlobal->VariableGlobal,
              FALSE
              );
-  ASSERT_EFI_ERROR (Status);
   if (EFI_ERROR (Status)) {
+    DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));
     return 0;
   }
 
@@ -530,8 +530,8 @@ AddPubKeyInStore (
                  &mVariableModuleGlobal->VariableGlobal,
                  FALSE
                  );
-      ASSERT_EFI_ERROR (Status);
       if (EFI_ERROR (Status)) {
+        DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));
         return 0;
       }
 
@@ -562,7 +562,10 @@ AddPubKeyInStore (
                &Variable,
                NULL
                );
-    ASSERT_EFI_ERROR (Status);
+    if (EFI_ERROR (Status)) {
+      DEBUG ((EFI_D_ERROR, "Update public key database variable failure, Status = %r\n", Status));
+      return 0;
+    }
   }
 
   return Index;