From 6380e77f283d45584d870e9812e050aff16aa778 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Mon, 23 Nov 2020 15:26:50 +0100 Subject: [PATCH] zkey-ekmfweb: Allow NULL as property value to remove a property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To remove a KMS property function kms_set_key_properties() can be called with the property value set to NULL. Do not assert for non-NULL property values. Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/ekmfweb/zkey-ekmfweb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zkey/ekmfweb/zkey-ekmfweb.c b/zkey/ekmfweb/zkey-ekmfweb.c index d78c4155..a8ca3c28 100644 --- a/zkey/ekmfweb/zkey-ekmfweb.c +++ b/zkey/ekmfweb/zkey-ekmfweb.c @@ -4981,10 +4981,10 @@ int kms_set_key_properties(const kms_handle_t handle, const char *key_id, for (i = 0; i < num_properties; i++) { util_assert(properties[i].name != NULL, "Internal error: property name is NULL"); - util_assert(properties[i].value != NULL, - "Internal error: property value is NULL"); - pr_verbose(ph, " Property '%s': '%s", properties[i].name, - properties[i].value); + + pr_verbose(ph, " Property '%s': '%s'", properties[i].name, + properties[i].value != NULL ? properties[i].value : + "(null)"); } _clear_error(ph);