fa50606847
- Merge patches for FATE#314552
+ pesign-fix-export-attributes.patch: fix crash when exporting
the signed attributes
+ pesign-privkey_unneeded.diff: Don't check the private key when
importing the raw signature
- Add pesign-bnc801653-teardown-segfault.patch to fix crash when
freeing digests (bnc801653)
- Drop pesign-digestdata.diff which is no longer needed.
OBS-URL: https://build.opensuse.org/request/show/151539
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=5
34 lines
875 B
Diff
34 lines
875 B
Diff
From 8376d873bf72c06b5efaa9dad812eb783cda5d41 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 25 Jan 2013 10:34:55 -0500
|
|
Subject: [PATCH] Fix up "-E", which apparently broke during some refactoring.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
src/actions.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/src/actions.c b/src/actions.c
|
|
index 6c32819..5c5dd89 100644
|
|
--- a/src/actions.c
|
|
+++ b/src/actions.c
|
|
@@ -373,6 +373,15 @@ generate_sattr_blob(pesign_context *ctx)
|
|
{
|
|
int rc;
|
|
SECItem sa;
|
|
+ SpcContentInfo ci;
|
|
+
|
|
+ memset(&ci, '\0', sizeof (ci));
|
|
+ rc = generate_spc_content_info(ctx->cms_ctx, &ci);
|
|
+ if (rc < 0) {
|
|
+ fprintf(stderr, "Could not generate content info: %s\n",
|
|
+ PORT_ErrorToString(PORT_GetError()));
|
|
+ exit(1);
|
|
+ }
|
|
|
|
rc = generate_signed_attributes(ctx->cms_ctx, &sa);
|
|
if (rc < 0) {
|
|
--
|
|
1.7.10.4
|
|
|