From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 5 Feb 2018 09:07:39 +0000 (+0100)
Subject: resolved: use _cleanup_ in one more place
X-Git-Tag: v238~145^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8100%2Fhead;p=thirdparty%2Fsystemd.git

resolved: use _cleanup_ in one more place

No functional change.
---

diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c
index 05941473b0e..1bd2c93a337 100644
--- a/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@@ -1167,7 +1167,7 @@ static int digest_to_gcrypt_md(uint8_t algorithm) {
 
 int dnssec_verify_dnskey_by_ds(DnsResourceRecord *dnskey, DnsResourceRecord *ds, bool mask_revoke) {
         char owner_name[DNSSEC_CANONICAL_HOSTNAME_MAX];
-        gcry_md_hd_t md = NULL;
+        _cleanup_(gcry_md_closep) gcry_md_hd_t md = NULL;
         size_t hash_size;
         int md_algorithm, r;
         void *result;
@@ -1223,16 +1223,10 @@ int dnssec_verify_dnskey_by_ds(DnsResourceRecord *dnskey, DnsResourceRecord *ds,
         gcry_md_write(md, dnskey->dnskey.key, dnskey->dnskey.key_size);
 
         result = gcry_md_read(md, 0);
-        if (!result) {
-                r = -EIO;
-                goto finish;
-        }
-
-        r = memcmp(result, ds->ds.digest, ds->ds.digest_size) != 0;
+        if (!result)
+                return -EIO;
 
-finish:
-        gcry_md_close(md);
-        return r;
+        return memcmp(result, ds->ds.digest, ds->ds.digest_size) != 0;
 }
 
 int dnssec_verify_dnskey_by_ds_search(DnsResourceRecord *dnskey, DnsAnswer *validated_ds) {