From 411a7a6d31cd5584ff9837260d77d8c306d3b557 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sat, 1 Jun 2019 14:08:41 +0200 Subject: trust: Fix mismatched return values --- trust/pem.c | 2 +- trust/x509.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trust/pem.c b/trust/pem.c index fae7dd6..8ab60e6 100644 --- a/trust/pem.c +++ b/trust/pem.c @@ -265,7 +265,7 @@ p11_pem_write (const unsigned char *contents, prefix = buf->len; target = p11_buffer_append (buf, estimate); - return_val_if_fail (target != NULL, NULL); + return_val_if_fail (target != NULL, false); /* * OpenSSL is absolutely certain that it wants its PEM base64 diff --git a/trust/x509.c b/trust/x509.c index 3b4fb2d..079730a 100644 --- a/trust/x509.c +++ b/trust/x509.c @@ -101,8 +101,8 @@ p11_x509_hash_subject_public_key (node_asn *cert, size_t len; int ret; - return_val_if_fail (cert != NULL, NULL); - return_val_if_fail (der != NULL, NULL); + return_val_if_fail (cert != NULL, false); + return_val_if_fail (der != NULL, false); ret = asn1_der_decoding_startEnd (cert, der, der_len, "tbsCertificate.subjectPublicKeyInfo", &start, &end); return_val_if_fail (ret == ASN1_SUCCESS, false); -- cgit v1.1