summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS10
-rw-r--r--configure.ac2
-rw-r--r--doc/manual/Makefile.am3
-rw-r--r--trust/Makefile.am2
-rw-r--r--trust/anchor.c2
-rw-r--r--trust/extract.c4
6 files changed, 18 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index ea64056..4bae3c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+0.19.4 (unstable)
+ * 'trust anchor' now adds/removes certificate anchors
+ * 'trust list' lists trust policy stuff
+ * 'p11-kit extract' is now 'trust extract'
+ * 'p11-kit extract-trust' is now 'trust extract-compat'
+ * Workarounds for working on broken zfsonlinux.org [#68525]
+ * Add --with-module-config parameter to the configure script [#68122]
+ * Add support for removing stored PKCS#11 objects in trust module
+ * Various debugging tweaks
+
0.19.3 (unstable)
* Fix up problems with automake testing
* Fix a bunch of memory leaks in newly refactored code
diff --git a/configure.ac b/configure.ac
index 5a64e20..955e52f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.61)
AC_INIT([p11-kit],
- [0.19.3],
+ [0.19.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],
[p11-kit],
[http://p11-glue.freedesktop.org/p11-kit.html])
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index e839841..4d6ce6b 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -77,6 +77,7 @@ content_files=p11-kit-config.xml p11-kit-sharing.xml \
p11-kit-trust.xml \
p11-kit.xml \
pkcs11.conf.xml \
+ trust.xml \
annotation-glossary.xml \
$(NULL)
@@ -147,9 +148,11 @@ endif # ENABLE_GTK_DOC
MAN_IN_FILES = \
$(man8_MANS:.8=.xml) \
$(man5_MANS:.5=.xml) \
+ $(man1_MANS:.1=.xml) \
$(NULL)
CLEANFILES += \
+ $(man1_MANS) \
$(man5_MANS) \
$(man8_MANS) \
$(NULL)
diff --git a/trust/Makefile.am b/trust/Makefile.am
index 7410f5d..d6d291f 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -104,7 +104,7 @@ trust_SOURCES = \
extract-openssl.c \
extract-pem.c \
extract-cer.c \
- list.c \
+ list.c list.h \
openssl.asn openssl.asn.h \
save.c save.h \
trust.c \
diff --git a/trust/anchor.c b/trust/anchor.c
index a111e14..d00bef3 100644
--- a/trust/anchor.c
+++ b/trust/anchor.c
@@ -172,7 +172,7 @@ files_to_attrs (int argc,
p11_parser *parser;
p11_array *parsed;
p11_array *array;
- int ret;
+ int ret = P11_PARSE_SUCCESS;
int i, j;
array = p11_array_new (p11_attrs_free);
diff --git a/trust/extract.c b/trust/extract.c
index d12d18b..1a38f11 100644
--- a/trust/extract.c
+++ b/trust/extract.c
@@ -288,8 +288,8 @@ int
p11_trust_extract_compat (int argc,
char *argv[])
{
- char *path;
- char *path2;
+ char *path = NULL;
+ char *path2 = NULL;
int error;
argv[argc] = NULL;