diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2017-08-18 13:39:08 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2017-08-18 13:39:08 +0000 |
| commit | ebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b (patch) | |
| tree | 62753cb5f046031a202a0eb8028a5342e7f3de2e /sysutils/pesign | |
| parent | 8013c10f846b4af4a7eb815a2d5abc4e01f56e08 (diff) | |
| download | ports-ebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b.tar.gz ports-ebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b.zip | |
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
Notes
Notes:
svn path=/head/; revision=448230
Diffstat (limited to 'sysutils/pesign')
| -rw-r--r-- | sysutils/pesign/files/patch-src-cms_common.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/sysutils/pesign/files/patch-src-cms_common.c b/sysutils/pesign/files/patch-src-cms_common.c index 6f19ea130d16..30336e5dc55d 100644 --- a/sysutils/pesign/files/patch-src-cms_common.c +++ b/sysutils/pesign/files/patch-src-cms_common.c @@ -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, |