commit 949ab7dbb9debe9572b1807ffd704d79f77efc94
author Janis Danisevskis <jdanis@google.com> Tue Nov 13 00:14:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 13 00:14:16 2018 +0000
tree 5e2babdb2ab741b2a684bf4445e722b8cd09d0ec
parent a6d6ed2ec393fca2835343b60a021458c0df15c8
parent 28a6b79f4b15d60d81984b1ea99a3240bb029530

Merge "authorization_set.cpp: relax serialization of unknown tags"

keymaster/4.0/support/authorization_set.cpp

diff --git a/keymaster/4.0/support/authorization_set.cpp b/keymaster/4.0/support/authorization_set.cpp
index 10d272a..b6cba61 100644
--- a/keymaster/4.0/support/authorization_set.cpp
+++ b/keymaster/4.0/support/authorization_set.cpp
@@ -261,9 +261,8 @@
 template <>
 struct choose_serializer<> {
     static OutStreams& serialize(OutStreams& out, const KeyParameter& param) {
-        LOG(FATAL) << "Trying to serialize unknown tag " << unsigned(param.tag)
+        LOG(ERROR) << "Trying to serialize unknown tag " << unsigned(param.tag)
                    << ". Did you forget to add it to all_tags_t?";
-        abort();
         return out;
     }
 };