aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2017-08-18 13:39:08 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2017-08-18 13:39:08 +0000
commitebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b (patch)
tree62753cb5f046031a202a0eb8028a5342e7f3de2e /sysutils
parent8013c10f846b4af4a7eb815a2d5abc4e01f56e08 (diff)
downloadports-ebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b.tar.gz
ports-ebddf0abb5a2ccc9562b8f5ae10d715a8145ae7b.zip
Notes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/pesign/files/patch-src-cms_common.c30
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,