From owner-svn-ports-all@freebsd.org Fri Aug 18 13:39:09 2017 Return-Path: Delivered-To: svn-ports-all@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 EA5C7DE2277; Fri, 18 Aug 2017 13:39:09 +0000 (UTC) (envelope-from rakuco@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 B7CA93F18; Fri, 18 Aug 2017 13:39:09 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IDd8bR043590; Fri, 18 Aug 2017 13:39:08 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IDd874043589; Fri, 18 Aug 2017 13:39:08 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201708181339.v7IDd874043589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 18 Aug 2017 13:39:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448230 - head/sysutils/pesign/files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: head/sysutils/pesign/files X-SVN-Commit-Revision: 448230 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2017 13:39:10 -0000 Author: rakuco Date: Fri Aug 18 13:39:08 2017 New Revision: 448230 URL: https://svnweb.freebsd.org/changeset/ports/448230 Log: Remove unused KeyIdTemplate variable from cms_common.c. This fixes the build with GCC 6: cms_common.c:1668:31: error: 'KeyIdTemplate' defined but not used [-Werror=unused-const-variable=] Note that the build is still broken on HEAD due to some macros being defined in base's headers. PR: 219275 Modified: head/sysutils/pesign/files/patch-src-cms_common.c Modified: head/sysutils/pesign/files/patch-src-cms_common.c ============================================================================== --- head/sysutils/pesign/files/patch-src-cms_common.c Fri Aug 18 13:21:06 2017 (r448229) +++ head/sysutils/pesign/files/patch-src-cms_common.c Fri Aug 18 13:39:08 2017 (r448230) @@ -1,5 +1,5 @@ ---- src/cms_common.c.orig 2014-10-24 21:51:06.000000000 +0200 -+++ src/cms_common.c 2015-01-16 10:00:34.000000000 +0100 +--- src/cms_common.c.orig 2014-10-24 19:51:06 UTC ++++ src/cms_common.c @@ -45,7 +45,7 @@ struct digest_param { SECOidTag digest_tag; SECOidTag signature_tag; @@ -9,3 +9,29 @@ int size; }; +@@ -1664,25 +1664,6 @@ typedef struct { + SECItem oid; + SECItem keyhash; + } KeyId; +- +-static const SEC_ASN1Template KeyIdTemplate[] = { +- {.kind = SEC_ASN1_SEQUENCE, +- .offset = 0, +- .sub = NULL, +- .size = sizeof (KeyId), +- }, +- {.kind = SEC_ASN1_OBJECT_ID, +- .offset = offsetof(KeyId, oid), +- .sub = &SEC_ObjectIDTemplate, +- .size = sizeof (SECItem), +- }, +- {.kind = SEC_ASN1_OCTET_STRING, +- .offset = offsetof(KeyId, keyhash), +- .sub = NULL, +- .size = sizeof (SECItem), +- }, +- { 0 } +-}; + + int + generate_keys(cms_context *cms, PK11SlotInfo *slot,