Make "trust anchor --remove" work again
This commit is contained in:
Daiki Ueno
parent
2bd6b57929
commit
825c37950e
158
p11-kit-modifiable.patch
Normal file
158
p11-kit-modifiable.patch
Normal file
@ -0,0 +1,158 @@
|
||||
From acf8c4a91a76bf8049f6bfbd95b04e2e36bae4ea Mon Sep 17 00:00:00 2001
|
||||
From: Daiki Ueno <dueno@redhat.com>
|
||||
Date: Thu, 18 May 2017 10:45:26 +0200
|
||||
Subject: [PATCH 1/2] Revert "trust: Honor "modifiable" setting in persist
|
||||
file"
|
||||
|
||||
This reverts commit 8eed1e60b0921d05872e2f43eee9088cef038d7e, which
|
||||
broke "trust anchor --remove".
|
||||
---
|
||||
trust/input/verisign-v1.p11-kit | 1 -
|
||||
trust/parser.c | 10 +---------
|
||||
trust/test-parser.c | 1 -
|
||||
3 files changed, 1 insertion(+), 11 deletions(-)
|
||||
|
||||
diff --git a/trust/input/verisign-v1.p11-kit b/trust/input/verisign-v1.p11-kit
|
||||
index aea49ea..eaa080d 100644
|
||||
--- a/trust/input/verisign-v1.p11-kit
|
||||
+++ b/trust/input/verisign-v1.p11-kit
|
||||
@@ -1,6 +1,5 @@
|
||||
[p11-kit-object-v1]
|
||||
trusted: true
|
||||
-modifiable: false
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG
|
||||
diff --git a/trust/parser.c b/trust/parser.c
|
||||
index 52d1128..41513d4 100644
|
||||
--- a/trust/parser.c
|
||||
+++ b/trust/parser.c
|
||||
@@ -610,7 +610,6 @@ p11_parser_format_persist (p11_parser *parser,
|
||||
{
|
||||
CK_BBOOL modifiablev = CK_TRUE;
|
||||
CK_ATTRIBUTE *attrs;
|
||||
- CK_ATTRIBUTE *attr;
|
||||
p11_array *objects;
|
||||
bool ret;
|
||||
int i;
|
||||
@@ -631,14 +630,7 @@ p11_parser_format_persist (p11_parser *parser,
|
||||
ret = p11_persist_read (parser->persist, parser->basename, data, length, objects);
|
||||
if (ret) {
|
||||
for (i = 0; i < objects->num; i++) {
|
||||
- /* By default, we mark objects read from a persist
|
||||
- * file as modifiable, as the persist format is
|
||||
- * writable. However, if CKA_MODIFIABLE is explictly
|
||||
- * set in the file, respect the setting. */
|
||||
- attrs = objects->elem[i];
|
||||
- attr = p11_attrs_find_valid (objects->elem[i], CKA_MODIFIABLE);
|
||||
- if (!attr)
|
||||
- attrs = p11_attrs_build (attrs, &modifiable, NULL);
|
||||
+ attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL);
|
||||
sink_object (parser, attrs);
|
||||
}
|
||||
}
|
||||
diff --git a/trust/test-parser.c b/trust/test-parser.c
|
||||
index 088cff9..b5c2525 100644
|
||||
--- a/trust/test-parser.c
|
||||
+++ b/trust/test-parser.c
|
||||
@@ -168,7 +168,6 @@ test_parse_p11_kit_persist (void)
|
||||
{ CKA_CLASS, &certificate, sizeof (certificate) },
|
||||
{ CKA_VALUE, (void *)verisign_v1_ca, sizeof (verisign_v1_ca) },
|
||||
{ CKA_TRUSTED, &truev, sizeof (truev) },
|
||||
- { CKA_MODIFIABLE, &falsev, sizeof (falsev) },
|
||||
{ CKA_X_DISTRUSTED, &falsev, sizeof (falsev) },
|
||||
{ CKA_INVALID },
|
||||
};
|
||||
--
|
||||
2.9.4
|
||||
|
||||
|
||||
From 66c6a7e912d39d66cd4cc91375ac7be418bf7176 Mon Sep 17 00:00:00 2001
|
||||
From: Daiki Ueno <dueno@redhat.com>
|
||||
Date: Thu, 18 May 2017 11:11:45 +0200
|
||||
Subject: [PATCH 2/2] trust: Check magic comment in persist file for
|
||||
modifiablity
|
||||
|
||||
A persistent file written by the trust module starts with the line "#
|
||||
This file has been auto-generated and written by p11-kit". This can
|
||||
be used as a magic word to determine whether the objects read from a
|
||||
.p11-kit file are read-only.
|
||||
---
|
||||
trust/parser.c | 6 +++++-
|
||||
trust/persist.c | 9 ++++++++-
|
||||
trust/test-token.c | 1 +
|
||||
3 files changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/trust/parser.c b/trust/parser.c
|
||||
index 41513d4..abe86fc 100644
|
||||
--- a/trust/parser.c
|
||||
+++ b/trust/parser.c
|
||||
@@ -49,6 +49,7 @@
|
||||
#include "pem.h"
|
||||
#include "pkcs11x.h"
|
||||
#include "persist.h"
|
||||
+#include "types.h"
|
||||
#include "x509.h"
|
||||
|
||||
#include <libtasn1.h>
|
||||
@@ -630,7 +631,10 @@ p11_parser_format_persist (p11_parser *parser,
|
||||
ret = p11_persist_read (parser->persist, parser->basename, data, length, objects);
|
||||
if (ret) {
|
||||
for (i = 0; i < objects->num; i++) {
|
||||
- attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL);
|
||||
+ CK_BBOOL generatedv;
|
||||
+ attrs = objects->elem[i];
|
||||
+ if (p11_attrs_find_bool (attrs, CKA_X_GENERATED, &generatedv) && generatedv)
|
||||
+ attrs = p11_attrs_build (attrs, &modifiable, NULL);
|
||||
sink_object (parser, attrs);
|
||||
}
|
||||
}
|
||||
diff --git a/trust/persist.c b/trust/persist.c
|
||||
index 63a531e..928260e 100644
|
||||
--- a/trust/persist.c
|
||||
+++ b/trust/persist.c
|
||||
@@ -631,6 +631,9 @@ p11_persist_read (p11_persist *persist,
|
||||
CK_ATTRIBUTE *attrs;
|
||||
bool failed;
|
||||
bool skip;
|
||||
+ CK_BBOOL generatedv = CK_FALSE;
|
||||
+ CK_ATTRIBUTE generated = { CKA_X_GENERATED, &generatedv, sizeof (generatedv) };
|
||||
+ static const char comment[] = "# This file has been auto-generated and written by p11-kit.";
|
||||
|
||||
return_val_if_fail (persist != NULL, false);
|
||||
return_val_if_fail (objects != NULL, false);
|
||||
@@ -639,6 +642,10 @@ p11_persist_read (p11_persist *persist,
|
||||
attrs = NULL;
|
||||
failed = false;
|
||||
|
||||
+ if (length >= sizeof (comment) - 1 &&
|
||||
+ memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0)
|
||||
+ generatedv = CK_TRUE;
|
||||
+
|
||||
p11_lexer_init (&lexer, filename, (const char *)data, length);
|
||||
while (p11_lexer_next (&lexer, &failed)) {
|
||||
switch (lexer.tok_type) {
|
||||
@@ -650,7 +657,7 @@ p11_persist_read (p11_persist *persist,
|
||||
p11_lexer_msg (&lexer, "unrecognized or invalid section header");
|
||||
skip = true;
|
||||
} else {
|
||||
- attrs = p11_attrs_build (NULL, NULL);
|
||||
+ attrs = p11_attrs_build (NULL, &generated, NULL);
|
||||
return_val_if_fail (attrs != NULL, false);
|
||||
skip = false;
|
||||
}
|
||||
diff --git a/trust/test-token.c b/trust/test-token.c
|
||||
index ad22fcb..3e7d735 100644
|
||||
--- a/trust/test-token.c
|
||||
+++ b/trust/test-token.c
|
||||
@@ -610,6 +610,7 @@ static void
|
||||
test_modify_multiple (void)
|
||||
{
|
||||
const char *test_data =
|
||||
+ "# This file has been auto-generated and written by p11-kit.\n"
|
||||
"[p11-kit-object-v1]\n"
|
||||
"class: data\n"
|
||||
"label: \"first\"\n"
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
Name: p11-kit
|
||||
Version: 0.23.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Library for loading and sharing PKCS#11 modules
|
||||
|
||||
License: BSD
|
||||
URL: http://p11-glue.freedesktop.org/p11-kit.html
|
||||
Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz
|
||||
Source1: trust-extract-compat
|
||||
Patch0: p11-kit-modifiable.patch
|
||||
|
||||
BuildRequires: libtasn1-devel >= 2.3
|
||||
BuildRequires: libffi-devel
|
||||
@ -61,6 +62,7 @@ feature is still experimental.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
# These paths are the source paths that come from the plan here:
|
||||
@ -133,6 +135,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 18 2017 Daiki Ueno <dueno@redhat.com> - 0.23.5-2
|
||||
- Make "trust anchor --remove" work again
|
||||
|
||||
* Thu Mar 2 2017 Daiki Ueno <dueno@redhat.com> - 0.23.5-1
|
||||
- Update to 0.23.5 release
|
||||
- Rename -tools subpackage to -server and remove systemd unit files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user