|
 |
0ac9f2 |
From e0238e2363f9668aee07b2e44a8f358e694551c0 Mon Sep 17 00:00:00 2001
|
|
|
0ac9f2 |
From: Peter Jones <pjones@redhat.com>
|
|
|
0ac9f2 |
Date: Mon, 24 Apr 2017 15:18:10 -0400
|
|
|
0ac9f2 |
Subject: [PATCH 09/29] pesigcheck: make --certfile actually work
|
|
|
0ac9f2 |
|
|
|
0ac9f2 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
0ac9f2 |
---
|
|
|
0ac9f2 |
src/pesigcheck.c | 9 +++++++--
|
|
|
0ac9f2 |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
0ac9f2 |
|
|
|
0ac9f2 |
diff --git a/src/pesigcheck.c b/src/pesigcheck.c
|
|
|
0ac9f2 |
index 0d49c1a..d7be542 100644
|
|
|
0ac9f2 |
--- a/src/pesigcheck.c
|
|
|
0ac9f2 |
+++ b/src/pesigcheck.c
|
|
|
0ac9f2 |
@@ -130,7 +130,7 @@ check_signature(pesigcheck_context *ctx)
|
|
|
0ac9f2 |
cert_iter iter;
|
|
|
0ac9f2 |
|
|
|
0ac9f2 |
generate_digest(ctx->cms_ctx, ctx->inpe, 1);
|
|
|
0ac9f2 |
-
|
|
|
0ac9f2 |
+
|
|
|
0ac9f2 |
if (check_db_hash(DBX, ctx) == FOUND)
|
|
|
0ac9f2 |
return -1;
|
|
|
0ac9f2 |
|
|
|
0ac9f2 |
@@ -225,6 +225,11 @@ main(int argc, char *argv[])
|
|
|
0ac9f2 |
.argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
|
|
|
0ac9f2 |
.arg = (void *)callback,
|
|
|
0ac9f2 |
.descrip = (void *)ctxp },
|
|
|
0ac9f2 |
+ {.longName = "certfile",
|
|
|
0ac9f2 |
+ .shortName = 'c',
|
|
|
0ac9f2 |
+ .argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
|
|
|
0ac9f2 |
+ .arg = (void *)callback,
|
|
|
0ac9f2 |
+ .descrip = (void *)ctxp },
|
|
|
0ac9f2 |
{.longName = "in",
|
|
|
0ac9f2 |
.shortName = 'i',
|
|
|
0ac9f2 |
.argInfo = POPT_ARG_STRING,
|
|
|
0ac9f2 |
@@ -258,7 +263,7 @@ main(int argc, char *argv[])
|
|
|
0ac9f2 |
.shortName = 'c',
|
|
|
0ac9f2 |
.argInfo = POPT_ARG_STRING,
|
|
|
0ac9f2 |
.arg = &certfile,
|
|
|
0ac9f2 |
- .descrip = "the certificate (in DER form) for verification ",
|
|
|
0ac9f2 |
+ .descrip = "import certfile (in DER encoding) for allowed certificate",
|
|
|
0ac9f2 |
.argDescrip = "<certfile>" },
|
|
|
0ac9f2 |
POPT_AUTOALIAS
|
|
|
0ac9f2 |
POPT_AUTOHELP
|
|
|
0ac9f2 |
--
|
|
|
0ac9f2 |
2.13.4
|
|
|
0ac9f2 |
|