From owner-svn-src-vendor@freebsd.org Thu Aug 31 11:43:22 2017 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E4A4E1C835; Thu, 31 Aug 2017 11:43:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B25974849; Thu, 31 Aug 2017 11:43:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VBhLce092104; Thu, 31 Aug 2017 11:43:21 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VBhL2E092103; Thu, 31 Aug 2017 11:43:21 GMT (envelope-from des@FreeBSD.org) Message-Id: <201708311143.v7VBhL2E092103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Thu, 31 Aug 2017 11:43:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r323048 - vendor/unbound/dist/validator X-SVN-Group: vendor X-SVN-Commit-Author: des X-SVN-Commit-Paths: vendor/unbound/dist/validator X-SVN-Commit-Revision: 323048 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2017 11:43:22 -0000 Author: des Date: Thu Aug 31 11:43:21 2017 New Revision: 323048 URL: https://svnweb.freebsd.org/changeset/base/323048 Log: Merge upstream r4302 to support multiple concurrently valid anchors. Modified: vendor/unbound/dist/validator/autotrust.c Modified: vendor/unbound/dist/validator/autotrust.c ============================================================================== --- vendor/unbound/dist/validator/autotrust.c Thu Aug 31 10:59:39 2017 (r323047) +++ vendor/unbound/dist/validator/autotrust.c Thu Aug 31 11:43:21 2017 (r323048) @@ -1571,6 +1571,11 @@ key_matches_a_ds(struct module_env* env, struct val_en verbose(VERB_ALGO, "DS match attempt failed"); continue; } + /* match of hash is sufficient for bootstrap of trust point */ + (void)reason; + (void)ve; + return 1; + /* no need to check RRSIG, DS hash already matched with source if(dnskey_verify_rrset(env, ve, dnskey_rrset, dnskey_rrset, key_idx, &reason) == sec_status_secure) { return 1; @@ -1578,6 +1583,7 @@ key_matches_a_ds(struct module_env* env, struct val_en verbose(VERB_ALGO, "DS match failed because the key " "does not verify the keyset: %s", reason); } + */ } return 0; }