svn commit: r448230 - head/sysutils/pesign/files

[Raphael Kubo da Costa]

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,