From 07e98b519385df6ea4e71f3f1941e47e8b5531dc Mon Sep 17 00:00:00 2001 From: Peter Marschall Date: Sun, 26 Jul 2020 11:48:53 +0200 Subject: [PATCH] pkcs15-sc-hsm: fix commit c4d7bb1 Set the trigger for LOG_TEST_RET() to a negative value if obj.data == NULL. --- src/libopensc/pkcs15-sc-hsm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libopensc/pkcs15-sc-hsm.c b/src/libopensc/pkcs15-sc-hsm.c index 89d78ee5..b8df3b7c 100644 --- a/src/libopensc/pkcs15-sc-hsm.c +++ b/src/libopensc/pkcs15-sc-hsm.c @@ -794,9 +794,9 @@ static int sc_pkcs15emu_sc_hsm_add_cd(sc_pkcs15_card_t * p15card, u8 id) { memset(&obj, 0, sizeof(obj)); r = sc_pkcs15_decode_cdf_entry(p15card, &obj, &ptr, &len); - if (obj.data == NULL || r != SC_SUCCESS) { - LOG_TEST_RET(card->ctx, r, "Skipping optional EF.CDOD"); - } + if (obj.data == NULL && r >= SC_SUCCESS) + r = SC_ERROR_OBJECT_NOT_FOUND; + LOG_TEST_RET(card->ctx, r, "Skipping optional EF.CDOD"); cert_info = (sc_pkcs15_cert_info_t *)obj.data;