开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:p11-kit.spec Changed

@@ -1,17 +1,24 @@
 Name:           p11-kit
-Version:        0.25.0
-Release:        2
+Version:        0.25.5
+Release:        1
 Summary:        Provides a way to load and enumerate PKCS#11 modules.
-License:        BSD
-URL:            http://p11-glue.freedesktop.org/p11-kit.html
+License:        BSD-3-Clause
+URL:            https://p11-glue.freedesktop.org/p11-kit.html
 
 Source0:        https://github.com/p11-glue/p11-kit/releases/download/%{version}/%{name}-%{version}.tar.xz
 Source1:        p11-kit-client.service
 
-Patch0: backport-Fix-probing-of-C_GetInterface.patch
-
-BuildRequires:  gcc libtasn1-devel >= 2.3 libffi-devel gtk-doc systemd-devel pkgconfig(glib-2.0) libxslt
-BuildRequires:  bash-completion
+BuildRequires: gcc
+BuildRequires: meson >= 0.51
+BuildRequires: pkgconfig(bash-completion)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libffi) >= 3.0.0
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(libtasn1) >= 2.3
+BuildRequires: pkgconfig(systemd)
+BuildRequires: gtk-doc
+BuildRequires: /usr/bin/xsltproc
+BuildRequires: /usr/bin/msgfmt
 
 %description
 Provides a way to load and enumerate PKCS#11 modules.
@@ -46,12 +53,7 @@
 export PKCS#11 modules through a Unix domain socket.  Note that this
 feature is still experimental.
 
-%package help
-Summary:        Help infomation of %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description help
-This package contains help information of p11-kit.
+%package_help
 
 %define multilib_arches ppc64 sparc64 x86_64 ppc64le
 %ifarch %{multilib_arches}
@@ -64,32 +66,33 @@
 %autosetup -p1
 
 %build
-%configure --enable-doc --with-trust-paths=/etc/pki/ca-trust/source:/usr/share/pki/ca-trust-source
-make -j 4 V=1
+%meson -Dman=true -Dgtk_doc=true -Dtrust_paths="/etc/pki/ca-trust/source:/usr/share/pki/ca-trust-source"
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_userunitdir}
-find $RPM_BUILD_ROOT -type f -name "*.la" -delete -print
+install -p -m 644 %{S:1} $RPM_BUILD_ROOT%{_userunitdir}
 
-%check
-make check
+%find_lang %{name}
 
-%post -p /sbin/ldconfig
+# Install the example conf with %%doc instead
+rm -f %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example
+
+%check
+%meson_test
 
 %post trust
 %{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30
 
-%postun -p /sbin/ldconfig
-
 %postun trust
 if  $1 -eq 0 ; then
         %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so
 fi
  
-%files
+%files -f %{name}.lang
 %license COPYING
+%doc %{_vpath_builddir}/p11-kit/pkcs11.conf.example
 %dir %{_libexecdir}/p11-kit
 %dir %{_sysconfdir}/pkcs11
 %dir %{_sysconfdir}/pkcs11/modules
@@ -110,14 +113,12 @@
 
 %files help
 %doc AUTHORS NEWS README
-%doc p11-kit/pkcs11.conf.example
-%{_mandir}/man1/trust.1.gz
-%{_mandir}/man8/p11-kit.8.gz
-%{_mandir}/man5/pkcs11.conf.5.gz
-%{_sysconfdir}/pkcs11/pkcs11.conf.example
+%{_mandir}/man1/trust.1*
+%{_mandir}/man8/p11-kit.8*
+%{_mandir}/man5/pkcs11.conf.5*
 
 %files devel
-%doc %{_datadir}/gtk-doc/
+%doc %{_datadir}/gtk-doc/*
 %{_includedir}/p11-kit-1/
 %{_libdir}/libp11-kit.so
 %{_libdir}/pkgconfig/p11-kit-1.pc
@@ -132,6 +133,10 @@
 %{_datadir}/bash-completion/completions/trust
 
 %changelog
+* Fri Aug 09 2024 Funda Wang <fundawang@yeah.net> - 0.25.5-1
+- update to version 0.25.5
+- build with meson instead
+
 * Tue Sep 26 2023 wangyunjia <yunjia.wang@huawei.com> - 0.25.0-2
 - backport patch for glib-networking

_service:tar_scm:backport-Fix-probing-of-C_GetInterface.patch Deleted

@@ -1,45 +0,0 @@
-From d1d4b0ac316a27c739ff91e6c4153f1154e96e5a Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@xry111.site>
-Date: Thu, 27 Jul 2023 12:18:15 +0800
-Subject: PATCH Fix probing of C_GetInterface
-
-`p11_dl_symbol (dl, "C_GetInterface")` uses dlsym() to find
-C_GetInterface in the loaded pkcs11 module.  For legacy (pre-3.0) pkcs11
-modules, C_GetInterface is not defined in the module.  But according to
-the documentation of dlsym():
-
-    The search performed by dlsym() is breadth first through the
-    dependency tree of these shared objects.
-
-So if a pkcs11 module links to libp11-kit.so, the C_GetInterface
-implementation in libp11-kit.so itself will be found.  This
-C_GetInterface will return the metadata of p11-kit-proxy.so, causing
-"Refuse to load the p11-kit-proxy.so as a registered module".
-
-To solve the issue, if p11_dl_symbol() returns the C_GetInterface in
-libp11-kit.so itself, we should ignore it and continue trying
-C_GetFunctionList.
----
- p11-kit/modules.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/p11-kit/modules.c b/p11-kit/modules.c
-index 8ad88ae..da0a7f0 100644
---- a/p11-kit/modules.c
-+++ b/p11-kit/modules.c
-@@ -383,6 +383,12 @@ dlopen_and_get_function_list (Module *mod,
- 	mod->loaded_module = dl;
- 
- 	gi = p11_dl_symbol (dl, "C_GetInterface");
-+
-+#ifndef OS_WIN32
-+	if (gi == C_GetInterface)
-+		gi = NULL;
-+#endif
-+
- 	if (gi) {
- 		/* Get the default standard interface */
- 		rv = gi ((unsigned char *)"PKCS 11", NULL, &interface, 0);
--- 
-2.27.0
-

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/tool.c Deleted

@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 2011, Collabora Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include "buffer.h"
-#include "compat.h"
-#include "debug.h"
-#include "message.h"
-#include "path.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(x) dgettext(PACKAGE_NAME, x)
-#else
-#define _(x) (x)
-#endif
-
-#include "tool.h"
-
-static char
-short_option (int opt)
-{
-	if (isalpha (opt) || isdigit (opt))
-		return (char)opt;
-	return 0;
-}
-
-static const struct option *
-find_option (const struct option *longopts,
-             int opt)
-{
-	int i;
-
-	for (i = 0; longoptsi.name != NULL; i++) {
-		if (longoptsi.val == opt)
-			return longopts + i;
-	}
-
-	return NULL;
-}
-
-void
-p11_tool_usage (const p11_tool_desc *usages,
-                const struct option *longopts)
-{
-	const struct option *longopt;
-	const int indent = 22;
-	const char *long_name;
-	const char *description;
-	const char *next;
-	char short_name;
-	int spaces;
-	int len;
-	int i;
-
-	for (i = 0; usagesi.text != NULL; i++) {
-
-		/* If no option, then this is a heading */
-		if (!usagesi.option) {
-			printf ("%s\n\n", usagesi.text);
-			continue;
-		}
-
-		longopt = find_option (longopts, usagesi.option);
-		long_name = longopt ? longopt->name : NULL;
-		short_name = short_option (usagesi.option);
-		description = usagesi.text;
-
-		if (short_name && long_name)
-			len = printf ("  -%c, --%s", (int)short_name, long_name);
-		else if (long_name)
-			len = printf ("  --%s", long_name);
-		else
-			len = printf ("  -%c", (int)short_name);
-		if (longopt && longopt->has_arg)
-			len += printf ("%s<%s>",
-			               long_name ? "=" : " ",
-			               usagesi.arg ? usagesi.arg : "...");
-		if (len < indent) {
-			spaces = indent - len;
-		} else {
-			printf ("\n");
-			spaces = indent;
-		}
-		while (description) {
-			while (spaces-- > 0)
-				fputc (' ', stdout);
-			next = strchr (description, '\n');
-			if (next) {
-				next += 1;
-				printf ("%.*s", (int)(next - description), description);
-				description = next;
-				spaces = indent;
-			} else {
-				printf ("%s\n", description);
-				break;
-			}
-		}
-
-	}
-}
-
-int
-p11_tool_getopt (int argc,
-                 char *argv,
-                 const struct option *longopts)
-{
-	p11_buffer buf;
-	int ret;
-	char opt;
-	int i;
-
-	if (!p11_buffer_init_null (&buf, 64))
-		return_val_if_reached (-1);
-
-	for (i = 0; longoptsi.name != NULL; i++) {
-		opt = short_option (longoptsi.val);
-		if (opt != 0) {
-			p11_buffer_add (&buf, &opt, 1);
-			assert (longoptsi.has_arg != optional_argument);
-			if (longoptsi.has_arg == required_argument)
-				p11_buffer_add (&buf, ":", 1);
-		}
-	}
-
-	ret = getopt_long (argc, argv, buf.data, longopts, NULL);
-
-	p11_buffer_uninit (&buf);
-
-	return ret;
-}
-
-static void
-command_usage (const p11_tool_command *commands)
-{
-	const char *progname;
-	int i;
-
-	progname = getprogname ();
-	printf (_("usage: %s command <args>...\n"), progname);
-	printf (_("\nCommon %s commands are:\n"), progname);
-	for (i = 0; commandsi.name != NULL; i++) {
-		if (strcmp (commandsi.name, P11_TOOL_FALLBACK) != 0)
-#ifdef ENABLE_NLS
-			printf ("  %-15s  %s\n",
-				commandsi.name,
-				dgettext (PACKAGE_NAME, commandsi.text));
-#else
-			printf ("  %-15s  %s\n",
-				commandsi.name,
-				commandsi.text);
-#endif
-	}
-	printf (_("\nSee '%s <command> --help' for more information\n"), progname);
-}

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/tool.h Deleted

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#ifndef P11_TOOL_H_
-#define P11_TOOL_H_
-
-#include <getopt.h>
-
-#define P11_TOOL_FALLBACK ""
-
-typedef struct {
-	const char *name;
-	int (*function) (int, char*);
-	const char *text;
-} p11_tool_command;
-
-typedef struct  {
-	int option;
-	const char *text;
-	const char *arg;
-} p11_tool_desc;
-
-int        p11_tool_main              (int argc,
-                                       char *argv,
-                                       const p11_tool_command *commands);
-
-int        p11_tool_getopt            (int argc,
-                                       char *argv,
-                                       const struct option *longopts);
-
-void       p11_tool_usage             (const p11_tool_desc *usages,
-                                       const struct option *longopts);
-
-#endif /* P11_TOOL_H_ */

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/gen-virtual-fixed.sh Deleted

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/virtual-fixed.h Deleted

@@ -1,1600 +0,0 @@
-/*
- * Copyright (c) 2016-2023 Red Hat, Inc
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Daiki Ueno
- */
-
-#ifndef __P11_VIRTUAL_FIXED_H__
-#define __P11_VIRTUAL_FIXED_H__
-
-#define P11_VIRTUAL_FIXED_FUNCTIONS(fixed_index)	\
-static CK_RV \
-fixed ## fixed_index ## _C_Initialize (CK_VOID_PTR init_args) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_Initialize (funcs, init_args); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_Finalize (CK_VOID_PTR reserved) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_Finalize (funcs, reserved); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetInfo (CK_INFO_PTR info) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetInfo (funcs, info); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetSlotList (CK_BBOOL token_present, \
-					CK_SLOT_ID_PTR slot_list, \
-					CK_ULONG_PTR count) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetSlotList (funcs, token_present, slot_list, count); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetSlotInfo (CK_SLOT_ID slot_id, \
-					CK_SLOT_INFO_PTR info) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetSlotInfo (funcs, slot_id, info); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetTokenInfo (CK_SLOT_ID slot_id, \
-					 CK_TOKEN_INFO_PTR info) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetTokenInfo (funcs, slot_id, info); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetMechanismList (CK_SLOT_ID slot_id, \
-					     CK_MECHANISM_TYPE_PTR mechanism_list, \
-					     CK_ULONG_PTR count) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetMechanismList (funcs, slot_id, mechanism_list, count); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_GetMechanismInfo (CK_SLOT_ID slot_id, \
-					     CK_MECHANISM_TYPE type, \
-					     CK_MECHANISM_INFO_PTR info) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_GetMechanismInfo (funcs, slot_id, type, info); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_InitToken (CK_SLOT_ID slot_id, \
-				      CK_BYTE_PTR pin, \
-				      CK_ULONG pin_len, \
-				      CK_BYTE_PTR label) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_InitToken (funcs, slot_id, pin, pin_len, label); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_InitPIN (CK_SESSION_HANDLE session, \
-				    CK_BYTE_PTR pin, \
-				    CK_ULONG pin_len) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_InitPIN (funcs, session, pin, pin_len); \
-} \
-\
-static CK_RV \
-fixed ## fixed_index ## _C_SetPIN (CK_SESSION_HANDLE session, \
-				   CK_BYTE_PTR old_pin, \
-				   CK_ULONG old_len, \
-				   CK_BYTE_PTR new_pin, \
-				   CK_ULONG new_len) \
-{ \
-        CK_FUNCTION_LIST_3_0 *bound; \
-        Wrapper *wrapper; \
-        CK_X_FUNCTION_LIST *funcs; \
-        bound = fixed_closuresfixed_index; \
-        return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \
-        wrapper = (Wrapper *) bound; \
-        funcs = &wrapper->virt->funcs; \
-        return funcs->C_SetPIN (funcs, session, old_pin, old_len, new_pin, new_len); \
-} \
-\
-static CK_RV \

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/oid.h Deleted

@@ -1,244 +0,0 @@
-/*
- * Copyright (C) 2012 Red Hat Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@redhat.com>
- */
-
-#ifndef P11_OIDS_H_
-#define P11_OIDS_H_
-
-#include "compat.h"
-
-bool           p11_oid_simple  (const unsigned char *oid,
-                                int len);
-
-unsigned int   p11_oid_hash    (const void *oid);
-
-bool           p11_oid_equal   (const void *oid_one,
-                                const void *oid_two);
-
-int            p11_oid_length  (const unsigned char *oid);
-
-/*
- * 2.5.4.3: CN or commonName
- */
-static const unsigned char P11_OID_CN =
-	{ 0x06, 0x03, 0x55, 0x04, 0x03, };
-
-/*
- * 2.5.4.10: O or organization
- */
-static const unsigned char P11_OID_O =
-	{ 0x06, 0x03, 0x55, 0x04, 0x0a, };
-
-/*
- * 2.5.4.11: OU or organizationalUnit
- */
-static const unsigned char P11_OID_OU =
-	{ 0x06, 0x03, 0x55, 0x04, 0x0b, };
-
-/*
- * Our support of certificate extensions and so on is not limited to what is
- * listed here. This is simply the OIDs used by the parsing code that generates
- * backwards compatible PKCS#11 objects for NSS and the like.
- */
-
-/*
- * 2.5.29.14: SubjectKeyIdentifier
- */
-static const unsigned char P11_OID_SUBJECT_KEY_IDENTIFIER =
-	{ 0x06, 0x03, 0x55, 0x1d, 0x0e };
-static const char P11_OID_SUBJECT_KEY_IDENTIFIER_STR = "2.5.29.14";
-
-/*
- * 2.5.29.15: KeyUsage
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_KEY_USAGE =
-	{ 0x06, 0x03, 0x55, 0x1d, 0x0f };
-static const char P11_OID_KEY_USAGE_STR = { "2.5.29.15" };
-
-enum {
-	P11_KU_DIGITAL_SIGNATURE = 128,
-	P11_KU_NON_REPUDIATION = 64,
-	P11_KU_KEY_ENCIPHERMENT = 32,
-	P11_KU_DATA_ENCIPHERMENT = 16,
-	P11_KU_KEY_AGREEMENT = 8,
-	P11_KU_KEY_CERT_SIGN = 4,
-	P11_KU_CRL_SIGN = 2,
-	P11_KU_ENCIPHER_ONLY = 1,
-	P11_KU_DECIPHER_ONLY = 32768,
-};
-
-/*
- * 2.5.29.19: BasicConstraints
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_BASIC_CONSTRAINTS =
-	{ 0x06, 0x03, 0x55, 0x1d, 0x13 };
-static const char P11_OID_BASIC_CONSTRAINTS_STR = "2.5.29.19";
-
-/*
- * 2.5.29.37: ExtendedKeyUsage
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_EXTENDED_KEY_USAGE =
-	{ 0x06, 0x03, 0x55, 0x1d, 0x25 };
-static const char P11_OID_EXTENDED_KEY_USAGE_STR = "2.5.29.37";
-
-/*
- * 2.5.29.37.0: anyExtendedKeyUsage
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_ANY_EXTENDED_KEY_USAGE =
-	{ 0x06, 0x03, 0x55, 0x1d, 0x25, 0x00 };
-static const char P11_OID_ANY_EXTENDED_KEY_USAGE_STR = "2.5.29.37.0";
-
-/*
- * 1.3.6.1.4.1.3319.6.10.1: OpenSSL reject extension
- *
- * An internally defined certificate extension.
- *
- * OpenSSL contains a list of OID extended key usages to reject.
- * The normal X.509 model is to only *include* the extended key
- * usages that are to be allowed. It's not clear exactly how
- * valid and useful the reject per extended key usage model is.
- *
- * However in order to parse openssl trust policy information and
- * be able to write it back out in the same way, we define a custom
- * certificate extension to store it.
- *
- * It is not expected (or supported) for others outside of p11-kit
- * to read this information at this point.
- *
- * This extension is never marked critical. It is not necessary to
- * respect information in this certificate extension given that the
- * ExtendedKeyUsage extension carries the same information as an
- * allowlist.
- */
-static const unsigned char P11_OID_OPENSSL_REJECT =
-	{ 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x99, 0x77, 0x06, 0x0a, 0x01 };
-static const char P11_OID_OPENSSL_REJECT_STR = "1.3.6.1.4.1.3319.6.10.1";
-
-/*
- * 1.3.6.1.5.5.7.3.1: Server Auth
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_SERVER_AUTH =
-	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01 };
-static const char P11_OID_SERVER_AUTH_STR = "1.3.6.1.5.5.7.3.1";
-
-/*
- * 1.3.6.1.5.5.7.3.2: Client Auth
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_CLIENT_AUTH =
-	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02 };
-static const char P11_OID_CLIENT_AUTH_STR = "1.3.6.1.5.5.7.3.2";
-
-/*
- * 1.3.6.1.5.5.7.3.3: Code Signing
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_CODE_SIGNING =
-	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x03 };
-static const char P11_OID_CODE_SIGNING_STR = "1.3.6.1.5.5.7.3.3";
-
-/*
- * 1.3.6.1.5.5.7.3.4: Email Protection
- *
- * Defined in RFC 5280
- */
-static const unsigned char P11_OID_EMAIL_PROTECTION =
-	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x04 };
-static const char P11_OID_EMAIL_PROTECTION_STR = "1.3.6.1.5.5.7.3.4";
-
-/*
- * 1.3.6.1.5.5.7.3.5: IPSec End System
- *
- * Defined in RFC 2459
- */
-static const unsigned char P11_OID_IPSEC_END_SYSTEM =
-	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x05 };
-static const char P11_OID_IPSEC_END_SYSTEM_STR = "1.3.6.1.5.5.7.3.5";
-

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/persist.c Deleted

@@ -1,850 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@redhat.com>
- */
-
-#include "config.h"
-
-#include "asn1.h"
-#include "attrs.h"
-#include "constants.h"
-#include "debug.h"
-#include "lexer.h"
-#include "message.h"
-#include "pem.h"
-#include "persist.h"
-#include "pkcs11.h"
-#include "pkcs11i.h"
-#include "pkcs11x.h"
-#include "types.h"
-#include "url.h"
-
-#include "basic.asn.h"
-
-#include <libtasn1.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(x) dgettext(PACKAGE_NAME, x)
-#else
-#define _(x) (x)
-#endif
-
-#define PERSIST_HEADER "p11-kit-object-v1"
-
-struct _p11_persist {
-	p11_dict *constants;
-	asn1_node asn1_defs;
-};
-
-bool
-p11_persist_magic (const unsigned char *data,
-                   size_t length)
-{
-	return (strnstr ((char *)data, "" PERSIST_HEADER "", length) != NULL);
-}
-
-bool
-p11_persist_is_generated (const unsigned char *data,
-			  size_t length)
-{
-	static const char comment =
-		"# This file has been auto-generated and written by p11-kit.";
-	return length >= sizeof (comment) - 1 &&
-		memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0;
-}
-
-p11_persist *
-p11_persist_new (void)
-{
-	p11_persist *persist;
-
-	persist = calloc (1, sizeof (p11_persist));
-	return_val_if_fail (persist != NULL, NULL);
-
-	persist->constants = p11_constant_reverse (true);
-	if (persist->constants == NULL) {
-		free (persist);
-		return_val_if_reached (NULL);
-	}
-
-	return persist;
-}
-
-void
-p11_persist_free (p11_persist *persist)
-{
-	if (!persist)
-		return;
-	p11_dict_free (persist->constants);
-	asn1_delete_structure (&persist->asn1_defs);
-	free (persist);
-}
-
-struct constant {
-	CK_ULONG value;
-	const char *string;
-};
-
-static bool
-parse_string (p11_lexer *lexer,
-              CK_ATTRIBUTE *attr)
-{
-	const char *value;
-	const char *end;
-	size_t length;
-	unsigned char *data;
-
-	value = lexer->tok.field.value;
-	end = value + strlen (value);
-
-	/* Not a string/binary value */
-	if (value == end || value0 != '\"' || *(end - 1) != '\"')
-		return false;
-
-	/* Note that we don't skip whitespace when decoding, as you might in other URLs */
-	data = p11_url_decode (value + 1, end - 1, "", &length);
-	if (data == NULL) {
-		p11_lexer_msg(lexer, "bad encoding of attribute value");
-		return false;
-	}
-
-	attr->pValue = data;
-	attr->ulValueLen = length;
-	return true;
-}
-
-static void
-format_string (CK_ATTRIBUTE *attr,
-               p11_buffer *buf)
-{
-	const unsigned char *value;
-
-	assert (attr->ulValueLen != CK_UNAVAILABLE_INFORMATION);
-
-	p11_buffer_add (buf, "\"", 1);
-	value = attr->pValue;
-	p11_url_encode (value, value + attr->ulValueLen, P11_URL_VERBATIM " ", buf);
-	p11_buffer_add (buf, "\"", 1);
-}
-
-static bool
-parse_bool (p11_lexer *lexer,
-            CK_ATTRIBUTE *attr)
-{
-	const char *value = lexer->tok.field.value;
-	CK_BBOOL boolean;
-
-	if (strcmp (value, "true") == 0) {
-		boolean = CK_TRUE;
-
-	} else if (strcmp (value, "false") == 0) {
-		boolean = CK_FALSE;
-
-	} else {
-		/* Not a valid boolean value */
-		return false;
-	}
-
-	attr->pValue = memdup (&boolean, sizeof (boolean));
-	return_val_if_fail (attr != NULL, FALSE);
-	attr->ulValueLen = sizeof (boolean);
-	return true;
-}
-
-static bool
-format_bool (CK_ATTRIBUTE *attr,
-             p11_buffer *buf)
-{
-	const CK_BBOOL *value;
-
-	if (attr->ulValueLen != sizeof (CK_BBOOL))
-		return false;
-
-	switch (attr->type) {
-	case CKA_TOKEN:
-	case CKA_PRIVATE:

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/pkix.asn Deleted

@@ -1,540 +0,0 @@
-
-PKIX1 { }
-
-DEFINITIONS IMPLICIT TAGS ::=
-
-BEGIN
-
--- This contains both PKIX1Implicit88 and RFC2630 ASN.1 modules.
-
-id-pkix  OBJECT IDENTIFIER  ::=
-         { iso(1) identified-organization(3) dod(6) internet(1)
-                    security(5) mechanisms(5) pkix(7) }
-
--- ISO arc for standard certificate and CRL extensions
-
--- authority key identifier OID and syntax
-
-AuthorityKeyIdentifier ::= SEQUENCE {
-      keyIdentifier             0 KeyIdentifier            OPTIONAL,
-      authorityCertIssuer       1 GeneralNames             OPTIONAL,
-      authorityCertSerialNumber 2 CertificateSerialNumber  OPTIONAL }
-    -- authorityCertIssuer and authorityCertSerialNumber shall both
-    -- be present or both be absgent
-
-KeyIdentifier ::= OCTET STRING
-
--- subject key identifier OID and syntax
-
-SubjectKeyIdentifier ::= KeyIdentifier
-
--- key usage extension OID and syntax
-
-KeyUsage ::= BIT STRING
-
--- Directory string type --
-
-DirectoryString ::= CHOICE {
-      teletexString             TeletexString (SIZE (1..MAX)),
-      printableString           PrintableString (SIZE (1..MAX)),
-      universalString           UniversalString (SIZE (1..MAX)),
-      utf8String              UTF8String (SIZE (1..MAX)),
-      bmpString               BMPString (SIZE(1..MAX)),
-      -- IA5String is added here to handle old UID encoded as ia5String --
-      -- See tests/userid/ for more information.  It shouldn't be here, --
-      -- so if it causes problems, considering dropping it. --
-      ia5String               IA5String (SIZE(1..MAX)) }
-
-SubjectAltName ::= GeneralNames
-
-GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
-
-GeneralName ::= CHOICE {
-     otherName                       0     AnotherName,
-     rfc822Name                      1     IA5String,
-     dNSName                         2     IA5String,
-     x400Address                     3     ANY,
--- Changed to work with the libtasn1 parser.
-     directoryName                   4     EXPLICIT RDNSequence, --Name,
-     ediPartyName                    5     ANY, --EDIPartyName replaced by ANY to save memory
-     uniformResourceIdentifier       6     IA5String,
-     iPAddress                       7     OCTET STRING,
-     registeredID                    8     OBJECT IDENTIFIER }
-
--- AnotherName replaces OTHER-NAME ::= TYPE-IDENTIFIER, as
--- TYPE-IDENTIFIER is not supported in the '88 ASN.1 syntax
-
-AnotherName ::= SEQUENCE {
-     type-id    OBJECT IDENTIFIER,
-     value      0 EXPLICIT ANY DEFINED BY type-id }
-
--- issuer alternative name extension OID and syntax
-
-IssuerAltName ::= GeneralNames
-
--- basic constraints extension OID and syntax
-
-BasicConstraints ::= SEQUENCE {
-     cA                      BOOLEAN DEFAULT FALSE,
-     pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
-
--- CRL distribution points extension OID and syntax
-
-CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
-
-DistributionPoint ::= SEQUENCE {
-     distributionPoint       0     EXPLICIT DistributionPointName OPTIONAL,
-     reasons                 1     ReasonFlags OPTIONAL,
-     cRLIssuer               2     GeneralNames OPTIONAL
-}
-
-DistributionPointName ::= CHOICE {
-    fullName                0     GeneralNames,
-    nameRelativeToCRLIssuer 1     RelativeDistinguishedName
-}
-
-ReasonFlags ::= BIT STRING
-
--- extended key usage extension OID and syntax
-
-ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
-
-KeyPurposeId ::= OBJECT IDENTIFIER
-
--- CRL number extension OID and syntax
-
-CRLNumber ::= INTEGER (0..MAX)
-
--- certificate issuer CRL entry extension OID and syntax
-
-CertificateIssuer ::= GeneralNames
-
--- attribute data types --
-
-Attribute       ::=     SEQUENCE {
-        type            AttributeType,
-        values  SET OF AttributeValue
-                -- at least one value is required --
-}
-
-AttributeType           ::=   OBJECT IDENTIFIER
-
-AttributeValue          ::=   ANY DEFINED BY type
-
-AttributeTypeAndValue           ::=     SEQUENCE {
-        type    AttributeType,
-        value   AttributeValue }
-
--- suggested naming attributes: Definition of the following
---  information object set may be augmented to meet local
---  requirements.  Note that deleting members of the set may
---  prevent interoperability with conforming implementations.
---  presented in pairs: the AttributeType followed by the
---  type definition for the corresponding AttributeValue
-
--- Arc for standard naming attributes
-id-at           OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4}
-
--- Attributes of type NameDirectoryString
-
--- gnutls: Note that the Object ID (id-at*) is being set just before the
--- actual definition. This is done in order for asn1_find_structure_from_oid
--- to work (locate structure from OID).
--- Maybe this is inefficient and memory consuming. Should we replace with
--- a table that maps OIDs to structures?
-
-PostalAddress ::= SEQUENCE OF DirectoryString
-
- -- Legacy attributes
-
-emailAddress AttributeType      ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 1 }
-
-Pkcs9email ::= IA5String (SIZE (1..ub-emailaddress-length))
-
--- naming data types --
-
-Name            ::=   CHOICE { -- only one possibility for now --
-                                 rdnSequence  RDNSequence }
-
-RDNSequence     ::=   SEQUENCE OF RelativeDistinguishedName
-
-DistinguishedName       ::=   RDNSequence
-
-RelativeDistinguishedName  ::=
-                    SET SIZE (1 .. MAX) OF AttributeTypeAndValue
-
-
-
--- --------------------------------------------------------
--- certificate and CRL specific structures begin here
--- --------------------------------------------------------
-
-Certificate  ::=  SEQUENCE  {
-     tbsCertificate       TBSCertificate,
-     signatureAlgorithm   AlgorithmIdentifier,
-     signature            BIT STRING  }
-
-TBSCertificate  ::=  SEQUENCE  {
-     version         0  EXPLICIT Version DEFAULT v1,
-     serialNumber         CertificateSerialNumber,
-     signature            AlgorithmIdentifier,
-     issuer               Name,
-     validity             Validity,
-     subject              Name,
-     subjectPublicKeyInfo SubjectPublicKeyInfo,
-     issuerUniqueID  1  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version shall be v2 or v3
-     subjectUniqueID 2  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version shall be v2 or v3
-     extensions      3  EXPLICIT Extensions OPTIONAL
-                          -- If present, version shall be v3 --
-}
-
-Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
-
-CertificateSerialNumber  ::=  INTEGER
-
-Validity ::= SEQUENCE {
-     notBefore      Time,
-     notAfter       Time }

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/pkix.asn.h Deleted

@@ -1,389 +0,0 @@
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <libtasn1.h>
-
-const asn1_static_node pkix_asn1_tab = {
-  { "PKIX1", 536875024, NULL },
-  { NULL, 1073741836, NULL },
-  { "id-pkix", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "identified-organization", 1073741825, "3"},
-  { "dod", 1073741825, "6"},
-  { "internet", 1073741825, "1"},
-  { "security", 1073741825, "5"},
-  { "mechanisms", 1073741825, "5"},
-  { "pkix", 1, "7"},
-  { "AuthorityKeyIdentifier", 1610612741, NULL },
-  { "keyIdentifier", 1610637314, "KeyIdentifier"},
-  { NULL, 4104, "0"},
-  { "authorityCertIssuer", 1610637314, "GeneralNames"},
-  { NULL, 4104, "1"},
-  { "authorityCertSerialNumber", 536895490, "CertificateSerialNumber"},
-  { NULL, 4104, "2"},
-  { "KeyIdentifier", 1073741831, NULL },
-  { "SubjectKeyIdentifier", 1073741826, "KeyIdentifier"},
-  { "KeyUsage", 1073741830, NULL },
-  { "DirectoryString", 1610612754, NULL },
-  { "teletexString", 1612709918, NULL },
-  { "MAX", 524298, "1"},
-  { "printableString", 1612709919, NULL },
-  { "MAX", 524298, "1"},
-  { "universalString", 1612709920, NULL },
-  { "MAX", 524298, "1"},
-  { "utf8String", 1612709922, NULL },
-  { "MAX", 524298, "1"},
-  { "bmpString", 1612709921, NULL },
-  { "MAX", 524298, "1"},
-  { "ia5String", 538968093, NULL },
-  { "MAX", 524298, "1"},
-  { "SubjectAltName", 1073741826, "GeneralNames"},
-  { "GeneralNames", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "GeneralName"},
-  { "GeneralName", 1610612754, NULL },
-  { "otherName", 1610620930, "AnotherName"},
-  { NULL, 4104, "0"},
-  { "rfc822Name", 1610620957, NULL },
-  { NULL, 4104, "1"},
-  { "dNSName", 1610620957, NULL },
-  { NULL, 4104, "2"},
-  { "x400Address", 1610620941, NULL },
-  { NULL, 4104, "3"},
-  { "directoryName", 1610620930, "RDNSequence"},
-  { NULL, 2056, "4"},
-  { "ediPartyName", 1610620941, NULL },
-  { NULL, 4104, "5"},
-  { "uniformResourceIdentifier", 1610620957, NULL },
-  { NULL, 4104, "6"},
-  { "iPAddress", 1610620935, NULL },
-  { NULL, 4104, "7"},
-  { "registeredID", 536879116, NULL },
-  { NULL, 4104, "8"},
-  { "AnotherName", 1610612741, NULL },
-  { "type-id", 1073741836, NULL },
-  { "value", 541073421, NULL },
-  { NULL, 1073743880, "0"},
-  { "type-id", 1, NULL },
-  { "IssuerAltName", 1073741826, "GeneralNames"},
-  { "BasicConstraints", 1610612741, NULL },
-  { "cA", 1610645508, NULL },
-  { NULL, 131081, NULL },
-  { "pathLenConstraint", 16387, NULL },
-  { "CRLDistributionPoints", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "DistributionPoint"},
-  { "DistributionPoint", 1610612741, NULL },
-  { "distributionPoint", 1610637314, "DistributionPointName"},
-  { NULL, 2056, "0"},
-  { "reasons", 1610637314, "ReasonFlags"},
-  { NULL, 4104, "1"},
-  { "cRLIssuer", 536895490, "GeneralNames"},
-  { NULL, 4104, "2"},
-  { "DistributionPointName", 1610612754, NULL },
-  { "fullName", 1610620930, "GeneralNames"},
-  { NULL, 4104, "0"},
-  { "nameRelativeToCRLIssuer", 536879106, "RelativeDistinguishedName"},
-  { NULL, 4104, "1"},
-  { "ReasonFlags", 1073741830, NULL },
-  { "ExtKeyUsageSyntax", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "KeyPurposeId"},
-  { "KeyPurposeId", 1073741836, NULL },
-  { "CRLNumber", 1073741827, NULL },
-  { "CertificateIssuer", 1073741826, "GeneralNames"},
-  { "Attribute", 1610612741, NULL },
-  { "type", 1073741826, "AttributeType"},
-  { "values", 536870927, NULL },
-  { NULL, 2, "AttributeValue"},
-  { "AttributeType", 1073741836, NULL },
-  { "AttributeValue", 1614807053, NULL },
-  { "type", 1, NULL },
-  { "AttributeTypeAndValue", 1610612741, NULL },
-  { "type", 1073741826, "AttributeType"},
-  { "value", 2, "AttributeValue"},
-  { "id-at", 1879048204, NULL },
-  { "joint-iso-ccitt", 1073741825, "2"},
-  { "ds", 1073741825, "5"},
-  { NULL, 1, "4"},
-  { "PostalAddress", 1610612747, NULL },
-  { NULL, 2, "DirectoryString"},
-  { "emailAddress", 1880096780, "AttributeType"},
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "rsadsi", 1073741825, "113549"},
-  { "pkcs", 1073741825, "1"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "1"},
-  { "Pkcs9email", 1612709917, NULL },
-  { "ub-emailaddress-length", 524298, "1"},
-  { "Name", 1610612754, NULL },
-  { "rdnSequence", 2, "RDNSequence"},
-  { "RDNSequence", 1610612747, NULL },
-  { NULL, 2, "RelativeDistinguishedName"},
-  { "DistinguishedName", 1073741826, "RDNSequence"},
-  { "RelativeDistinguishedName", 1612709903, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "AttributeTypeAndValue"},
-  { "Certificate", 1610612741, NULL },
-  { "tbsCertificate", 1073741826, "TBSCertificate"},
-  { "signatureAlgorithm", 1073741826, "AlgorithmIdentifier"},
-  { "signature", 6, NULL },
-  { "TBSCertificate", 1610612741, NULL },
-  { "version", 1610653698, "Version"},
-  { NULL, 1073741833, "v1"},
-  { NULL, 2056, "0"},
-  { "serialNumber", 1073741826, "CertificateSerialNumber"},
-  { "signature", 1073741826, "AlgorithmIdentifier"},
-  { "issuer", 1073741826, "Name"},
-  { "validity", 1073741826, "Validity"},
-  { "subject", 1073741826, "Name"},
-  { "subjectPublicKeyInfo", 1073741826, "SubjectPublicKeyInfo"},
-  { "issuerUniqueID", 1610637314, "UniqueIdentifier"},
-  { NULL, 4104, "1"},
-  { "subjectUniqueID", 1610637314, "UniqueIdentifier"},
-  { NULL, 4104, "2"},
-  { "extensions", 536895490, "Extensions"},
-  { NULL, 2056, "3"},
-  { "Version", 1610874883, NULL },
-  { "v1", 1073741825, "0"},
-  { "v2", 1073741825, "1"},
-  { "v3", 1, "2"},
-  { "CertificateSerialNumber", 1073741827, NULL },
-  { "Validity", 1610612741, NULL },
-  { "notBefore", 1073741826, "Time"},
-  { "notAfter", 2, "Time"},
-  { "Time", 1610612754, NULL },
-  { "utcTime", 1073741860, NULL },
-  { "generalTime", 37, NULL },
-  { "UniqueIdentifier", 1073741830, NULL },
-  { "SubjectPublicKeyInfo", 1610612741, NULL },
-  { "algorithm", 1073741826, "AlgorithmIdentifier"},
-  { "subjectPublicKey", 6, NULL },
-  { "Extensions", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "Extension"},
-  { "Extension", 1610612741, NULL },
-  { "extnID", 1073741836, NULL },
-  { "critical", 1610645508, NULL },
-  { NULL, 131081, NULL },
-  { "extnValue", 7, NULL },
-  { "CertificateList", 1610612741, NULL },
-  { "tbsCertList", 1073741826, "TBSCertList"},
-  { "signatureAlgorithm", 1073741826, "AlgorithmIdentifier"},
-  { "signature", 6, NULL },
-  { "TBSCertList", 1610612741, NULL },
-  { "version", 1073758210, "Version"},
-  { "signature", 1073741826, "AlgorithmIdentifier"},
-  { "issuer", 1073741826, "Name"},
-  { "thisUpdate", 1073741826, "Time"},
-  { "nextUpdate", 1073758210, "Time"},
-  { "revokedCertificates", 1610629131, NULL },
-  { NULL, 536870917, NULL },
-  { "userCertificate", 1073741826, "CertificateSerialNumber"},
-  { "revocationDate", 1073741826, "Time"},
-  { "crlEntryExtensions", 16386, "Extensions"},
-  { "crlExtensions", 536895490, "Extensions"},
-  { NULL, 2056, "0"},
-  { "AlgorithmIdentifier", 1610612741, NULL },
-  { "algorithm", 1073741836, NULL },
-  { "parameters", 541081613, NULL },
-  { "algorithm", 1, NULL },
-  { "Dss-Sig-Value", 1610612741, NULL },
-  { "r", 1073741827, NULL },
-  { "s", 3, NULL },
-  { "DomainParameters", 1610612741, NULL },
-  { "p", 1073741827, NULL },
-  { "g", 1073741827, NULL },

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/test-asn1.c Deleted

@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2012 Red Hat Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *     * Redistributions of source code must retain the above
- *       copyright notice, this list of conditions and the
- *       following disclaimer.
- *     * Redistributions in binary form must reproduce the
- *       above copyright notice, this list of conditions and
- *       the following disclaimer in the documentation and/or
- *       other materials provided with the distribution.
- *     * The names of contributors to this software may not be
- *       used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Stef Walter <stefw@gnome.org>
- */
-
-#include "config.h"
-#include "test.h"
-
-#include "asn1.h"
-#include "debug.h"
-#include "oid.h"
-#include "x509.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-struct {
-	p11_dict *asn1_defs;
-} test;
-
-static void
-setup (void *unused)
-{
-	test.asn1_defs = p11_asn1_defs_load ();
-	assert_ptr_not_null (test.asn1_defs);
-}
-
-static void
-teardown (void *unused)
-{
-	p11_dict_free (test.asn1_defs);
-	memset (&test, 0, sizeof (test));
-}
-
-static void
-test_tlv_length (void)
-{
-	struct {
-		const char *der;
-		size_t der_len;
-		int expected;
-	} tlv_lengths = {
-		{ "\x01\x01\x00", 3, 3 },
-		{ "\x01\x01\x00\x01\x02", 5, 3 },
-		{ "\x01\x05\x00", 3, -1 },
-		{ NULL }
-	};
-
-	int length;
-	int i;
-
-	for (i = 0; tlv_lengthsi.der != NULL; i++) {
-		length = p11_asn1_tlv_length ((const unsigned char *)tlv_lengthsi.der, tlv_lengthsi.der_len);
-		assert_num_eq (tlv_lengthsi.expected, length);
-	}
-}
-
-static const unsigned char test_eku_server_and_client = {
-	0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06,
-	0x01, 0x05, 0x05, 0x07, 0x03, 0x02,
-};
-
-static void
-test_asn1_cache (void)
-{
-	p11_asn1_cache *cache;
-	p11_dict *defs;
-	asn1_node asn;
-	asn1_node check;
-
-	cache = p11_asn1_cache_new ();
-	assert_ptr_not_null (cache);
-
-	defs = p11_asn1_cache_defs (cache);
-	assert_ptr_not_null (defs);
-
-	asn = p11_asn1_decode (defs, "PKIX1.ExtKeyUsageSyntax",
-	                       test_eku_server_and_client,
-	                       sizeof (test_eku_server_and_client), NULL);
-	assert_ptr_not_null (defs);
-
-	/* Place the parsed data in the cache */
-	p11_asn1_cache_take (cache, asn, "PKIX1.ExtKeyUsageSyntax",
-	                     test_eku_server_and_client,
-	                     sizeof (test_eku_server_and_client));
-
-	/* Get it back out */
-	check = p11_asn1_cache_get (cache, "PKIX1.ExtKeyUsageSyntax",
-	                            test_eku_server_and_client,
-	                            sizeof (test_eku_server_and_client));
-	assert_ptr_eq (asn, check);
-
-	/* Flush should remove it */
-	p11_asn1_cache_flush (cache);
-	check = p11_asn1_cache_get (cache, "PKIX1.ExtKeyUsageSyntax",
-	                            test_eku_server_and_client,
-	                            sizeof (test_eku_server_and_client));
-	assert_ptr_eq (NULL, check);
-
-	p11_asn1_cache_free (cache);
-}
-
-static void
-test_asn1_free (void)
-{
-	p11_dict *defs;
-	asn1_node asn;
-
-	defs = p11_asn1_defs_load ();
-	assert_ptr_not_null (defs);
-
-	asn = p11_asn1_decode (defs, "PKIX1.ExtKeyUsageSyntax",
-	                       test_eku_server_and_client,
-	                       sizeof (test_eku_server_and_client), NULL);
-	assert_ptr_not_null (asn);
-
-	p11_asn1_free (asn);
-	p11_asn1_free (NULL);
-	p11_dict_free (defs);
-}
-
-int
-main (int argc,
-      char *argv)
-{
-	p11_fixture (setup, teardown);
-	p11_test (test_tlv_length, "/asn1/tlv_length");
-
-	p11_fixture (NULL, NULL);
-	p11_test (test_asn1_cache, "/asn1/asn1_cache");
-	p11_test (test_asn1_free, "/asn1/free");
-
-	return p11_test_run (argc, argv);
-}

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/test-init.sh.in Deleted

@@ -1,106 +0,0 @@
-#!/bin/sh
-
-set -euf
-
-# -----------------------------------------------------------------------------
-# Basic fundamentals
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-libdir=@libdir@
-libexecdir=@libexecdir@
-privatedir=@privatedir@
-with_trust_paths=@with_trust_paths@
-script=$(basename $0)
-
-# -----------------------------------------------------------------------------
-# Testing
-
-warning()
-{
-	echo "$script: $@" >&2
-}
-
-assert_fail()
-{
-	warning $@
-	exit 1
-}
-
-assert_contains()
-{
-	if ! grep -qF $2 $1; then
-		assert_fail "$1 does not contain $2"
-	fi
-}
-
-assert_not_contains()
-{
-	if grep -qF $2 $1; then
-		assert_fail "$1 contains $2"
-	fi
-}
-
-teardown()
-{
-	:
-}
-
-teardown_dirty()
-{
-	echo "not ok $TEST_NUMBER $TEST_NAME"
-	teardown
-}
-
-skip()
-{
-	TEST_SKIP=yes
-	echo "ok $TEST_NUMBER # skip $TEST_NAME: $@"
-}
-
-setup()
-{
-	:
-}
-
-run()
-{
-	TOTAL=0
-	for TEST_NAME in $@; do
-		TOTAL=$(expr $TOTAL + 1)
-	done
-
-	echo "1..$TOTAL"
-
-	TEST_NUMBER=0
-	for TEST_NAME in $@; do
-		TEST_NUMBER=$(expr $TEST_NUMBER + 1)
-		(
-			trap teardown_dirty EXIT
-			trap "teardown_dirty; exit 127" INT TERM
-			TD=""
-
-			PATH="$exec_prefix/bin:$PATH"
-			export PATH
-
-			PKG_CONFIG_PATH="$libdir/pkgconfig:$datadir/pkgconfig"
-			export PKG_CONFIG_PATH
-
-			TEST_SKIP=no
-			setup
-
-			if  $TEST_SKIP != "yes" ; then
-				$TEST_NAME
-			fi
-			if  $TEST_SKIP != "yes" ; then
-				echo "ok $TEST_NUMBER $TEST_NAME"
-			fi
-
-			trap - EXIT
-			teardown
-		)
-	done
-}

_service:tar_scm:p11-kit-0.25.0.tar.xz/ChangeLog -> _service:tar_scm:p11-kit-0.25.5.tar.xz/ChangeLog Changed

@@ -1,5 +1,1915 @@
 # Generate automatically. Do not edit.
 
+commit 0dd113361057e477f40ff4d8788f3e7e400af5f9
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-07-04
+
+    Release 0.25.5
+    
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ NEWS         | 5 +++++
+ configure.ac | 4 ++--
+ meson.build  | 4 ++--
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+commit fc0ed91facddc95c475ee31afef7400300d12367
+Author: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+Date:   2024-07-02
+
+    iter: Fix recursive attribute loading
+    
+    Fixes: https://github.com/p11-glue/p11-kit/issues/641
+    Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+
+ p11-kit/iter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 694d5cbc89541090664dfb5a43123c123f63b80d
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-07-04
+
+    Add include for stdint.h to common/hex.c
+    
+    Co-authored-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ common/hex.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 94ef36f5a98d977a4bba69312a413f208b7d4664
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-07-04
+
+    Update pkcs11-json submodule
+    
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ subprojects/pkcs11-json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d9449ee55be7adf4666720dd7c1957b44960159b
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-07-01
+
+    Release 0.25.4
+    
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ NEWS         | 10 ++++++++++
+ configure.ac |  8 ++++----
+ meson.build  |  8 ++++----
+ 3 files changed, 18 insertions(+), 8 deletions(-)
+
+commit c203931e32040f2ffb41461f3e3a5ebf3829ef63
+Author: Rosen Penev <rosenp@gmail.com>
+Date:   2024-06-28
+
+    fix format warning with 32-bit platforms on musl
+    
+    musl uses 64-bit time_t, even on 32-bit platforms. Cast to avoid the warning.
+
+ p11-kit/server.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit e4cf0375cb70cd0993e3bc5049acf4b495b812c6
+Author: Daiki Ueno <ueno@gnu.org>
+Date:   2024-05-07
+
+    Add function to check run-time version of the library
+    
+    This adds p11_kit_check_version function, which can be used to check
+    the run-time version of p11-kit.
+    
+    Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+ Makefile.am            |  1 +
+ p11-kit/test-version.c | 16 ++++++++++++++--
+ p11-kit/util.c         | 19 +++++++++++++++++++
+ p11-kit/version.h.in   |  2 ++
+ 4 files changed, 36 insertions(+), 2 deletions(-)
+
+commit 652927da18abecedf3ab21728252ec73e8214174
+Author: Daiki Ueno <ueno@gnu.org>
+Date:   2024-04-26
+
+    p11-kit: Expose version information through macros
+    
+    This provides P11_KIT_VERSION_{MAJOR,MINOR,MICRO} from the
+    <p11-kit/version.h> header, along with a helper macro
+    P11_KIT_CHECK_VERSION(major, minor, micro) for checking the version
+    requirement with `#if` directive.
+    
+    Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+ .gitignore             |  1 +
+ configure.ac           | 20 +++++++++----
+ meson.build            |  1 +
+ p11-kit/Makefile.am    |  4 +++
+ p11-kit/meson.build    | 14 +++++++--
+ p11-kit/test-version.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ p11-kit/version.h.in   | 58 +++++++++++++++++++++++++++++++++++++
+ 7 files changed, 169 insertions(+), 7 deletions(-)
+
+commit 8832556a467f65b24d51fda14ea42a42d406c406
+Author: Daiki Ueno <ueno@gnu.org>
+Date:   2024-04-27
+
+    common: Make libp11-asn1.a depend on libtasn1
+    
+    This fixes build on systems where <libtasn1.h> is installed in a
+    non-standard path.
+    
+    Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+ common/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 99611af151c8934f628a11a93a54410fc237d9e9
+Author: Daiki Ueno <ueno@gnu.org>
+Date:   2024-04-27
+
+    ci: Bump GitHub actions requirements
+    
+    Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+ .github/workflows/build-image.yml |  2 +-
+ .github/workflows/codeql.yml      |  6 +++---
+ .github/workflows/test.yaml       | 22 +++++++++++-----------
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+commit aeb0324ffcfb890fb009cfbeb7b531d67cd6c108
+Author: Daiki Ueno <ueno@gnu.org>
+Date:   2024-04-27
+
+    ci: Switch to macos-latest
+    
+    Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+ .github/workflows/test.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f180636c8f812ccfd9ae149431dab74f734abf5c
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-03-21
+
+    Fix division by zero in proto_read_attribute_buffer_array
+    
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ p11-kit/rpc-server.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 1195177e20222774de800bbeafa97e3ef291c72d
+Author: Jakub Jelen <jjelen@redhat.com>
+Date:   2024-03-12
+
+    log: Avoid buffer overflow
+    
+    There was attempt to fix this in bb3a3cb1, but it fixed only the case
+    when this value was actually provided by the token. When the token does
+    not support clock, it would print behind the "" buffer, causing random
+    constant string to be printed instead of the actual value, for example
+    
+            utcTime: ../common/attrs
+    
+    This simplifies the long line for readability and prints additional
+    information about this value being unsupported by the token.
+    
+    Signed-off-by: Jakub Jelen <jjelen@redhat.com>
+
+ p11-kit/log.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 74af78c83e91fb67dce5403a893e6bc133fbc985
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-03-20
+
+    Fix the test badge in README
+    
+    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
+
+ README.md | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit c7f12e2eae087c75891cb734875a61e7456e6811
+Author: Zoltan Fridrich <zfridric@redhat.com>
+Date:   2024-03-18
+
+    rpc: remove length assert in proto_read_attribute_buffer_array

_service:tar_scm:p11-kit-0.25.0.tar.xz/Makefile.am -> _service:tar_scm:p11-kit-0.25.5.tar.xz/Makefile.am Changed

@@ -4,6 +4,8 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/common \
+	-I$(top_builddir) \
+	-I$(top_builddir)/common \
 	-DBINDIR=\"$(bindir)\" \
 	-DBUILDDIR=\"$(abs_builddir)\" \
 	-DDATA_DIR=\"$(datadir)\" \
@@ -42,6 +44,9 @@
 sh_tests =
 TESTS = $(c_tests) $(sh_tests)
 
+post_install_tests =
+noinst_SCRIPTS = $(post_install_tests)
+
 moduledir = $(p11_module_path)
 module_LTLIBRARIES =
 
@@ -55,12 +60,17 @@
 include trust/Makefile.am
 endif
 
+PKCS11_JSON_INPUT = $(srcdir)/common/pkcs11.h
+
+include subprojects/pkcs11-json/Makefile.am
+
 SUBDIRS = . doc po
 
 ACLOCAL_AMFLAGS = -I build/m4
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-doc \
+	--with-libtasn1 \
 	--without-systemd \
 	--without-bash-completion \
 	--disable-coverage \
@@ -70,6 +80,8 @@
 AM_TESTS_ENVIRONMENT = \
 	abs_top_builddir="$(abs_top_builddir)"; \
 	export abs_top_builddir; \
+	abs_top_srcdir="$(abs_top_srcdir)"; \
+	export abs_top_srcdir; \
 	P11_MODULE_PATH="$(abs_top_builddir)/.libs"; \
 	export P11_MODULE_PATH;
 AM_TESTS_FD_REDIRECT = 9>&2;
@@ -107,6 +119,15 @@
 		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
 
+noinst_SCRIPTS += $(post_install_tests)
+
+if !OS_WIN32
+installcheck-local:
+	for t in $(post_install_tests); do \
+		abs_top_builddir="$(abs_top_builddir)" $(SHELL) $(srcdir)/$$t; \
+	done
+endif
+
 if WITH_COVERAGE
 coverage:
 	mkdir -p build/coverage

_service:tar_scm:p11-kit-0.25.0.tar.xz/Makefile.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/Makefile.in Changed

@@ -95,57 +95,86 @@
 bin_PROGRAMS = p11-kit/p11-kit$(EXEEXT) $(am__EXEEXT_1)
 private_PROGRAMS = p11-kit/p11-kit-remote$(EXEEXT) \
 	p11-kit/p11-kit-server$(EXEEXT)
-check_PROGRAMS = $(am__EXEEXT_5) common/frob-getauxval$(EXEEXT) \
-	common/frob-getenv$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_6) \
+check_PROGRAMS = $(am__EXEEXT_6) common/frob-getauxval$(EXEEXT) \
+	common/frob-getenv$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_7) \
 	p11-kit/p11-kit-testable$(EXEEXT) \
 	p11-kit/p11-kit-remote-testable$(EXEEXT) \
 	p11-kit/p11-kit-server-testable$(EXEEXT) \
 	p11-kit/print-messages$(EXEEXT) p11-kit/frob-setuid$(EXEEXT) \
-	$(am__EXEEXT_7) $(am__EXEEXT_8)
+	$(am__EXEEXT_8) $(am__EXEEXT_9)
 noinst_PROGRAMS =
-TESTS = $(am__EXEEXT_5) $(am__EXEEXT_10)
+TESTS = $(am__EXEEXT_6) $(am__EXEEXT_12)
 @OS_WIN32_FALSE@am__append_1 = \
 @OS_WIN32_FALSE@	common/unix-peer.c common/unix-peer.h \
 @OS_WIN32_FALSE@	$(NULL)
 
-@OS_WIN32_FALSE@am__append_2 = common/frob-getprogname
-@HAVE_LD_VERSION_SCRIPT_TRUE@am__append_3 = -Wl,--version-script=$(srcdir)/p11-kit/libp11-kit.map
-@HAVE_LD_VERSION_SCRIPT_FALSE@am__append_4 = -export-symbols-regex '^C_GetFunctionList|^C_GetInterface|^p11_kit_'
-@OS_WIN32_FALSE@am__append_5 = \
+@NEED_READPASSPHRASE_TRUE@@OS_WIN32_FALSE@am__append_2 = \
+@NEED_READPASSPHRASE_TRUE@@OS_WIN32_FALSE@	common/readpassphrase.c \
+@NEED_READPASSPHRASE_TRUE@@OS_WIN32_FALSE@	$(NULL)
+
+@OS_WIN32_FALSE@am__append_3 = common/frob-getprogname
+@WITH_ASN1_TRUE@am__append_4 = .asn .asn.h
+@WITH_ASN1_TRUE@am__append_5 = $(asn_h)
+@WITH_ASN1_TRUE@am__append_6 = \
+@WITH_ASN1_TRUE@	common/basic.asn \
+@WITH_ASN1_TRUE@	common/openssl.asn \
+@WITH_ASN1_TRUE@	common/pkix.asn \
+@WITH_ASN1_TRUE@	$(NULL)
+
+@WITH_ASN1_TRUE@am__append_7 = libp11-asn1.la
+@WITH_ASN1_TRUE@am__append_8 = \
+@WITH_ASN1_TRUE@	test-asn1 \
+@WITH_ASN1_TRUE@	test-oid \
+@WITH_ASN1_TRUE@	$(NULL)
+
+@HAVE_LD_VERSION_SCRIPT_TRUE@am__append_9 = -Wl,--version-script=$(srcdir)/p11-kit/libp11-kit.map
+@HAVE_LD_VERSION_SCRIPT_FALSE@am__append_10 = -export-symbols-regex '^C_GetFunctionList|^C_GetInterface|^p11_kit_'
+@OS_WIN32_FALSE@am__append_11 = \
 @OS_WIN32_FALSE@	p11-kit-client.la
 
-@WITH_BASH_COMPLETION_TRUE@am__append_6 = bash-completion/p11-kit
-@WITH_SYSTEMD_TRUE@am__append_7 = p11-kit/p11-kit-server.service
-@OS_WIN32_FALSE@am__append_8 = test-server
-@OS_WIN32_FALSE@am__append_9 = \
-@OS_WIN32_FALSE@	p11-kit/test-profiles.sh \
+@OS_WIN32_FALSE@am__append_12 = p11-kit/tty.c p11-kit/tty.h
+@WITH_ASN1_TRUE@am__append_13 = $(LIBTASN1_CFLAGS)
+@WITH_ASN1_TRUE@am__append_14 = libp11-asn1.la $(LIBTASN1_LIBS)
+@WITH_BASH_COMPLETION_TRUE@am__append_15 = bash-completion/p11-kit
+@WITH_ASN1_TRUE@am__append_16 = $(LIBTASN1_CFLAGS)
+@WITH_ASN1_TRUE@am__append_17 = libp11-asn1.la $(LIBTASN1_LIBS)
+@WITH_SYSTEMD_TRUE@am__append_18 = p11-kit/p11-kit-server.service
+@OS_WIN32_FALSE@am__append_19 = test-server
+@OS_WIN32_FALSE@am__append_20 = \
+@OS_WIN32_FALSE@	p11-kit/test-objects.sh \
+@OS_WIN32_FALSE@	p11-kit/test-lists.sh \
 @OS_WIN32_FALSE@	p11-kit/test-server.sh \
+@OS_WIN32_FALSE@	p11-kit/test-list-mechanisms.sh \
+@OS_WIN32_FALSE@	p11-kit/test-list-tokens.sh \
+@OS_WIN32_FALSE@	p11-kit/test-generate-keypair.sh \
 @OS_WIN32_FALSE@	$(NULL)
 
-@OS_WIN32_FALSE@am__append_10 = mock-six.la
-@WITH_TRUST_MODULE_TRUE@am__append_11 = \
+@OS_WIN32_FALSE@@WITH_ASN1_TRUE@am__append_21 = \
+@OS_WIN32_FALSE@@WITH_ASN1_TRUE@	p11-kit/test-export-public.sh \
+@OS_WIN32_FALSE@@WITH_ASN1_TRUE@	p11-kit/test-import-public.sh \
+@OS_WIN32_FALSE@@WITH_ASN1_TRUE@	p11-kit/test-profiles.sh \
+@OS_WIN32_FALSE@@WITH_ASN1_TRUE@	$(NULL)
+
+@OS_WIN32_FALSE@am__append_22 = mock-six.la
+@WITH_ASN1_TRUE@am__append_23 = p11-kit/test-softhsm2.sh
+@WITH_TRUST_MODULE_TRUE@am__append_24 = \
 @WITH_TRUST_MODULE_TRUE@	libtrust-data.la \
 @WITH_TRUST_MODULE_TRUE@	$(NULL)
 
-@WITH_TRUST_MODULE_TRUE@am__append_12 = libtrust-testable.la $(NULL) \
+@WITH_TRUST_MODULE_TRUE@am__append_25 = libtrust-testable.la $(NULL) \
 @WITH_TRUST_MODULE_TRUE@	libtrust-test.la
-@WITH_TRUST_MODULE_TRUE@am__append_13 = \
+@WITH_TRUST_MODULE_TRUE@am__append_26 = \
 @WITH_TRUST_MODULE_TRUE@	p11-kit-trust.la
 
-@WITH_TRUST_MODULE_TRUE@am__append_14 = trust/trust
-@WITH_BASH_COMPLETION_TRUE@@WITH_TRUST_MODULE_TRUE@am__append_15 = bash-completion/trust
-@WITH_TRUST_MODULE_TRUE@am__append_16 = trust/trust-extract-compat \
+@WITH_TRUST_MODULE_TRUE@am__append_27 = trust/trust
+@WITH_BASH_COMPLETION_TRUE@@WITH_TRUST_MODULE_TRUE@am__append_28 = bash-completion/trust
+@WITH_TRUST_MODULE_TRUE@am__append_29 = trust/trust-extract-compat \
 @WITH_TRUST_MODULE_TRUE@	trust/p11-kit-trust.module \
-@WITH_TRUST_MODULE_TRUE@	trust/meson.build trust/basic.asn \
-@WITH_TRUST_MODULE_TRUE@	trust/openssl.asn trust/pkix.asn \
-@WITH_TRUST_MODULE_TRUE@	trust/input trust/fixtures \
-@WITH_TRUST_MODULE_TRUE@	trust/test-extract.sh \
+@WITH_TRUST_MODULE_TRUE@	trust/meson.build trust/input \
+@WITH_TRUST_MODULE_TRUE@	trust/fixtures trust/test-extract.sh \
 @WITH_TRUST_MODULE_TRUE@	trust/test-trust.sh $(NULL)
-@WITH_TRUST_MODULE_TRUE@am__append_17 = .asn .asn.h
-@WITH_TRUST_MODULE_TRUE@am__append_18 = $(asn_h)
-@WITH_TRUST_MODULE_TRUE@am__append_19 = \
+@WITH_TRUST_MODULE_TRUE@am__append_30 = \
 @WITH_TRUST_MODULE_TRUE@	test-digest \
-@WITH_TRUST_MODULE_TRUE@	test-asn1 \
 @WITH_TRUST_MODULE_TRUE@	test-base64 \
 @WITH_TRUST_MODULE_TRUE@	test-pem \
 @WITH_TRUST_MODULE_TRUE@	test-oid \
@@ -166,7 +195,7 @@
 @WITH_TRUST_MODULE_TRUE@	test-jks \
 @WITH_TRUST_MODULE_TRUE@	$(NULL)
 
-@WITH_TRUST_MODULE_TRUE@am__append_20 = \
+@WITH_TRUST_MODULE_TRUE@am__append_31 = \
 @WITH_TRUST_MODULE_TRUE@	frob-pow \
 @WITH_TRUST_MODULE_TRUE@	frob-token \
 @WITH_TRUST_MODULE_TRUE@	frob-nss-trust \
@@ -178,10 +207,11 @@
 @WITH_TRUST_MODULE_TRUE@	frob-oid \
 @WITH_TRUST_MODULE_TRUE@	$(NULL)
 
-@WITH_TRUST_MODULE_TRUE@am__append_21 = trust/test-extract.sh trust/test-trust.sh
+@WITH_TRUST_MODULE_TRUE@am__append_32 = trust/test-extract.sh trust/test-trust.sh
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/build-to-host.m4 \
+	$(top_srcdir)/build/m4/gettext.m4 \
 	$(top_srcdir)/build/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/build/m4/iconv.m4 \
 	$(top_srcdir)/build/m4/intlmacosx.m4 \
@@ -204,8 +234,8 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = p11-kit/p11-kit-1.pc p11-kit/pkcs11.conf.example \
-	trust/test-init.sh
+CONFIG_CLEAN_FILES = common/test-init.sh p11-kit/p11-kit-1.pc \
+	p11-kit/pkcs11.conf.example p11-kit/version.h
 CONFIG_CLEAN_VPATH_FILES =
 @WITH_TRUST_MODULE_TRUE@am__EXEEXT_1 = trust/trust$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(privatedir)" \
@@ -215,9 +245,10 @@
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(systemduserunitdir)" \
 	"$(DESTDIR)$(incdir)"
 am__EXEEXT_2 =
-@OS_WIN32_FALSE@am__EXEEXT_3 = test-server$(EXEEXT)
-@WITH_TRUST_MODULE_TRUE@am__EXEEXT_4 = test-digest$(EXEEXT) \
-@WITH_TRUST_MODULE_TRUE@	test-asn1$(EXEEXT) \
+@WITH_ASN1_TRUE@am__EXEEXT_3 = test-asn1$(EXEEXT) test-oid$(EXEEXT) \
+@WITH_ASN1_TRUE@	$(am__EXEEXT_2)
+@OS_WIN32_FALSE@am__EXEEXT_4 = test-server$(EXEEXT)
+@WITH_TRUST_MODULE_TRUE@am__EXEEXT_5 = test-digest$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	test-base64$(EXEEXT) test-pem$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	test-oid$(EXEEXT) test-utf8$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	test-x509$(EXEEXT) \
@@ -233,24 +264,24 @@
 @WITH_TRUST_MODULE_TRUE@	test-openssl$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	test-edk2$(EXEEXT) test-jks$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	$(am__EXEEXT_2)
-am__EXEEXT_5 = test-tests$(EXEEXT) test-compat$(EXEEXT) \
+am__EXEEXT_6 = test-tests$(EXEEXT) test-compat$(EXEEXT) \
 	test-hash$(EXEEXT) test-dict$(EXEEXT) test-array$(EXEEXT) \
-	test-constants$(EXEEXT) test-attrs$(EXEEXT) \
+	test-hex$(EXEEXT) test-constants$(EXEEXT) test-attrs$(EXEEXT) \
 	test-buffer$(EXEEXT) test-url$(EXEEXT) test-path$(EXEEXT) \
 	test-lexer$(EXEEXT) test-message$(EXEEXT) test-argv$(EXEEXT) \
-	test-runtime$(EXEEXT) $(am__EXEEXT_2) test-progname$(EXEEXT) \
-	test-util$(EXEEXT) test-conf$(EXEEXT) test-uri$(EXEEXT) \
-	test-pin$(EXEEXT) test-init$(EXEEXT) test-modules$(EXEEXT) \
-	test-deprecated$(EXEEXT) test-proxy$(EXEEXT) \
-	test-proxy3$(EXEEXT) test-iter$(EXEEXT) test-rpc$(EXEEXT) \
-	test-rpc-message$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-	test-virtual$(EXEEXT) test-managed$(EXEEXT) test-log$(EXEEXT) \
-	test-log3$(EXEEXT) test-filter$(EXEEXT) \
+	test-runtime$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	test-progname$(EXEEXT) test-util$(EXEEXT) test-conf$(EXEEXT) \
+	test-uri$(EXEEXT) test-pin$(EXEEXT) test-init$(EXEEXT) \
+	test-modules$(EXEEXT) test-deprecated$(EXEEXT) \
+	test-proxy$(EXEEXT) test-proxy3$(EXEEXT) test-iter$(EXEEXT) \
+	test-rpc$(EXEEXT) test-rpc-message$(EXEEXT) $(am__EXEEXT_2) \
+	$(am__EXEEXT_4) test-virtual$(EXEEXT) test-managed$(EXEEXT) \
+	test-log$(EXEEXT) test-log3$(EXEEXT) test-filter$(EXEEXT) \
 	test-transport$(EXEEXT) test-transport3$(EXEEXT) \
-	$(am__EXEEXT_2) $(am__EXEEXT_4)
-@OS_WIN32_FALSE@am__EXEEXT_6 = common/frob-getprogname$(EXEEXT)
-am__EXEEXT_7 = fuzz/rpc_fuzzer$(EXEEXT)
-@WITH_TRUST_MODULE_TRUE@am__EXEEXT_8 = frob-pow$(EXEEXT) \
+	test-version$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_5)
+@OS_WIN32_FALSE@am__EXEEXT_7 = common/frob-getprogname$(EXEEXT)
+am__EXEEXT_8 = fuzz/rpc_fuzzer$(EXEEXT)
+@WITH_TRUST_MODULE_TRUE@am__EXEEXT_9 = frob-pow$(EXEEXT) \
 @WITH_TRUST_MODULE_TRUE@	frob-token$(EXEEXT) \

_service:tar_scm:p11-kit-0.25.0.tar.xz/NEWS -> _service:tar_scm:p11-kit-0.25.5.tar.xz/NEWS Changed

@@ -1,3 +1,40 @@
+0.25.5 (stable)
+* iter: fix recursive attribute loading PR#642
+* fix building on FreeBSD 14.0 (amd64) PR#644
+* test fix PR#645
+
+0.25.4 (stable)
+* rpc: add support for recursive attributes PR#624, PR#629, PR#631, PR#633
+* p11-kit: add function to check run-time version of the library PR#637
+* p11-kit: expose version information through macros PR#635
+* p11-kit: add option to specify CKA_ID in generate-keypair and import-object commands PR#615
+* p11-kit: add --provider option to specify PKCS#11 module when using p11-kit commands PR#611
+* p11-kit: fix a bug where eddsa mechanism isn't recognized in generate-keypair PR#617
+* p11-kit: fallback to C_GetFunctionList when C_GetInterface returns CKR_FUNCTION_NOT_SUPPORTED PR#622
+* bug and build fixes PR#603, PR#604, PR#605, PR#606, PR#609, PR#614, PR#616, PR#619, PR#627, PR#628, PR#632, PR#636, PR#639
+
+0.25.3 (stable)
+* rpc: fix serialization of NULL mechanism pointer PR#601
+* fix meson build failure in macOS (appleframeworks not found) PR#603
+
+0.25.2 (stable)
+* fix error code checking of readpassphrase for --login option PR#595
+* build fixes PR#594
+* test fixes PR#596
+
+0.25.1 (stable)
+ * fix probing of C_GetInterface PR#535
+ * p11-kit: add command to list tokens PR#581
+ * p11-kit: add command to list mechanisms supported by a token PR#576
+ * p11-kit: add command to generate private-public keypair on a token PR#551, PR#582
+ * p11-kit: add commands to import/export certificates and public keys into/from a token PR#543, PR#549, PR#568, PR#588
+ * p11-kit: add commands to list and delete objects of a token PR#533, PR#544, PR#571
+ * p11-kit: add --login option to login into a token with object and profile management commands PR#587
+ * p11-kit: adjust behavior of PKCS#11 profile management commands PR#558, PR#560, PR#583, PR#591
+ * p11-kit: print PKCS#11 URIs in list-modules PR#532
+ * bug and build fixes PR#528 PR#529, PR#534, PR#537, PR#540, PR#541, PR#545, PR#547, PR#550, PR#557, PR#572, PR#575, PR#579, PR#585, PR#586, PR#590
+ * test fixes PR#553, PR#580
+
 0.25.0 (stable)
  * add PKCS#11 3.0 support PR#458, PR#461, PR#462, PR#463, PR#464, PR#467, PR#469, PR#470, PR#475, PR#485, PR#486
  * add support for profile objects PR#479

_service:tar_scm:p11-kit-0.25.0.tar.xz/README -> _service:tar_scm:p11-kit-0.25.5.tar.xz/README Changed

@@ -1,6 +1,5 @@
 # p11-kit
-
-!GitHub Build Status(https://github.com/p11-glue/p11-kit/workflows/test/badge.svg)(https://github.com/p11-glue/p11-kit/actions?query=workflow%3Atest) !Coverage Status(https://img.shields.io/coveralls/p11-glue/p11-kit.svg)(https://coveralls.io/r/p11-glue/p11-kit) !CII Best Practices(https://bestpractices.coreinfrastructure.org/projects/1627/badge)(https://bestpractices.coreinfrastructure.org/en/projects/1627)
+!test(https://github.com/p11-glue/p11-kit/actions/workflows/test.yaml/badge.svg?branch=master)(https://github.com/p11-glue/p11-kit/actions/workflows/test.yaml) !Coverage Status(https://img.shields.io/coveralls/p11-glue/p11-kit.svg)(https://coveralls.io/r/p11-glue/p11-kit) !CII Best Practices(https://bestpractices.coreinfrastructure.org/projects/1627/badge)(https://bestpractices.coreinfrastructure.org/en/projects/1627)
 
 p11-kit aims to solve problems with coordinating the use of PKCS #11
 by different components or libraries living in the same process, by
@@ -31,6 +30,6 @@
 
 # Releases
 
-Releases are made available via the primary github site(https://github.com/p11-glue/p11-kit/releases). They are signed with the current maintainer's OpenPGP key(https://keys.openpgp.org/search?q=462225C3B46F34879FC8496CD605848ED7E69871).
+Releases are made available via the primary github site(https://github.com/p11-glue/p11-kit/releases). They are signed with OpenPGP key of one of the maintainers: Daiki Ueno(https://keys.openpgp.org/search?q=462225C3B46F34879FC8496CD605848ED7E69871), Zoltan Fridrich(https://keys.openpgp.org/search?q=5D46CB0F763405A7053556F47A75A648B3F9220C).
 
 PKCS #11: https://en.wikipedia.org/wiki/PKCS_11

_service:tar_scm:p11-kit-0.25.0.tar.xz/aclocal.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/aclocal.m4 Changed

@@ -20,8 +20,8 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
+# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
 
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -63,7 +63,7 @@
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun(PKG_PREREQ,
-m4_define(PKG_MACROS_VERSION, 0.29.1)
+m4_define(PKG_MACROS_VERSION, 0.29.2)
 m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
     m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
 )dnl PKG_PREREQ
@@ -108,7 +108,7 @@
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN(PKG_CHECK_EXISTS,
@@ -164,7 +164,7 @@
 AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
 
 pkg_failed=no
-AC_MSG_CHECKING(for $1)
+AC_MSG_CHECKING(for $2)
 
 _PKG_CONFIG($1_CFLAGS, cflags, $2)
 _PKG_CONFIG($1_LIBS, libs, $2)
@@ -174,17 +174,17 @@
 See the pkg-config man page for more details.)
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT(no)
+        AC_MSG_RESULT(no)
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+                $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+                $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+        # Put the nasty error message in config.log where it belongs
+        echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default($4, AC_MSG_ERROR(
+        m4_default($4, AC_MSG_ERROR(
 Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -195,8 +195,8 @@
 _PKG_TEXT)dnl
         )
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT(no)
-	m4_default($4, AC_MSG_FAILURE(
+        AC_MSG_RESULT(no)
+        m4_default($4, AC_MSG_FAILURE(
 The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -206,10 +206,10 @@
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
         )
 else
-	$1_CFLAGS=$pkg_cv_$1_CFLAGS
-	$1_LIBS=$pkg_cv_$1_LIBS
+        $1_CFLAGS=$pkg_cv_$1_CFLAGS
+        $1_LIBS=$pkg_cv_$1_LIBS
         AC_MSG_RESULT(yes)
-	$3
+        $3
 fidnl
 )dnl PKG_CHECK_MODULES
 
@@ -1190,6 +1190,350 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# AM_PATH_PYTHON(MINIMUM-VERSION, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+# ---------------------------------------------------------------------------
+# Adds support for distributing Python modules and packages.  To
+# install modules, copy them to $(pythondir), using the python_PYTHON
+# automake variable.  To install a package with the same name as the
+# automake package, install to $(pkgpythondir), or use the
+# pkgpython_PYTHON automake variable.
+#
+# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+# locations to install python extension modules (shared libraries).
+# Another macro is required to find the appropriate flags to compile
+# extension modules.
+#
+# If your package is configured with a different prefix to python,
+# users will have to add the install directory to the PYTHONPATH
+# environment variable, or create a .pth file (see the python
+# documentation for details).
+#
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+# cause an error if the version of python installed on the system
+# doesn't meet the requirement.  MINIMUM-VERSION should consist of
+# numbers and dots only.
+AC_DEFUN(AM_PATH_PYTHON,
+ 
+  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
+  dnl supported. (2.0 was released on October 16, 2000).
+  m4_define_default(_AM_PYTHON_INTERPRETER_LIST,
+python python2 python3 dnl
+ python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
+ python3.2 python3.1 python3.0 dnl
+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
+ python2.0)
+
+  AC_ARG_VAR(PYTHON, the Python interpreter)
+
+  m4_if($1,,
+    dnl No version check is needed.
+    # Find any Python interpreter.
+    if test -z "$PYTHON"; then
+      AC_PATH_PROGS(PYTHON, _AM_PYTHON_INTERPRETER_LIST, :)
+    fi
+    am_display_PYTHON=python
+  , 
+    dnl A version check is needed.
+    if test -n "$PYTHON"; then
+      # If the user set $PYTHON, use it and don't search something else.
+      AC_MSG_CHECKING(whether $PYTHON version is >= $1)
+      AM_PYTHON_CHECK_VERSION($PYTHON, $1,
+			      AC_MSG_RESULT(yes),
+			      AC_MSG_RESULT(no)
+			       AC_MSG_ERROR(Python interpreter is too old))
+      am_display_PYTHON=$PYTHON
+    else
+      # Otherwise, try each interpreter until we find one that satisfies
+      # VERSION.
+      AC_CACHE_CHECK(for a Python interpreter with version >= $1,
+	am_cv_pathless_PYTHON,
+	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
+	  test "$am_cv_pathless_PYTHON" = none && break
+	  AM_PYTHON_CHECK_VERSION($am_cv_pathless_PYTHON, $1, break)
+	done)
+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+      if test "$am_cv_pathless_PYTHON" = none; then
+	PYTHON=:
+      else
+        AC_PATH_PROG(PYTHON, $am_cv_pathless_PYTHON)
+      fi
+      am_display_PYTHON=$am_cv_pathless_PYTHON
+    fi
+  )
+
+  if test "$PYTHON" = :; then
+    dnl Run any user-specified action, or abort.
+    m4_default($3, AC_MSG_ERROR(no suitable Python interpreter found))
+  else
+
+  dnl Query Python for its version number.  Although site.py simply uses
+  dnl sys.version:3, printing that failed with Python 3.10, since the
+  dnl trailing zero was eliminated. So now we output just the major
+  dnl and minor version numbers, as numbers. Apparently the tertiary
+  dnl version is not of interest.
+  dnl
+  AC_CACHE_CHECK(for $am_display_PYTHON version, am_cv_python_version,
+    am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info:2)"`)
+  AC_SUBST(PYTHON_VERSION, $am_cv_python_version)
+
+  dnl At times, e.g., when building shared libraries, you may want
+  dnl to know which OS platform Python thinks this is.
+  dnl
+  AC_CACHE_CHECK(for $am_display_PYTHON platform, am_cv_python_platform,
+    am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`)
+  AC_SUBST(PYTHON_PLATFORM, $am_cv_python_platform)
+
+  dnl emacs-page
+  dnl If --with-python-sys-prefix is given, use the values of sys.prefix
+  dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX
+  dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and
+  dnl ${exec_prefix} variables.
+  dnl
+  dnl The two are made distinct variables so they can be overridden if
+  dnl need be, although general consensus is that you shouldn't need

_service:tar_scm:p11-kit-0.25.0.tar.xz/bash-completion/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/bash-completion/meson.build Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/bash-completion/p11-kit -> _service:tar_scm:p11-kit-0.25.5.tar.xz/bash-completion/p11-kit Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/litter/config.guess -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/litter/config.guess Changed

@@ -1,10 +1,10 @@
 #!/usr/bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-05-25'
+timestamp='2023-06-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 usage="\
 Usage: $0 OPTION
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -60,13 +60,13 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -459,7 +459,7 @@
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -966,6 +966,12 @@
 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
 	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
 	;;
+    x86_64:Mmanagarm:*:*|i?86:Mmanagarm:*:*)
+	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+	;;
+    *:Mmanagarm:*:*)
+	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	;;
     *:Minix:*:*)
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
@@ -1036,7 +1042,7 @@
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
     m32r*:Linux:*:*)
@@ -1191,7 +1197,7 @@
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1332,7 +1338,7 @@
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/litter/config.rpath -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/litter/config.rpath Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/litter/config.sub -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/litter/config.sub Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/build-to-host.m4 Added

@@ -0,0 +1,73 @@
+# build-to-host.m4 serial 1
+dnl Copyright (C) 2023 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Bruno Haible.
+
+dnl When the build environment ($build_os) is different from the target runtime
+dnl environment ($host_os), file names may need to be converted from the build
+dnl environment syntax to the target runtime environment syntax. This is
+dnl because the Makefiles are executed (mostly) by build environment tools and
+dnl therefore expect file names in build environment syntax, whereas the runtime
+dnl expects file names in target runtime environment syntax.
+dnl
+dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need
+dnl be converted from Cygwin syntax to native Windows syntax:
+dnl   /cygdrive/c/foo/bar -> C:\foo\bar
+dnl   /usr/local/share    -> C:\cygwin64\usr\local\share
+dnl
+dnl gl_BUILD_TO_HOST(somedir)
+dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must
+dnl already have its final value assigned, and produces two additional
+dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the
+dnl same file name value, just in different syntax:
+dnl   - somedir_c       is the file name in target runtime environment syntax,
+dnl                     as a C string (starting and ending with a double-quote,
+dnl                     and with escaped backslashes and double-quotes in
+dnl                     between).
+dnl   - somedir_c_make  is the same thing, escaped for use in a Makefile.
+
+AC_DEFUN(gl_BUILD_TO_HOST,
+
+  AC_REQUIRE(AC_CANONICAL_BUILD)
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(gl_BUILD_TO_HOST_INIT)
+
+  dnl Define somedir_c.
+  gl_final_$1="$$1"
+  dnl Translate it from build syntax to host syntax.
+  case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw*)
+          gl_final_$1=`cygpath -w "$gl_final_$1"` ;;
+      esac
+      ;;
+  esac
+  dnl Convert it to C string syntax.
+  $1_c=`echo "$gl_final_$1" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"`
+  $1_c='"'"$$1_c"'"'
+  AC_SUBST($1_c)
+
+  dnl Define somedir_c_make.
+  $1_c_make=`echo "$$1_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"`
+  dnl Use the substituted somedir variable, when possible, so that the user
+  dnl may adjust somedir a posteriori when there are no special characters.
+  if test "$$1_c_make" = '\"'"${gl_final_$1}"'\"'; then
+    $1_c_make='\"$($1)\"'
+  fi
+  AC_SUBST($1_c_make)
+)
+
+dnl Some initializations for gl_BUILD_TO_HOST.
+AC_DEFUN(gl_BUILD_TO_HOST_INIT,
+
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+changequote(,)dnl
+  gl_sed_escape_for_make_1="s,\$ \"&'();<>\\\\\`|\$,\\\\\\1,g"
+changequote(,)dnl
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+)

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/gettext.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/gettext.m4 Changed

@@ -1,5 +1,5 @@
-# gettext.m4 serial 72 (gettext-0.21.1)
-dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
+# gettext.m4 serial 77 (gettext-0.22)
+dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -20,11 +20,13 @@
 dnl Macro to add for using GNU gettext.
 
 dnl Usage: AM_GNU_GETTEXT(INTLSYMBOL, NEEDSYMBOL, INTLDIR).
-dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages other than GNU gettext, and
-dnl    'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'.
+dnl    INTLSYMBOL should be 'external' for packages other than GNU gettext.
+dnl    It should be 'use-libtool' for the packages 'gettext-runtime' and
+dnl    'gettext-tools'.
+dnl    It should be 'here' for the package 'gettext-runtime/intl'.
+dnl    If INTLSYMBOL is 'here', then a libtool library
+dnl    $(top_builddir)/libintl.la will be created (shared and/or static,
 dnl    depending on --{enable,disable}-{shared,static} and on the presence of
 dnl    AM-DISABLE-SHARED).
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
@@ -55,24 +57,21 @@
 AC_DEFUN(AM_GNU_GETTEXT,
 
   dnl Argument checking.
-  m4_if($1, , , m4_if($1, external, , m4_if($1, use-libtool, ,
+  m4_if($1, , , m4_if($1, external, , m4_if($1, use-libtool, , m4_if($1, here, ,
     errprint(ERROR: invalid first argument to AM_GNU_GETTEXT
-))))
+)))))
   m4_if(m4_if($1, , old)m4_if($1, no-libtool, old), old,
     errprint(ERROR: Use of AM_GNU_GETTEXT without external argument is no longer supported.
 ))
   m4_if($2, , , m4_if($2, need-ngettext, , m4_if($2, need-formatstring-macros, ,
     errprint(ERROR: invalid second argument to AM_GNU_GETTEXT
 ))))
-  define(gt_included_intl,
-    m4_if($1, external, no, yes))
+  define(gt_building_libintl_in_same_build_tree,
+    m4_if($1, use-libtool, yes, m4_if($1, here, yes, no)))
   gt_NEEDS_INIT
   AM_GNU_GETTEXT_NEED($2)
 
   AC_REQUIRE(AM_PO_SUBDIRS)dnl
-  m4_if(gt_included_intl, yes, 
-    AC_REQUIRE(AM_INTL_SUBDIR)dnl
-  )
 
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
@@ -82,13 +81,13 @@
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
   dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
   dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
   dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
   dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
-  m4_if(gt_included_intl, yes, , 
+  m4_if(gt_building_libintl_in_same_build_tree, yes, , 
     AC_REQUIRE(AM_ICONV_LINKFLAGS_BODY)
   )
 
@@ -98,8 +97,7 @@
   dnl Set USE_NLS.
   AC_REQUIRE(AM_NLS)
 
-  m4_if(gt_included_intl, yes, 
-    BUILD_INCLUDED_LIBINTL=no
+  m4_if(gt_building_libintl_in_same_build_tree, yes, 
     USE_INCLUDED_LIBINTL=no
   )
   LIBINTL=
@@ -118,7 +116,7 @@
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
-    m4_if(gt_included_intl, yes, 
+    m4_if(gt_building_libintl_in_same_build_tree, yes, 
       AC_MSG_CHECKING(whether included gettext is requested)
       AC_ARG_WITH(included-gettext,
           --with-included-gettext use the GNU gettext library included here,
@@ -174,7 +172,7 @@
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          m4_if(gt_included_intl, yes, , 
+          m4_if(gt_building_libintl_in_same_build_tree, yes, , 
             AM_ICONV_LINK
           )
           dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
@@ -252,7 +250,8 @@
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
           dnl Reset the values set by searching for libintl.
@@ -261,7 +260,7 @@
           INCINTL=
         fi
 
-    m4_if(gt_included_intl, yes, 
+    m4_if(gt_building_libintl_in_same_build_tree, yes, 
         if test "$gt_use_preinstalled_gnugettext" != "yes"; then
           dnl GNU gettext is not found in the C library.
           dnl Fall back on included GNU gettext library.
@@ -271,7 +270,6 @@
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
         LIBINTL="m4_if($3,,\${top_builddir}/intl,$3)/libintl.la $LIBICONV $LIBTHREAD"
         LTLIBINTL="m4_if($3,,\${top_builddir}/intl,$3)/libintl.la $LTLIBICONV $LTLIBTHREAD"
@@ -341,25 +339,39 @@
     POSUB=po
   fi
 
-  m4_if(gt_included_intl, yes, 
-    dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
-    dnl because some of the testsuite requires it.
-    BUILD_INCLUDED_LIBINTL=yes
-
+  m4_if(gt_building_libintl_in_same_build_tree, yes, 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATOBJEXT)
   )
 
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
+  m4_if(gt_building_libintl_in_same_build_tree, yes, , 
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLLIBS="$LIBINTL"
+    AC_SUBST(INTLLIBS)
+  )
 
   dnl Make all documented variables known to autoconf.
   AC_SUBST(LIBINTL)
   AC_SUBST(LTLIBINTL)
   AC_SUBST(POSUB)
+
+  dnl Define localedir_c and localedir_c_make.
+  dnl Find the final value of localedir.
+  gt_save_prefix="${prefix}"
+  gt_save_datarootdir="${datarootdir}"
+  gt_save_localedir="${localedir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  gl_BUILD_TO_HOST(localedir)
+  localedir="${gt_save_localedir}"
+  datarootdir="${gt_save_datarootdir}"
+  prefix="${gt_save_prefix}"
 )

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/host-cpu-c-abi.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/host-cpu-c-abi.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/iconv.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/iconv.m4 Changed

@@ -1,5 +1,5 @@
-# iconv.m4 serial 24
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
+# iconv.m4 serial 26
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -234,12 +234,6 @@
 
 dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
 dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
 AC_DEFUN_ONCE(AM_ICONV,
 
   AM_ICONV_LINK
@@ -280,4 +274,20 @@
        ICONV_CONST="const"
      fi
     )
+
+  dnl A summary result, for those packages which want to print a summary at the
+  dnl end of the configuration.
+  if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 )

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/intlmacosx.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/intlmacosx.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/lib-ld.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/lib-ld.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/lib-link.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/lib-link.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/lib-prefix.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/lib-prefix.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/nls.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/nls.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/build/m4/progtest.m4 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/build/m4/progtest.m4 Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/Makefile.am -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/Makefile.am Changed

@@ -18,15 +18,18 @@
 	common/argv.c common/argv.h \
 	common/attrs.c common/attrs.h \
 	common/array.c common/array.h \
+	common/base64.c common/base64.h \
 	common/buffer.c common/buffer.h \
 	common/compat.c common/compat.h \
 	common/constants.c common/constants.h \
 	common/debug.c common/debug.h \
 	common/dict.c common/dict.h \
 	common/hash.c common/hash.h \
+	common/hex.c common/hex.h \
 	common/lexer.c common/lexer.h \
 	common/message.c common/message.h \
 	common/path.c common/path.h \
+	common/pem.c common/pem.h \
 	common/pkcs11.h common/pkcs11x.h common/pkcs11i.h \
 	common/runtime.c common/runtime.h \
 	common/url.c common/url.h \
@@ -44,14 +47,20 @@
 	$(NULL)
 
 libp11_tool_la_SOURCES = \
+	common/options.c common/options.h \
 	common/print.c common/print.h \
-	common/tool.c common/tool.h \
 	$(NULL)
 
 if !OS_WIN32
 libp11_tool_la_SOURCES += \
 	common/unix-peer.c common/unix-peer.h \
 	$(NULL)
+
+if NEED_READPASSPHRASE
+libp11_tool_la_SOURCES += \
+	common/readpassphrase.c \
+	$(NULL)
+endif
 endif
 
 # Tests ----------------------------------------------------------------
@@ -67,6 +76,7 @@
 	test-hash \
 	test-dict \
 	test-array \
+	test-hex \
 	test-constants \
 	test-attrs \
 	test-buffer \
@@ -84,6 +94,9 @@
 test_array_SOURCES = common/test-array.c
 test_array_LDADD = $(common_LIBS)
 
+test_hex_SOURCES = common/test-hex.c
+test_hex_LDADD = $(common_LIBS)
+
 test_attrs_SOURCES = common/test-attrs.c
 test_attrs_LDADD = $(common_LIBS)
 
@@ -138,4 +151,57 @@
 common_frob_getprogname_LDADD = $(common_LIBS)
 endif
 
+if WITH_ASN1
+SUFFIXES += .asn .asn.h
+.asn.asn.h:
+	$(AM_V_GEN)$(ASN1PARSER) -o $@ $<
+
+asn_h = \
+	common/basic.asn.h \
+	common/openssl.asn.h \
+	common/pkix.asn.h \
+	$(NULL)
+
+BUILT_SOURCES += $(asn_h)
+
+EXTRA_DIST += \
+	common/basic.asn \
+	common/openssl.asn \
+	common/pkix.asn \
+	$(NULL)
+
+noinst_LTLIBRARIES += libp11-asn1.la
+
+libp11_asn1_la_SOURCES = \
+	common/asn1.c common/asn1.h \
+	common/oid.c common/oid.h \
+	common/persist.c common/persist.h \
+	common/types.h \
+	$(asn_h) \
+	$(NULL)
+
+libp11_asn1_la_CFLAGS = $(LIBTASN1_CFLAGS)
+
+libp11_asn1_la_LIBADD = $(LIBTASN1_LIBS)
+
+asn1_LIBS = \
+	libp11-asn1.la \
+	$(LIBTASN1_LIBS) \
+	$(common_LIBS) \
+	$(NULL)
+
+test_asn1_SOURCES = common/test-asn1.c
+test_asn1_LDADD = $(asn1_LIBS)
+test_asn1_CFLAGS = $(LIBTASN1_CFLAGS)
+
+test_oid_SOURCES = common/test-oid.c
+test_oid_LDADD = $(asn1_LIBS)
+test_oid_CFLAGS = $(LIBTASN1_CFLAGS)
+
+c_tests += \
+	test-asn1 \
+	test-oid \
+	$(NULL)
+endif
+
 EXTRA_DIST += common/meson.build

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/asn1.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/asn1.h Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/attrs.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/attrs.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/base64.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/base64.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/basic.asn Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/basic.asn.h Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/compat.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/compat.c Changed

@@ -322,15 +322,18 @@
 p11_dl_error (void)
 {
 	DWORD code = GetLastError();
-	LPVOID msg_buf;
+	LPVOID msg_buf = NULL;
 	char *result;
 
 	FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER |
-	                FORMAT_MESSAGE_FROM_SYSTEM |
-	                FORMAT_MESSAGE_IGNORE_INSERTS,
-	                NULL, code,
-	                MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-	                (LPSTR)&msg_buf, 0, NULL);
+			FORMAT_MESSAGE_FROM_SYSTEM |
+			FORMAT_MESSAGE_IGNORE_INSERTS,
+			NULL, code,
+			MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+			(LPSTR)&msg_buf, 0, NULL);
+
+	if (msg_buf == NULL)
+		return NULL;
 
 	result = strdup (msg_buf);
 	LocalFree (msg_buf);
@@ -856,7 +859,7 @@
 #ifndef HAVE_GETAUXVAL
 
 unsigned long
-getauxval (unsigned long type)
+_p11_getauxval (unsigned long type)
 {
 	static unsigned long secure = 0UL;
 	static bool check_secure_initialized = false;
@@ -868,7 +871,7 @@
 	assert (type == AT_SECURE);
 
 	if (!check_secure_initialized) {
-#if defined(HAVE___LIBC_ENABLE_SECURE)
+#if defined(HAVE___LIBC_ENABLE_SECURE) && !defined(__GNU__)
 		extern int __libc_enable_secure;
 		secure = __libc_enable_secure;
 
@@ -905,7 +908,7 @@
 char *
 secure_getenv (const char *name)
 {
-	if (getauxval (AT_SECURE))
+	if (_p11_getauxval (AT_SECURE))
 		return NULL;
 	return getenv (name);
 }
@@ -1051,3 +1054,13 @@
 		return 'A' + (c - 'a');
 	return c;
 }
+
+bool
+p11_ascii_strcaseeq (const char *s1,
+		     const char *s2)
+{
+	while (p11_ascii_tolower (*s1) == p11_ascii_tolower (*s2++))
+		if (*s1++ == '\0')
+			return true;
+	return false;
+}

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/compat.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/compat.h Changed

@@ -353,10 +353,11 @@
 #ifdef HAVE_GETAUXVAL
 
 #include <sys/auxv.h>
+#define _p11_getauxval(X) getauxval(X)
 
 #else /* !HAVE_GETAUXVAL */
 
-unsigned long     getauxval (unsigned long type);
+unsigned long     _p11_getauxval (unsigned long type);
 
 #define AT_SECURE 23
 
@@ -381,6 +382,27 @@
 
 #endif /* HAVE_ISATTY */
 
+#ifdef HAVE_READPASSPHRASE
+
+#include <readpassphrase.h>
+
+#else
+
+#define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
+#define RPP_ECHO_ON     0x01		/* Leave echo on. */
+#define RPP_REQUIRE_TTY 0x02		/* Fail if there is no tty. */
+#define RPP_FORCELOWER  0x04		/* Force input to lower case. */
+#define RPP_FORCEUPPER  0x08		/* Force input to upper case. */
+#define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
+#define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
+
+char      *readpassphrase   (const char *prompt,
+                             char *buf,
+                             size_t bufsiz,
+                             int flags);
+
+#endif /* HAVE_READPASSPHRASE */
+
 /* If either locale_t or newlocale() is not available, strerror_l()
  * cannot be used */
 #if !defined(HAVE_LOCALE_T) || !defined(HAVE_NEWLOCALE)
@@ -394,11 +416,14 @@
 
 #endif
 
-void       p11_strerror_r    (int errnum,
-                              char *buf,
-                              size_t buflen);
+void       p11_strerror_r      (int errnum,
+                                char *buf,
+                                size_t buflen);
+
+int        p11_ascii_tolower   (int c);
+int        p11_ascii_toupper   (int c);
 
-int        p11_ascii_tolower (int c);
-int        p11_ascii_toupper (int c);
+bool       p11_ascii_strcaseeq (const char *s1,
+                                const char *s2);
 
 #endif /* __COMPAT_H__ */

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/constants.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/constants.c Changed

@@ -114,6 +114,8 @@
 	CT (CKA_ALWAYS_SENSITIVE, "always-sensitive")
 	CT (CKA_KEY_GEN_MECHANISM, "key-gen-mechanism")
 	CT (CKA_MODIFIABLE, "modifiable")
+	CT (CKA_COPYABLE, "copyable")
+	CT (CKA_DESTROYABLE, "destroyable")
 	CT (CKA_ECDSA_PARAMS, "ecdsa-params")
 	/* CT (CKA_EC_PARAMS) */
 	CT (CKA_EC_POINT, "ec-point")
@@ -138,6 +140,7 @@
 	CT (CKA_REQUIRED_CMS_ATTRIBUTES, "required-cms-attributes")
 	CT (CKA_DEFAULT_CMS_ATTRIBUTES, "default-cms-attributes")
 	CT (CKA_SUPPORTED_CMS_ATTRIBUTES, "supported-cms-attributes")
+	CT (CKA_PROFILE_ID, "profile-id")
 	CT (CKA_WRAP_TEMPLATE, "wrap-template")
 	CT (CKA_UNWRAP_TEMPLATE, "unwrap-template")
 	CT (CKA_ALLOWED_MECHANISMS, "allowed-mechanisms")
@@ -215,6 +218,7 @@
 	CT (CKO_HW_FEATURE, "hw-feature")
 	CT (CKO_DOMAIN_PARAMETERS, "domain-parameters")
 	CT (CKO_MECHANISM, "mechanism")
+	CT (CKO_PROFILE, "profile")
 	CT (CKO_NSS_CRL, "nss-crl")
 	CT (CKO_NSS_SMIME, "nss-smime")
 	CT (CKO_NSS_TRUST, "nss-trust")
@@ -636,6 +640,14 @@
 	{ CKA_INVALID },
 };
 
+const p11_constant p11_constant_hw_features = {
+	CT (CKH_MONOTONIC_COUNTER, "monotonic-counter")
+	CT (CKH_CLOCK, "clock")
+	CT (CKH_USER_INTERFACE, "user-interface")
+	CT (CKH_VENDOR_DEFINED, "vendor-defined")
+	{ CKA_INVALID },
+};
+
 const p11_constant p11_constant_profiles = {
 	CT (CKP_BASELINE_PROVIDER, "baseline-provider")
 	CT (CKP_EXTENDED_PROVIDER, "extended-provider")
@@ -662,6 +674,7 @@
 	{ p11_constant_states, ELEMS (p11_constant_states) - 1 },
 	{ p11_constant_users, ELEMS (p11_constant_users) - 1 },
 	{ p11_constant_returns, ELEMS (p11_constant_returns) - 1 },
+	{ p11_constant_hw_features, ELEMS (p11_constant_hw_features) - 1 },
 	{ p11_constant_profiles, ELEMS (p11_constant_profiles) - 1 },
 };

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/constants.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/constants.h Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/frob-getauxval.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/frob-getauxval.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/frob-getprogname.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/frob-getprogname.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/hex.c Added

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (C) 2023 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Authors: Stef Walter <stefw@collabora.co.uk>,
+ *          Daiki Ueno,
+ *          Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include "debug.h"
+#include "hex.h"
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const char HEXC_LOWER = "0123456789abcdef";
+
+char *
+hex_encode (const unsigned char *data,
+            size_t n_data)
+{
+	char *result;
+	size_t i;
+	size_t o;
+
+	return_val_if_fail (data != NULL, NULL);
+
+	if ((SIZE_MAX - 1) / 3 < n_data)
+		return NULL;
+	result = malloc (n_data * 3 + 1);
+	if (result == NULL)
+		return NULL;
+
+	for (i = 0, o = 0; i < n_data; i++) {
+		if (i > 0)
+			resulto++ = ':';
+		resulto++ = HEXC_LOWERdatai >> 4 & 0xf;
+		resulto++ = HEXC_LOWERdatai & 0xf;
+	}
+
+	resulto = 0;
+	return result;
+}
+
+unsigned char *
+hex_decode (const char *hex,
+            size_t *bin_len)
+{
+	int i, j;
+	size_t bin_len_, hex_len;
+	unsigned char *bin, c;
+	bool with_separator;
+
+	return_val_if_fail (hex != NULL, NULL);
+	return_val_if_fail (bin_len != NULL, NULL);
+
+	hex_len = strlen (hex);
+	if (hex_len == 0)
+		return NULL;
+
+	with_separator = hex_len > 2 && hex2 == ':';
+	if (with_separator)
+		for (i = 5; i < hex_len; i += 3)
+			if (hexi != ':')
+				return NULL;
+
+	if (SIZE_MAX - 1 < hex_len ||
+	    (with_separator && (hex_len + 1) % 3 != 0) ||
+	    (!with_separator && hex_len % 2 != 0))
+		return NULL;
+
+	bin_len_ = with_separator ? (hex_len + 1) / 3 : hex_len / 2;
+	bin = calloc (bin_len_, 1);
+	if (bin == NULL)
+		return NULL;
+
+	for (i = 0; i < bin_len_; ++i) {
+		for (j = 0; j < 2; ++j) {
+			c = with_separator ? hexi * 3 + j : hexi * 2 + j;
+			if ('0' <= c && c <= '9')
+				bini |= c - '0';
+			else if ('a' <= c && c <= 'f')
+				bini |= c - 'a' + 10;
+			else if ('A' <= c && c <= 'F')
+				bini |= c - 'A' + 10;
+			else {
+				free (bin);
+				return NULL;
+			}
+			if (j == 0)
+				bini <<= 4;
+		}
+	}
+
+	*bin_len = bin_len_;
+	return bin;
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/hex.h Added

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2011, Collabora Ltd.
+ * Copyright (c) 2023 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>, Daiki Ueno
+ */
+
+#ifndef P11_HEX_H
+#define P11_HEX_H
+
+#include <stddef.h>
+
+char *
+hex_encode (const unsigned char *data,
+	    size_t n_data);
+
+unsigned char *
+hex_decode (const char *hex,
+	    size_t *bin_len);
+
+#endif /* P11_HEX_H */

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/meson.build Changed

@@ -4,15 +4,18 @@
   'argv.c',
   'attrs.c',
   'array.c',
+  'base64.c',
   'buffer.c',
   'compat.c',
   'constants.c',
   'debug.c',
   'dict.c',
   'hash.c',
+  'hex.c',
   'lexer.c',
   'message.c',
   'path.c',
+  'pem.c',
   'runtime.c',
   'url.c',
   'vsock.c'
@@ -49,12 +52,22 @@
 endif
 
 libp11_tool_sources = 
-  'print.c',
-  'tool.c'
+  'options.c',
+  'print.c'
 
 
 if host_system != 'windows'
   libp11_tool_sources += 'unix-peer.c', 'unix-peer.h'
+
+  rpl_functions = 
+    'readpassphrase',
+  
+
+  foreach f : rpl_functions
+    if not cc.has_function(f, dependencies: system_deps)
+      libp11_tool_sources += '@0@.c'.format(f)
+    endif
+  endforeach
 endif
 
 libp11_tool = static_library('p11-tool', libp11_tool_sources,
@@ -62,15 +75,83 @@
 libp11_tool_dep = declare_dependency(link_with: libp11_tool,
                                      dependencies: libp11_common_dep)
 
+libp11_asn1_deps = 
+
+if with_asn1
+  libp11_asn1_sources = 
+    'asn1.c',
+    'oid.c',
+    'persist.c',
+  
+
+  basic_asn_h = custom_target(
+    'basic.asn.h',
+    output: 'basic.asn.h',
+    input: 'basic.asn',
+    command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@',
+  )
+
+  pkix_asn_h = custom_target(
+    'pkix.asn.h',
+    output: 'pkix.asn.h',
+    input: 'pkix.asn',
+    command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@',
+  )
+
+  openssl_asn_h = custom_target(
+    'openssl.asn.h',
+    output: 'openssl.asn.h',
+    input: 'openssl.asn',
+    command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@',
+  )
+
+  asn_h_dep = declare_dependency(
+    sources: basic_asn_h, pkix_asn_h, openssl_asn_h,
+  )
+
+  libp11_asn1 = static_library(
+    'p11-asn1', libp11_asn1_sources,
+    gnu_symbol_visibility: 'hidden',
+    include_directories: configinc,
+    dependencies: asn_h_dep + libtasn1_deps,
+  )
+
+  libp11_asn1_dep = declare_dependency(
+    include_directories: configinc, commoninc,
+    link_with: libp11_asn1,
+    dependencies: asn_h_dep + libtasn1_deps,
+  )
+
+  libp11_asn1_deps += libp11_asn1_dep
+endif
+
 # Tests ----------------------------------------------------------------
 
 if get_option('test')
+  test_init_conf = configuration_data()
+  test_init_conf.set_quoted('prefix', prefix)
+  test_init_conf.set_quoted('exec_prefix', prefix)
+  test_init_conf.set_quoted('datarootdir', prefix / datadir)
+  test_init_conf.set_quoted('datadir', prefix / datadir)
+  test_init_conf.set_quoted('sysconfdir', prefix / sysconfdir)
+  test_init_conf.set_quoted('libdir', prefix / libdir)
+  test_init_conf.set_quoted('libexecdir', prefix / libexecdir)
+  test_init_conf.set_quoted('privatedir', prefix / privatedir)
+  test_init_conf.set_quoted('with_trust_paths', trust_paths)
+
+  configure_file(
+    input: 'test-init.sh.in',
+    output: 'test-init.sh',
+    configuration: test_init_conf,
+  )
+
   common_tests = 
     'test-tests',
     'test-compat',
     'test-hash',
     'test-dict',
     'test-array',
+    'test-hex',
     'test-constants',
     'test-attrs',
     'test-buffer',
@@ -91,6 +172,22 @@
     test(name, t)
   endforeach
 
+  if with_asn1
+    asn1_tests = 
+      'test-asn1',
+      'test-oid',
+    
+
+    foreach name : asn1_tests
+      t = executable(name, '@0@.c'.format(name),
+                     c_args: tests_c_args,
+                     include_directories: configinc,
+                     dependencies: libp11_asn1_deps + dlopen_deps,
+                     link_with: libp11_test, libp11_common)
+      test(name, t)
+    endforeach
+  endif
+
   common_progs = 
     'frob-getauxval',
     'frob-getenv'

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/mock.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/mock.c Changed

@@ -286,10 +286,16 @@
 	{
 		CK_OBJECT_CLASS klass = CKO_PUBLIC_KEY;
 		char *label = "Public prefix key";
+		char *wrapped_label = "Wrapped label";
 		char *value = "value";
 		CK_MECHANISM_TYPE type = CKM_MOCK_PREFIX;
 		CK_BBOOL btrue = CK_TRUE;
 		CK_BBOOL bfalse = CK_FALSE;
+		CK_ATTRIBUTE wrap_template = {
+			{ CKA_LABEL, wrapped_label, strlen (wrapped_label) },
+			{ CKA_VERIFY, &btrue, sizeof (btrue) },
+			{ CKA_ENCRYPT, &btrue, sizeof (btrue) },
+		};
 		CK_ATTRIBUTE attrs = {
 			{ CKA_CLASS, &klass, sizeof (klass) },
 			{ CKA_LABEL, label, strlen (label) },
@@ -297,6 +303,7 @@
 			{ CKA_VERIFY, &btrue, sizeof (btrue) },
 			{ CKA_PRIVATE, &bfalse, sizeof (bfalse) },
 			{ CKA_ALWAYS_AUTHENTICATE, &btrue, sizeof (btrue) },
+			{ CKA_WRAP_TEMPLATE, wrap_template, sizeof (wrap_template) },
 			{ CKA_VALUE, value, strlen (value) },
 			{ CKA_INVALID, NULL, 0 },
 		};
@@ -1618,6 +1625,51 @@
 	return CKR_SESSION_HANDLE_INVALID;
 }
 
+static CK_RV
+get_recursive_attribute_value (CK_ATTRIBUTE_PTR dst,
+			       CK_ATTRIBUTE_PTR src,
+			       CK_ULONG count)
+{
+	CK_RV rv, ret = CKR_OK;
+	CK_ULONG i;
+	CK_ATTRIBUTE *result, *attr;
+
+	for (i = 0; i < count; ++i) {
+		result = dst + i;
+		attr = src + i;
+
+		result->type = attr->type;
+
+		if (result->pValue == NULL) {
+			result->ulValueLen = attr->ulValueLen;
+			continue;
+		}
+
+		if (result->ulValueLen < attr->ulValueLen) {
+			result->ulValueLen = (CK_ULONG)-1;
+			ret = CKR_BUFFER_TOO_SMALL;
+			continue;
+		}
+
+		if (IS_ATTRIBUTE_ARRAY (attr)) {
+			rv = get_recursive_attribute_value (result->pValue,
+				attr->pValue, attr->ulValueLen / sizeof (CK_ATTRIBUTE));
+			if (rv != CKR_OK) {
+				result->ulValueLen = (CK_ULONG)-1;
+				ret = rv;
+				continue;
+			}
+			result->ulValueLen = attr->ulValueLen;
+			continue;
+		}
+
+		memcpy (result->pValue, attr->pValue, attr->ulValueLen);
+		result->ulValueLen = attr->ulValueLen;
+	}
+
+	return ret;
+}
+
 CK_RV
 mock_C_GetAttributeValue (CK_SESSION_HANDLE session,
                           CK_OBJECT_HANDLE object,
@@ -1654,14 +1706,26 @@
 			continue;
 		}
 
-		if (result->ulValueLen >= attr->ulValueLen) {
-			memcpy (result->pValue, attr->pValue, attr->ulValueLen);
+		if (result->ulValueLen < attr->ulValueLen) {
+			result->ulValueLen = (CK_ULONG)-1;
+			ret = CKR_BUFFER_TOO_SMALL;
+			continue;
+		}
+
+		if (IS_ATTRIBUTE_ARRAY (attr)) {
+			rv = get_recursive_attribute_value (result->pValue,
+				attr->pValue, attr->ulValueLen / sizeof (CK_ATTRIBUTE));
+			if (rv != CKR_OK) {
+				result->ulValueLen = (CK_ULONG)-1;
+				ret = rv;
+				continue;
+			}
 			result->ulValueLen = attr->ulValueLen;
 			continue;
 		}
 
-		result->ulValueLen = (CK_ULONG)-1;
-		ret = CKR_BUFFER_TOO_SMALL;
+		memcpy (result->pValue, attr->pValue, attr->ulValueLen);
+		result->ulValueLen = attr->ulValueLen;
 	}
 
 	return ret;

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/mock.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/mock.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/oid.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/oid.h Added

@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@redhat.com>
+ */
+
+#ifndef P11_OIDS_H_
+#define P11_OIDS_H_
+
+#include "compat.h"
+
+bool           p11_oid_simple  (const unsigned char *oid,
+                                int len);
+
+unsigned int   p11_oid_hash    (const void *oid);
+
+bool           p11_oid_equal   (const void *oid_one,
+                                const void *oid_two);
+
+int            p11_oid_length  (const unsigned char *oid);
+
+/*
+ * 2.5.4.3: CN or commonName
+ */
+static const unsigned char P11_OID_CN =
+	{ 0x06, 0x03, 0x55, 0x04, 0x03, };
+
+/*
+ * 2.5.4.10: O or organization
+ */
+static const unsigned char P11_OID_O =
+	{ 0x06, 0x03, 0x55, 0x04, 0x0a, };
+
+/*
+ * 2.5.4.11: OU or organizationalUnit
+ */
+static const unsigned char P11_OID_OU =
+	{ 0x06, 0x03, 0x55, 0x04, 0x0b, };
+
+/*
+ * Our support of certificate extensions and so on is not limited to what is
+ * listed here. This is simply the OIDs used by the parsing code that generates
+ * backwards compatible PKCS#11 objects for NSS and the like.
+ */
+
+/*
+ * 2.5.29.14: SubjectKeyIdentifier
+ */
+static const unsigned char P11_OID_SUBJECT_KEY_IDENTIFIER =
+	{ 0x06, 0x03, 0x55, 0x1d, 0x0e };
+static const char P11_OID_SUBJECT_KEY_IDENTIFIER_STR = "2.5.29.14";
+
+/*
+ * 2.5.29.15: KeyUsage
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_KEY_USAGE =
+	{ 0x06, 0x03, 0x55, 0x1d, 0x0f };
+static const char P11_OID_KEY_USAGE_STR = { "2.5.29.15" };
+
+enum {
+	P11_KU_DIGITAL_SIGNATURE = 128,
+	P11_KU_NON_REPUDIATION = 64,
+	P11_KU_KEY_ENCIPHERMENT = 32,
+	P11_KU_DATA_ENCIPHERMENT = 16,
+	P11_KU_KEY_AGREEMENT = 8,
+	P11_KU_KEY_CERT_SIGN = 4,
+	P11_KU_CRL_SIGN = 2,
+	P11_KU_ENCIPHER_ONLY = 1,
+	P11_KU_DECIPHER_ONLY = 32768,
+};
+
+/*
+ * 2.5.29.19: BasicConstraints
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_BASIC_CONSTRAINTS =
+	{ 0x06, 0x03, 0x55, 0x1d, 0x13 };
+static const char P11_OID_BASIC_CONSTRAINTS_STR = "2.5.29.19";
+
+/*
+ * 2.5.29.37: ExtendedKeyUsage
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_EXTENDED_KEY_USAGE =
+	{ 0x06, 0x03, 0x55, 0x1d, 0x25 };
+static const char P11_OID_EXTENDED_KEY_USAGE_STR = "2.5.29.37";
+
+/*
+ * 2.5.29.37.0: anyExtendedKeyUsage
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_ANY_EXTENDED_KEY_USAGE =
+	{ 0x06, 0x03, 0x55, 0x1d, 0x25, 0x00 };
+static const char P11_OID_ANY_EXTENDED_KEY_USAGE_STR = "2.5.29.37.0";
+
+/*
+ * 1.3.6.1.4.1.3319.6.10.1: OpenSSL reject extension
+ *
+ * An internally defined certificate extension.
+ *
+ * OpenSSL contains a list of OID extended key usages to reject.
+ * The normal X.509 model is to only *include* the extended key
+ * usages that are to be allowed. It's not clear exactly how
+ * valid and useful the reject per extended key usage model is.
+ *
+ * However in order to parse openssl trust policy information and
+ * be able to write it back out in the same way, we define a custom
+ * certificate extension to store it.
+ *
+ * It is not expected (or supported) for others outside of p11-kit
+ * to read this information at this point.
+ *
+ * This extension is never marked critical. It is not necessary to
+ * respect information in this certificate extension given that the
+ * ExtendedKeyUsage extension carries the same information as an
+ * allowlist.
+ */
+static const unsigned char P11_OID_OPENSSL_REJECT =
+	{ 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x99, 0x77, 0x06, 0x0a, 0x01 };
+static const char P11_OID_OPENSSL_REJECT_STR = "1.3.6.1.4.1.3319.6.10.1";
+
+/*
+ * 1.3.6.1.5.5.7.3.1: Server Auth
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_SERVER_AUTH =
+	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01 };
+static const char P11_OID_SERVER_AUTH_STR = "1.3.6.1.5.5.7.3.1";
+
+/*
+ * 1.3.6.1.5.5.7.3.2: Client Auth
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_CLIENT_AUTH =
+	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02 };
+static const char P11_OID_CLIENT_AUTH_STR = "1.3.6.1.5.5.7.3.2";
+
+/*
+ * 1.3.6.1.5.5.7.3.3: Code Signing
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_CODE_SIGNING =
+	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x03 };
+static const char P11_OID_CODE_SIGNING_STR = "1.3.6.1.5.5.7.3.3";
+
+/*
+ * 1.3.6.1.5.5.7.3.4: Email Protection
+ *
+ * Defined in RFC 5280
+ */
+static const unsigned char P11_OID_EMAIL_PROTECTION =
+	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x04 };
+static const char P11_OID_EMAIL_PROTECTION_STR = "1.3.6.1.5.5.7.3.4";
+
+/*
+ * 1.3.6.1.5.5.7.3.5: IPSec End System
+ *
+ * Defined in RFC 2459
+ */
+static const unsigned char P11_OID_IPSEC_END_SYSTEM =
+	{ 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x05 };
+static const char P11_OID_IPSEC_END_SYSTEM_STR = "1.3.6.1.5.5.7.3.5";
+

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/openssl.asn Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/openssl.asn.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/options.c Added

@@ -0,0 +1,361 @@
+/*
+ * Copyright (c) 2011, Collabora Ltd.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>
+ */
+
+#include "config.h"
+
+#include "buffer.h"
+#include "compat.h"
+#include "debug.h"
+#include "message.h"
+#include "path.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+#include "options.h"
+
+static char
+short_option (int opt)
+{
+	if (isalpha (opt) || isdigit (opt))
+		return (char)opt;
+	return 0;
+}
+
+static const struct option *
+find_option (const struct option *longopts,
+             int opt)
+{
+	int i;
+
+	for (i = 0; longoptsi.name != NULL; i++) {
+		if (longoptsi.val == opt)
+			return longopts + i;
+	}
+
+	return NULL;
+}
+
+void
+p11_tool_usage (const p11_tool_desc *usages,
+                const struct option *longopts)
+{
+	const struct option *longopt;
+	const int indent = 22;
+	const char *long_name;
+	const char *description;
+	const char *next;
+	char short_name;
+	int spaces;
+	int len;
+	int i;
+
+	for (i = 0; usagesi.text != NULL; i++) {
+
+		/* If no option, then this is a heading */
+		if (!usagesi.option) {
+			printf ("%s\n\n", usagesi.text);
+			continue;
+		}
+
+		longopt = find_option (longopts, usagesi.option);
+		long_name = longopt ? longopt->name : NULL;
+		short_name = short_option (usagesi.option);
+		description = usagesi.text;
+
+		if (short_name && long_name)
+			len = printf ("  -%c, --%s", (int)short_name, long_name);
+		else if (long_name)
+			len = printf ("  --%s", long_name);
+		else
+			len = printf ("  -%c", (int)short_name);
+		if (longopt && longopt->has_arg)
+			len += printf ("%s<%s>",
+			               long_name ? "=" : " ",
+			               usagesi.arg ? usagesi.arg : "...");
+		if (len < indent) {
+			spaces = indent - len;
+		} else {
+			printf ("\n");
+			spaces = indent;
+		}
+		while (description) {
+			while (spaces-- > 0)
+				fputc (' ', stdout);
+			next = strchr (description, '\n');
+			if (next) {
+				next += 1;
+				printf ("%.*s", (int)(next - description), description);
+				description = next;
+				spaces = indent;
+			} else {
+				printf ("%s\n", description);
+				break;
+			}
+		}
+
+	}
+}
+
+int
+p11_tool_getopt (int argc,
+                 char *argv,
+                 const struct option *longopts)
+{
+	p11_buffer buf;
+	int ret;
+	char opt;
+	int i;
+
+	if (!p11_buffer_init_null (&buf, 64))
+		return_val_if_reached (-1);
+
+	for (i = 0; longoptsi.name != NULL; i++) {
+		opt = short_option (longoptsi.val);
+		if (opt != 0) {
+			p11_buffer_add (&buf, &opt, 1);
+			assert (longoptsi.has_arg != optional_argument);
+			if (longoptsi.has_arg == required_argument)
+				p11_buffer_add (&buf, ":", 1);
+		}
+	}
+
+	ret = getopt_long (argc, argv, buf.data, longopts, NULL);
+
+	p11_buffer_uninit (&buf);
+
+	return ret;
+}
+
+static void
+command_usage (const p11_tool_command *commands)
+{
+	const char *progname;
+	int i;
+
+	progname = getprogname ();
+	printf (_("usage: %s command <args>...\n"), progname);
+	printf (_("\nCommon %s commands are:\n"), progname);
+	for (i = 0; commandsi.name != NULL; i++) {
+		if (strcmp (commandsi.name, P11_TOOL_FALLBACK) != 0)
+#ifdef ENABLE_NLS
+			printf ("  %-15s  %s\n",
+				commandsi.name,
+				dgettext (PACKAGE_NAME, commandsi.text));
+#else
+			printf ("  %-15s  %s\n",
+				commandsi.name,
+				commandsi.text);
+#endif
+	}
+	printf (_("\nSee '%s <command> --help' for more information\n"), progname);
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/options.h Added

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>
+ */
+
+#ifndef P11_OPTIONS_H_
+#define P11_OPTIONS_H_
+
+#include <getopt.h>
+
+#define P11_TOOL_FALLBACK ""
+
+typedef struct {
+	const char *name;
+	int (*function) (int, char*);
+	const char *text;
+} p11_tool_command;
+
+typedef struct  {
+	int option;
+	const char *text;
+	const char *arg;
+} p11_tool_desc;
+
+int        p11_tool_main              (int argc,
+                                       char *argv,
+                                       const p11_tool_command *commands);
+
+int        p11_tool_getopt            (int argc,
+                                       char *argv,
+                                       const struct option *longopts);
+
+void       p11_tool_usage             (const p11_tool_desc *usages,
+                                       const struct option *longopts);
+
+#endif /* P11_OPTIONS_H_ */

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/path.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/path.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/pem.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/pem.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/persist.c Added

@@ -0,0 +1,859 @@
+/*
+ * Copyright (C) 2013 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@redhat.com>
+ */
+
+#include "config.h"
+
+#include "asn1.h"
+#include "attrs.h"
+#include "constants.h"
+#include "debug.h"
+#include "lexer.h"
+#include "message.h"
+#include "pem.h"
+#include "persist.h"
+#include "pkcs11.h"
+#include "pkcs11i.h"
+#include "pkcs11x.h"
+#include "types.h"
+#include "url.h"
+
+#include "basic.asn.h"
+
+#include <libtasn1.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+#define PERSIST_HEADER "p11-kit-object-v1"
+
+struct _p11_persist {
+	p11_dict *constants;
+	asn1_node asn1_defs;
+};
+
+bool
+p11_persist_magic (const unsigned char *data,
+                   size_t length)
+{
+	return (strnstr ((char *)data, "" PERSIST_HEADER "", length) != NULL);
+}
+
+bool
+p11_persist_is_generated (const unsigned char *data,
+			  size_t length)
+{
+	static const char comment =
+		"# This file has been auto-generated and written by p11-kit.";
+	return length >= sizeof (comment) - 1 &&
+		memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0;
+}
+
+p11_persist *
+p11_persist_new (void)
+{
+	p11_persist *persist;
+
+	persist = calloc (1, sizeof (p11_persist));
+	return_val_if_fail (persist != NULL, NULL);
+
+	persist->constants = p11_constant_reverse (true);
+	if (persist->constants == NULL) {
+		free (persist);
+		return_val_if_reached (NULL);
+	}
+
+	return persist;
+}
+
+void
+p11_persist_free (p11_persist *persist)
+{
+	if (!persist)
+		return;
+	p11_dict_free (persist->constants);
+	asn1_delete_structure (&persist->asn1_defs);
+	free (persist);
+}
+
+struct constant {
+	CK_ULONG value;
+	const char *string;
+};
+
+static bool
+parse_string (p11_lexer *lexer,
+              CK_ATTRIBUTE *attr)
+{
+	const char *value;
+	const char *end;
+	size_t length;
+	unsigned char *data;
+
+	value = lexer->tok.field.value;
+	end = value + strlen (value);
+
+	/* Not a string/binary value */
+	if (value == end || value0 != '\"' || *(end - 1) != '\"')
+		return false;
+
+	/* Note that we don't skip whitespace when decoding, as you might in other URLs */
+	data = p11_url_decode (value + 1, end - 1, "", &length);
+	if (data == NULL) {
+		p11_lexer_msg(lexer, "bad encoding of attribute value");
+		return false;
+	}
+
+	attr->pValue = data;
+	attr->ulValueLen = length;
+	return true;
+}
+
+static void
+format_string (CK_ATTRIBUTE *attr,
+               p11_buffer *buf)
+{
+	const unsigned char *value;
+
+	assert (attr->ulValueLen != CK_UNAVAILABLE_INFORMATION);
+
+	p11_buffer_add (buf, "\"", 1);
+	value = attr->pValue;
+	p11_url_encode (value, value + attr->ulValueLen, P11_URL_VERBATIM " ", buf);
+	p11_buffer_add (buf, "\"", 1);
+}
+
+static bool
+parse_bool (p11_lexer *lexer,
+            CK_ATTRIBUTE *attr)
+{
+	const char *value = lexer->tok.field.value;
+	CK_BBOOL boolean;
+
+	if (strcmp (value, "true") == 0) {
+		boolean = CK_TRUE;
+
+	} else if (strcmp (value, "false") == 0) {
+		boolean = CK_FALSE;
+
+	} else {
+		/* Not a valid boolean value */
+		return false;
+	}
+
+	attr->pValue = memdup (&boolean, sizeof (boolean));
+	return_val_if_fail (attr != NULL, FALSE);
+	attr->ulValueLen = sizeof (boolean);
+	return true;
+}
+
+static bool
+format_bool (CK_ATTRIBUTE *attr,
+             p11_buffer *buf)
+{
+	const CK_BBOOL *value;
+
+	if (attr->ulValueLen != sizeof (CK_BBOOL))
+		return false;
+
+	switch (attr->type) {
+	case CKA_TOKEN:
+	case CKA_PRIVATE:

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/persist.h Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/pkcs11.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/pkcs11.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/pkix.asn Added

@@ -0,0 +1,544 @@
+
+PKIX1 { }
+
+DEFINITIONS IMPLICIT TAGS ::=
+
+BEGIN
+
+-- This contains both PKIX1Implicit88 and RFC2630 ASN.1 modules.
+
+id-pkix  OBJECT IDENTIFIER  ::=
+         { iso(1) identified-organization(3) dod(6) internet(1)
+                    security(5) mechanisms(5) pkix(7) }
+
+-- ISO arc for standard certificate and CRL extensions
+
+-- authority key identifier OID and syntax
+
+AuthorityKeyIdentifier ::= SEQUENCE {
+      keyIdentifier             0 KeyIdentifier            OPTIONAL,
+      authorityCertIssuer       1 GeneralNames             OPTIONAL,
+      authorityCertSerialNumber 2 CertificateSerialNumber  OPTIONAL }
+    -- authorityCertIssuer and authorityCertSerialNumber shall both
+    -- be present or both be absgent
+
+KeyIdentifier ::= OCTET STRING
+
+-- subject key identifier OID and syntax
+
+SubjectKeyIdentifier ::= KeyIdentifier
+
+-- key usage extension OID and syntax
+
+KeyUsage ::= BIT STRING
+
+-- Directory string type --
+
+DirectoryString ::= CHOICE {
+      teletexString             TeletexString (SIZE (1..MAX)),
+      printableString           PrintableString (SIZE (1..MAX)),
+      universalString           UniversalString (SIZE (1..MAX)),
+      utf8String              UTF8String (SIZE (1..MAX)),
+      bmpString               BMPString (SIZE(1..MAX)),
+      -- IA5String is added here to handle old UID encoded as ia5String --
+      -- See tests/userid/ for more information.  It shouldn't be here, --
+      -- so if it causes problems, considering dropping it. --
+      ia5String               IA5String (SIZE(1..MAX)) }
+
+SubjectAltName ::= GeneralNames
+
+GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
+
+GeneralName ::= CHOICE {
+     otherName                       0     AnotherName,
+     rfc822Name                      1     IA5String,
+     dNSName                         2     IA5String,
+     x400Address                     3     ANY,
+-- Changed to work with the libtasn1 parser.
+     directoryName                   4     EXPLICIT RDNSequence, --Name,
+     ediPartyName                    5     ANY, --EDIPartyName replaced by ANY to save memory
+     uniformResourceIdentifier       6     IA5String,
+     iPAddress                       7     OCTET STRING,
+     registeredID                    8     OBJECT IDENTIFIER }
+
+-- AnotherName replaces OTHER-NAME ::= TYPE-IDENTIFIER, as
+-- TYPE-IDENTIFIER is not supported in the '88 ASN.1 syntax
+
+AnotherName ::= SEQUENCE {
+     type-id    OBJECT IDENTIFIER,
+     value      0 EXPLICIT ANY DEFINED BY type-id }
+
+-- issuer alternative name extension OID and syntax
+
+IssuerAltName ::= GeneralNames
+
+-- basic constraints extension OID and syntax
+
+BasicConstraints ::= SEQUENCE {
+     cA                      BOOLEAN DEFAULT FALSE,
+     pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
+
+-- CRL distribution points extension OID and syntax
+
+CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
+
+DistributionPoint ::= SEQUENCE {
+     distributionPoint       0     EXPLICIT DistributionPointName OPTIONAL,
+     reasons                 1     ReasonFlags OPTIONAL,
+     cRLIssuer               2     GeneralNames OPTIONAL
+}
+
+DistributionPointName ::= CHOICE {
+    fullName                0     GeneralNames,
+    nameRelativeToCRLIssuer 1     RelativeDistinguishedName
+}
+
+ReasonFlags ::= BIT STRING
+
+-- extended key usage extension OID and syntax
+
+ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
+
+KeyPurposeId ::= OBJECT IDENTIFIER
+
+-- CRL number extension OID and syntax
+
+CRLNumber ::= INTEGER (0..MAX)
+
+-- certificate issuer CRL entry extension OID and syntax
+
+CertificateIssuer ::= GeneralNames
+
+-- attribute data types --
+
+Attribute       ::=     SEQUENCE {
+        type            AttributeType,
+        values  SET OF AttributeValue
+                -- at least one value is required --
+}
+
+AttributeType           ::=   OBJECT IDENTIFIER
+
+AttributeValue          ::=   ANY DEFINED BY type
+
+AttributeTypeAndValue           ::=     SEQUENCE {
+        type    AttributeType,
+        value   AttributeValue }
+
+-- suggested naming attributes: Definition of the following
+--  information object set may be augmented to meet local
+--  requirements.  Note that deleting members of the set may
+--  prevent interoperability with conforming implementations.
+--  presented in pairs: the AttributeType followed by the
+--  type definition for the corresponding AttributeValue
+
+-- Arc for standard naming attributes
+id-at           OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4}
+
+-- Attributes of type NameDirectoryString
+
+-- gnutls: Note that the Object ID (id-at*) is being set just before the
+-- actual definition. This is done in order for asn1_find_structure_from_oid
+-- to work (locate structure from OID).
+-- Maybe this is inefficient and memory consuming. Should we replace with
+-- a table that maps OIDs to structures?
+
+PostalAddress ::= SEQUENCE OF DirectoryString
+
+ -- Legacy attributes
+
+emailAddress AttributeType      ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 1 }
+
+Pkcs9email ::= IA5String (SIZE (1..ub-emailaddress-length))
+
+-- naming data types --
+
+Name            ::=   CHOICE { -- only one possibility for now --
+                                 rdnSequence  RDNSequence }
+
+RDNSequence     ::=   SEQUENCE OF RelativeDistinguishedName
+
+DistinguishedName       ::=   RDNSequence
+
+RelativeDistinguishedName  ::=
+                    SET SIZE (1 .. MAX) OF AttributeTypeAndValue
+
+
+
+-- --------------------------------------------------------
+-- certificate and CRL specific structures begin here
+-- --------------------------------------------------------
+
+Certificate  ::=  SEQUENCE  {
+     tbsCertificate       TBSCertificate,
+     signatureAlgorithm   AlgorithmIdentifier,
+     signature            BIT STRING  }
+
+TBSCertificate  ::=  SEQUENCE  {
+     version         0  EXPLICIT Version DEFAULT v1,
+     serialNumber         CertificateSerialNumber,
+     signature            AlgorithmIdentifier,
+     issuer               Name,
+     validity             Validity,
+     subject              Name,
+     subjectPublicKeyInfo SubjectPublicKeyInfo,
+     issuerUniqueID  1  IMPLICIT UniqueIdentifier OPTIONAL,
+                          -- If present, version shall be v2 or v3
+     subjectUniqueID 2  IMPLICIT UniqueIdentifier OPTIONAL,
+                          -- If present, version shall be v2 or v3
+     extensions      3  EXPLICIT Extensions OPTIONAL
+                          -- If present, version shall be v3 --
+}
+
+Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+
+CertificateSerialNumber  ::=  INTEGER
+
+Validity ::= SEQUENCE {
+     notBefore      Time,
+     notAfter       Time }

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/pkix.asn.h Added

@@ -0,0 +1,392 @@
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <libtasn1.h>
+
+const asn1_static_node pkix_asn1_tab = {
+  { "PKIX1", 536875024, NULL },
+  { NULL, 1073741836, NULL },
+  { "id-pkix", 1879048204, NULL },
+  { "iso", 1073741825, "1"},
+  { "identified-organization", 1073741825, "3"},
+  { "dod", 1073741825, "6"},
+  { "internet", 1073741825, "1"},
+  { "security", 1073741825, "5"},
+  { "mechanisms", 1073741825, "5"},
+  { "pkix", 1, "7"},
+  { "AuthorityKeyIdentifier", 1610612741, NULL },
+  { "keyIdentifier", 1610637314, "KeyIdentifier"},
+  { NULL, 4104, "0"},
+  { "authorityCertIssuer", 1610637314, "GeneralNames"},
+  { NULL, 4104, "1"},
+  { "authorityCertSerialNumber", 536895490, "CertificateSerialNumber"},
+  { NULL, 4104, "2"},
+  { "KeyIdentifier", 1073741831, NULL },
+  { "SubjectKeyIdentifier", 1073741826, "KeyIdentifier"},
+  { "KeyUsage", 1073741830, NULL },
+  { "DirectoryString", 1610612754, NULL },
+  { "teletexString", 1612709918, NULL },
+  { "MAX", 524298, "1"},
+  { "printableString", 1612709919, NULL },
+  { "MAX", 524298, "1"},
+  { "universalString", 1612709920, NULL },
+  { "MAX", 524298, "1"},
+  { "utf8String", 1612709922, NULL },
+  { "MAX", 524298, "1"},
+  { "bmpString", 1612709921, NULL },
+  { "MAX", 524298, "1"},
+  { "ia5String", 538968093, NULL },
+  { "MAX", 524298, "1"},
+  { "SubjectAltName", 1073741826, "GeneralNames"},
+  { "GeneralNames", 1612709899, NULL },
+  { "MAX", 1074266122, "1"},
+  { NULL, 2, "GeneralName"},
+  { "GeneralName", 1610612754, NULL },
+  { "otherName", 1610620930, "AnotherName"},
+  { NULL, 4104, "0"},
+  { "rfc822Name", 1610620957, NULL },
+  { NULL, 4104, "1"},
+  { "dNSName", 1610620957, NULL },
+  { NULL, 4104, "2"},
+  { "x400Address", 1610620941, NULL },
+  { NULL, 4104, "3"},
+  { "directoryName", 1610620930, "RDNSequence"},
+  { NULL, 2056, "4"},
+  { "ediPartyName", 1610620941, NULL },
+  { NULL, 4104, "5"},
+  { "uniformResourceIdentifier", 1610620957, NULL },
+  { NULL, 4104, "6"},
+  { "iPAddress", 1610620935, NULL },
+  { NULL, 4104, "7"},
+  { "registeredID", 536879116, NULL },
+  { NULL, 4104, "8"},
+  { "AnotherName", 1610612741, NULL },
+  { "type-id", 1073741836, NULL },
+  { "value", 541073421, NULL },
+  { NULL, 1073743880, "0"},
+  { "type-id", 1, NULL },
+  { "IssuerAltName", 1073741826, "GeneralNames"},
+  { "BasicConstraints", 1610612741, NULL },
+  { "cA", 1610645508, NULL },
+  { NULL, 131081, NULL },
+  { "pathLenConstraint", 16387, NULL },
+  { "CRLDistributionPoints", 1612709899, NULL },
+  { "MAX", 1074266122, "1"},
+  { NULL, 2, "DistributionPoint"},
+  { "DistributionPoint", 1610612741, NULL },
+  { "distributionPoint", 1610637314, "DistributionPointName"},
+  { NULL, 2056, "0"},
+  { "reasons", 1610637314, "ReasonFlags"},
+  { NULL, 4104, "1"},
+  { "cRLIssuer", 536895490, "GeneralNames"},
+  { NULL, 4104, "2"},
+  { "DistributionPointName", 1610612754, NULL },
+  { "fullName", 1610620930, "GeneralNames"},
+  { NULL, 4104, "0"},
+  { "nameRelativeToCRLIssuer", 536879106, "RelativeDistinguishedName"},
+  { NULL, 4104, "1"},
+  { "ReasonFlags", 1073741830, NULL },
+  { "ExtKeyUsageSyntax", 1612709899, NULL },
+  { "MAX", 1074266122, "1"},
+  { NULL, 2, "KeyPurposeId"},
+  { "KeyPurposeId", 1073741836, NULL },
+  { "CRLNumber", 1073741827, NULL },
+  { "CertificateIssuer", 1073741826, "GeneralNames"},
+  { "Attribute", 1610612741, NULL },
+  { "type", 1073741826, "AttributeType"},
+  { "values", 536870927, NULL },
+  { NULL, 2, "AttributeValue"},
+  { "AttributeType", 1073741836, NULL },
+  { "AttributeValue", 1614807053, NULL },
+  { "type", 1, NULL },
+  { "AttributeTypeAndValue", 1610612741, NULL },
+  { "type", 1073741826, "AttributeType"},
+  { "value", 2, "AttributeValue"},
+  { "id-at", 1879048204, NULL },
+  { "joint-iso-ccitt", 1073741825, "2"},
+  { "ds", 1073741825, "5"},
+  { NULL, 1, "4"},
+  { "PostalAddress", 1610612747, NULL },
+  { NULL, 2, "DirectoryString"},
+  { "emailAddress", 1880096780, "AttributeType"},
+  { "iso", 1073741825, "1"},
+  { "member-body", 1073741825, "2"},
+  { "us", 1073741825, "840"},
+  { "rsadsi", 1073741825, "113549"},
+  { "pkcs", 1073741825, "1"},
+  { NULL, 1073741825, "9"},
+  { NULL, 1, "1"},
+  { "Pkcs9email", 1612709917, NULL },
+  { "ub-emailaddress-length", 524298, "1"},
+  { "Name", 1610612754, NULL },
+  { "rdnSequence", 2, "RDNSequence"},
+  { "RDNSequence", 1610612747, NULL },
+  { NULL, 2, "RelativeDistinguishedName"},
+  { "DistinguishedName", 1073741826, "RDNSequence"},
+  { "RelativeDistinguishedName", 1612709903, NULL },
+  { "MAX", 1074266122, "1"},
+  { NULL, 2, "AttributeTypeAndValue"},
+  { "Certificate", 1610612741, NULL },
+  { "tbsCertificate", 1073741826, "TBSCertificate"},
+  { "signatureAlgorithm", 1073741826, "AlgorithmIdentifier"},
+  { "signature", 6, NULL },
+  { "TBSCertificate", 1610612741, NULL },
+  { "version", 1610653698, "Version"},
+  { NULL, 1073741833, "v1"},
+  { NULL, 2056, "0"},
+  { "serialNumber", 1073741826, "CertificateSerialNumber"},
+  { "signature", 1073741826, "AlgorithmIdentifier"},
+  { "issuer", 1073741826, "Name"},
+  { "validity", 1073741826, "Validity"},
+  { "subject", 1073741826, "Name"},
+  { "subjectPublicKeyInfo", 1073741826, "SubjectPublicKeyInfo"},
+  { "issuerUniqueID", 1610637314, "UniqueIdentifier"},
+  { NULL, 4104, "1"},
+  { "subjectUniqueID", 1610637314, "UniqueIdentifier"},
+  { NULL, 4104, "2"},
+  { "extensions", 536895490, "Extensions"},
+  { NULL, 2056, "3"},
+  { "Version", 1610874883, NULL },
+  { "v1", 1073741825, "0"},
+  { "v2", 1073741825, "1"},
+  { "v3", 1, "2"},
+  { "CertificateSerialNumber", 1073741827, NULL },
+  { "Validity", 1610612741, NULL },
+  { "notBefore", 1073741826, "Time"},
+  { "notAfter", 2, "Time"},
+  { "Time", 1610612754, NULL },
+  { "utcTime", 1073741860, NULL },
+  { "generalTime", 37, NULL },
+  { "UniqueIdentifier", 1073741830, NULL },
+  { "SubjectPublicKeyInfo", 1610612741, NULL },
+  { "algorithm", 1073741826, "AlgorithmIdentifier"},
+  { "subjectPublicKey", 6, NULL },
+  { "Extensions", 1612709899, NULL },
+  { "MAX", 1074266122, "1"},
+  { NULL, 2, "Extension"},
+  { "Extension", 1610612741, NULL },
+  { "extnID", 1073741836, NULL },
+  { "critical", 1610645508, NULL },
+  { NULL, 131081, NULL },
+  { "extnValue", 7, NULL },
+  { "CertificateList", 1610612741, NULL },
+  { "tbsCertList", 1073741826, "TBSCertList"},
+  { "signatureAlgorithm", 1073741826, "AlgorithmIdentifier"},
+  { "signature", 6, NULL },
+  { "TBSCertList", 1610612741, NULL },
+  { "version", 1073758210, "Version"},
+  { "signature", 1073741826, "AlgorithmIdentifier"},
+  { "issuer", 1073741826, "Name"},
+  { "thisUpdate", 1073741826, "Time"},
+  { "nextUpdate", 1073758210, "Time"},
+  { "revokedCertificates", 1610629131, NULL },
+  { NULL, 536870917, NULL },
+  { "userCertificate", 1073741826, "CertificateSerialNumber"},
+  { "revocationDate", 1073741826, "Time"},
+  { "crlEntryExtensions", 16386, "Extensions"},
+  { "crlExtensions", 536895490, "Extensions"},
+  { NULL, 2056, "0"},
+  { "AlgorithmIdentifier", 1610612741, NULL },
+  { "algorithm", 1073741836, NULL },
+  { "parameters", 541081613, NULL },
+  { "algorithm", 1, NULL },
+  { "Dss-Sig-Value", 1610612741, NULL },
+  { "r", 1073741827, NULL },
+  { "s", 3, NULL },
+  { "DomainParameters", 1610612741, NULL },
+  { "p", 1073741827, NULL },
+  { "g", 1073741827, NULL },

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/print.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/print.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/readpassphrase.c Added

@@ -0,0 +1,208 @@
+/*	$OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $	*/
+
+/*
+ * Copyright (c) 2000-2002, 2007, 2010
+ *	Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+#include "compat.h"
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <pwd.h>
+#include <signal.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#ifndef TCSASOFT
+#define TCSASOFT 0
+#endif
+
+#ifndef _NSIG
+#if defined(NSIG)
+#define _NSIG NSIG
+#else
+/* The SIGRTMAX define might be set to a function such as sysconf(). */
+#define _NSIG (SIGRTMAX + 1)
+#endif
+#endif
+
+static volatile sig_atomic_t signo_NSIG;
+
+static void handler(int);
+
+char *
+readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
+{
+	ssize_t nr;
+	int input, output, save_errno, i, need_restart;
+	char ch, *p, *end;
+	struct termios term, oterm;
+	struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
+	struct sigaction savetstp, savettin, savettou, savepipe;
+
+	/* I suppose we could alloc on demand in this case (XXX). */
+	if (bufsiz == 0) {
+		errno = EINVAL;
+		return(NULL);
+	}
+
+restart:
+	for (i = 0; i < _NSIG; i++)
+		signoi = 0;
+	nr = -1;
+	save_errno = 0;
+	need_restart = 0;
+	/*
+	 * Read and write to /dev/tty if available.  If not, read from
+	 * stdin and write to stderr unless a tty is required.
+	 */
+	if ((flags & RPP_STDIN) ||
+	    (input = output = open(_PATH_TTY, O_RDWR)) == -1) {
+		if (flags & RPP_REQUIRE_TTY) {
+			errno = ENOTTY;
+			return(NULL);
+		}
+		input = STDIN_FILENO;
+		output = STDERR_FILENO;
+	}
+
+	/*
+	 * Turn off echo if possible.
+	 * If we are using a tty but are not the foreground pgrp this will
+	 * generate SIGTTOU, so do it *before* installing the signal handlers.
+	 */
+	if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
+		memcpy(&term, &oterm, sizeof(term));
+		if (!(flags & RPP_ECHO_ON))
+			term.c_lflag &= ~(ECHO | ECHONL);
+#ifdef VSTATUS
+		if (term.c_ccVSTATUS != _POSIX_VDISABLE)
+			term.c_ccVSTATUS = _POSIX_VDISABLE;
+#endif
+		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
+	} else {
+		memset(&term, 0, sizeof(term));
+		term.c_lflag |= ECHO;
+		memset(&oterm, 0, sizeof(oterm));
+		oterm.c_lflag |= ECHO;
+	}
+
+	/*
+	 * Catch signals that would otherwise cause the user to end
+	 * up with echo turned off in the shell.  Don't worry about
+	 * things like SIGXCPU and SIGVTALRM for now.
+	 */
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;		/* don't restart system calls */
+	sa.sa_handler = handler;
+	(void)sigaction(SIGALRM, &sa, &savealrm);
+	(void)sigaction(SIGHUP, &sa, &savehup);
+	(void)sigaction(SIGINT, &sa, &saveint);
+	(void)sigaction(SIGPIPE, &sa, &savepipe);
+	(void)sigaction(SIGQUIT, &sa, &savequit);
+	(void)sigaction(SIGTERM, &sa, &saveterm);
+	(void)sigaction(SIGTSTP, &sa, &savetstp);
+	(void)sigaction(SIGTTIN, &sa, &savettin);
+	(void)sigaction(SIGTTOU, &sa, &savettou);
+
+	if (!(flags & RPP_STDIN))
+		(void)write(output, prompt, strlen(prompt));
+	end = buf + bufsiz - 1;
+	p = buf;
+	while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
+		if (p < end) {
+			if ((flags & RPP_SEVENBIT))
+				ch &= 0x7f;
+			if (isalpha((unsigned char)ch)) {
+				if ((flags & RPP_FORCELOWER))
+					ch = (char)tolower((unsigned char)ch);
+				if ((flags & RPP_FORCEUPPER))
+					ch = (char)toupper((unsigned char)ch);
+			}
+			*p++ = ch;
+		}
+	}
+	*p = '\0';
+	save_errno = errno;
+	if (!(term.c_lflag & ECHO))
+		(void)write(output, "\n", 1);
+
+	/* Restore old terminal settings and signals. */
+	if (memcmp(&term, &oterm, sizeof(term)) != 0) {
+		const int sigttou = signoSIGTTOU;
+
+		/* Ignore SIGTTOU generated when we are not the fg pgrp. */
+		while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
+		    errno == EINTR && !signoSIGTTOU)
+			continue;
+		signoSIGTTOU = sigttou;
+	}
+	(void)sigaction(SIGALRM, &savealrm, NULL);
+	(void)sigaction(SIGHUP, &savehup, NULL);
+	(void)sigaction(SIGINT, &saveint, NULL);
+	(void)sigaction(SIGQUIT, &savequit, NULL);
+	(void)sigaction(SIGPIPE, &savepipe, NULL);
+	(void)sigaction(SIGTERM, &saveterm, NULL);
+	(void)sigaction(SIGTSTP, &savetstp, NULL);
+	(void)sigaction(SIGTTIN, &savettin, NULL);
+	(void)sigaction(SIGTTOU, &savettou, NULL);
+	if (input != STDIN_FILENO)
+		(void)close(input);
+
+	/*
+	 * If we were interrupted by a signal, resend it to ourselves
+	 * now that we have restored the signal handlers.
+	 */
+	for (i = 0; i < _NSIG; i++) {
+		if (signoi) {
+			kill(getpid(), i);
+			switch (i) {
+			case SIGTSTP:
+			case SIGTTIN:
+			case SIGTTOU:
+				need_restart = 1;
+			}
+		}
+	}
+	if (need_restart)
+		goto restart;
+
+	if (save_errno)
+		errno = save_errno;
+	return(nr == -1 ? NULL : buf);
+}
+
+#if 0
+char *
+getpass(const char *prompt)
+{
+	static char buf_PASSWORD_LEN + 1;
+

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-asn1.c Added

@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2012 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@gnome.org>
+ */
+
+#include "config.h"
+#include "test.h"
+
+#include "asn1.h"
+#include "debug.h"
+#include "oid.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+struct {
+	p11_dict *asn1_defs;
+} test;
+
+static void
+setup (void *unused)
+{
+	test.asn1_defs = p11_asn1_defs_load ();
+	assert_ptr_not_null (test.asn1_defs);
+}
+
+static void
+teardown (void *unused)
+{
+	p11_dict_free (test.asn1_defs);
+	memset (&test, 0, sizeof (test));
+}
+
+static void
+test_tlv_length (void)
+{
+	struct {
+		const char *der;
+		size_t der_len;
+		int expected;
+	} tlv_lengths = {
+		{ "\x01\x01\x00", 3, 3 },
+		{ "\x01\x01\x00\x01\x02", 5, 3 },
+		{ "\x01\x05\x00", 3, -1 },
+		{ NULL }
+	};
+
+	int length;
+	int i;
+
+	for (i = 0; tlv_lengthsi.der != NULL; i++) {
+		length = p11_asn1_tlv_length ((const unsigned char *)tlv_lengthsi.der, tlv_lengthsi.der_len);
+		assert_num_eq (tlv_lengthsi.expected, length);
+	}
+}
+
+static const unsigned char test_eku_server_and_client = {
+	0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06,
+	0x01, 0x05, 0x05, 0x07, 0x03, 0x02,
+};
+
+static void
+test_asn1_cache (void)
+{
+	p11_asn1_cache *cache;
+	p11_dict *defs;
+	asn1_node asn;
+	asn1_node check;
+
+	cache = p11_asn1_cache_new ();
+	assert_ptr_not_null (cache);
+
+	defs = p11_asn1_cache_defs (cache);
+	assert_ptr_not_null (defs);
+
+	asn = p11_asn1_decode (defs, "PKIX1.ExtKeyUsageSyntax",
+	                       test_eku_server_and_client,
+	                       sizeof (test_eku_server_and_client), NULL);
+	assert_ptr_not_null (defs);
+
+	/* Place the parsed data in the cache */
+	p11_asn1_cache_take (cache, asn, "PKIX1.ExtKeyUsageSyntax",
+	                     test_eku_server_and_client,
+	                     sizeof (test_eku_server_and_client));
+
+	/* Get it back out */
+	check = p11_asn1_cache_get (cache, "PKIX1.ExtKeyUsageSyntax",
+	                            test_eku_server_and_client,
+	                            sizeof (test_eku_server_and_client));
+	assert_ptr_eq (asn, check);
+
+	/* Flush should remove it */
+	p11_asn1_cache_flush (cache);
+	check = p11_asn1_cache_get (cache, "PKIX1.ExtKeyUsageSyntax",
+	                            test_eku_server_and_client,
+	                            sizeof (test_eku_server_and_client));
+	assert_ptr_eq (NULL, check);
+
+	p11_asn1_cache_free (cache);
+}
+
+static void
+test_asn1_free (void)
+{
+	p11_dict *defs;
+	asn1_node asn;
+
+	defs = p11_asn1_defs_load ();
+	assert_ptr_not_null (defs);
+
+	asn = p11_asn1_decode (defs, "PKIX1.ExtKeyUsageSyntax",
+	                       test_eku_server_and_client,
+	                       sizeof (test_eku_server_and_client), NULL);
+	assert_ptr_not_null (asn);
+
+	p11_asn1_free (asn);
+	p11_asn1_free (NULL);
+	p11_dict_free (defs);
+}
+
+int
+main (int argc,
+      char *argv)
+{
+	p11_fixture (setup, teardown);
+	p11_test (test_tlv_length, "/asn1/tlv_length");
+
+	p11_fixture (NULL, NULL);
+	p11_test (test_asn1_cache, "/asn1/asn1_cache");
+	p11_test (test_asn1_free, "/asn1/free");
+
+	return p11_test_run (argc, argv);
+}

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/test-attrs.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-attrs.c Changed

@@ -72,7 +72,18 @@
 		{ CKA_INVALID },
 	};
 
+	CK_ATTRIBUTE temp = {
+		{ CKA_LABEL, "label", 5 },
+		{ CKA_ENCRYPT, &vtrue, sizeof (vtrue) },
+	};
+
+	CK_ATTRIBUTE wrapped_attrs = {
+		{ CKA_WRAP_TEMPLATE, &temp, sizeof (temp) },
+		{ CKA_INVALID },
+        };
+
 	assert_num_eq (2, p11_attrs_count (attrs));
+	assert_num_eq (1, p11_attrs_count (wrapped_attrs));
 	assert_num_eq (0, p11_attrs_count (NULL));
 	assert_num_eq (0, p11_attrs_count (empty));
 }
@@ -262,6 +273,7 @@
 	assert_ptr_not_null (attrs);
 	assert_num_eq (attrs->type, CKA_WRAP_TEMPLATE);
 	assert_num_eq (attrs->ulValueLen, sizeof (template));
+	assert_ptr_cmp (attrs->pValue, !=, template);
 	array = attrs->pValue;
 	/* Check that the CKA_LOCAL attribute has been copied, but
 	 * still has the same value */
@@ -279,6 +291,43 @@
 }
 
 static void
+test_build_recursive_null (void)
+{
+	CK_BBOOL vtrue = CK_TRUE;
+	CK_ATTRIBUTE template = {
+		{ CKA_LABEL, NULL, (CK_ULONG)-1 },
+		{ CKA_LOCAL, &vtrue, sizeof (vtrue) },
+	};
+	CK_ATTRIBUTE add = { CKA_WRAP_TEMPLATE, template, sizeof (template) };
+	CK_ATTRIBUTE *attrs;
+	CK_ATTRIBUTE *array;
+
+	attrs = p11_attrs_build (NULL, &add, NULL);
+
+	/* Test the first attribute */
+	assert_ptr_not_null (attrs);
+	assert_num_eq (attrs->type, CKA_WRAP_TEMPLATE);
+	assert_num_eq (attrs->ulValueLen, sizeof (template));
+	assert_ptr_cmp (attrs->pValue, !=, template);
+
+	array = attrs->pValue;
+
+	/* Check that the CKA_LABEL attribute has been copied */
+	assert_num_eq (array0.type, CKA_LABEL);
+	assert_num_eq (array0.ulValueLen, (CK_ULONG)-1);
+	assert_ptr_eq (array0.pValue, NULL);
+
+	/* Check that the CKA_LOCAL attribute has been copied, but
+	 * still has the same value */
+	assert_num_eq (array1.type, CKA_LOCAL);
+	assert_num_eq (array1.ulValueLen, sizeof (vtrue));
+	assert_ptr_cmp (array1.pValue, !=, &vtrue);
+	assert_num_eq (*(CK_BBOOL *)array1.pValue, vtrue);
+
+	p11_attrs_free (attrs);
+}
+
+static void
 test_dup (void)
 {
 	CK_ATTRIBUTE *attrs;
@@ -307,6 +356,52 @@
 }
 
 static void
+test_dup_recursive (void)
+{
+	CK_BBOOL vtrue = CK_TRUE;
+	CK_ATTRIBUTE *attrs, *array;
+	CK_ATTRIBUTE template = {
+		{ CKA_LOCAL, &vtrue, sizeof (vtrue) },
+		{ CKA_LABEL, "label", 5 },
+	};
+	CK_ATTRIBUTE original = {
+		{ CKA_WRAP_TEMPLATE, template, sizeof (template) },
+		{ CKA_LABEL, "yay", 3 },
+		{ CKA_INVALID },
+	};
+
+	attrs = p11_attrs_dup (original);
+	assert_ptr_not_null (attrs);
+
+	/* Test the first attribute */
+	assert (attrs0.type == CKA_WRAP_TEMPLATE);
+	assert_num_eq (attrs0.ulValueLen, sizeof (template));
+	assert_ptr_cmp (attrs0.pValue, !=, template);
+
+	array = attrs0.pValue;
+
+	/* Test the first template attribute */
+	assert (array0.type == CKA_LOCAL);
+	assert_num_eq (array0.ulValueLen, sizeof (vtrue));
+	assert_ptr_cmp (array0.pValue, !=, &vtrue);
+	assert_num_eq (*(CK_BBOOL *)array0.pValue, vtrue);
+
+	/* Test the second template attribute */
+	assert (array1.type == CKA_LABEL);
+	assert_num_eq (array1.ulValueLen, 5);
+	assert (memcmp (array1.pValue, "label", 5) == 0);
+
+	/* Test the second attribute */
+	assert (attrs1.type == CKA_LABEL);
+	assert_num_eq (attrs1.ulValueLen, 3);
+	assert (memcmp (attrs1.pValue, "yay", 3) == 0);
+
+	assert (attrs2.type == CKA_INVALID);
+
+	p11_attrs_free (attrs);
+}
+
+static void
 test_take (void)
 {
 	CK_ATTRIBUTE initial = {
@@ -340,6 +435,62 @@
 	p11_attrs_free (attrs);
 }
 
+static void
+test_take_recursive (void)
+{
+	CK_ATTRIBUTE *attrs, *array, *template;
+	CK_ATTRIBUTE initial_template = {
+		{ CKA_LABEL, "yay", 3 },
+	};
+	CK_ATTRIBUTE initial = {
+		{ CKA_WRAP_TEMPLATE, initial_template, sizeof (initial_template) },
+		{ CKA_VALUE, "nine", 4 },
+	};
+
+	template = malloc (2 * sizeof (CK_ATTRIBUTE));
+	assert_ptr_not_null (template);
+	template0.type = CKA_LOCAL;
+	template0.ulValueLen = sizeof (CK_BBOOL);
+	template0.pValue = malloc (template0.ulValueLen);
+	assert_ptr_not_null (template0.pValue);
+	*(CK_BBOOL *)(template0.pValue) = CK_TRUE;
+	template1.type = CKA_LABEL;
+	template1.ulValueLen = 5;
+	template1.pValue = malloc (template1.ulValueLen);
+	assert_ptr_not_null (template1.pValue);
+	memcpy (template1.pValue, "label", 5);
+
+	attrs = p11_attrs_buildn (NULL, initial, 2);
+	attrs = p11_attrs_take (attrs, CKA_WRAP_TEMPLATE, template, 2 * sizeof (CK_ATTRIBUTE));
+	attrs = p11_attrs_take (attrs, CKA_TOKEN, strdup ("\x01"), 1);
+	assert_ptr_not_null (attrs);
+
+	assert (attrs0.type == CKA_WRAP_TEMPLATE);
+	assert_num_eq (attrs0.ulValueLen, 2 * sizeof (CK_ATTRIBUTE));
+	assert_ptr_not_null (attrs0.pValue);
+
+	array = attrs0.pValue;
+
+	assert (array0.type == CKA_LOCAL);
+	assert_num_eq (array0.ulValueLen, sizeof (CK_BBOOL));
+	assert (*(CK_BBOOL *)(array0.pValue) == CK_TRUE);
+
+	assert (array1.type == CKA_LABEL);
+	assert_num_eq (array1.ulValueLen, 5);
+	assert (memcmp (array1.pValue, "label", 5) == 0);
+
+	assert (attrs1.type == CKA_VALUE);
+	assert_num_eq (4, attrs1.ulValueLen);
+	assert (memcmp (attrs1.pValue, "nine", 4) == 0);
+
+	assert (attrs2.type == CKA_TOKEN);
+	assert_num_eq (1, attrs2.ulValueLen);
+	assert (memcmp (attrs2.pValue, "\x01", 1) == 0);
+
+	assert (attrs3.type == CKA_INVALID);
+
+	p11_attrs_free (attrs);
+}
 
 static void
 test_merge_replace (void)
@@ -441,6 +592,118 @@
 }
 
 static void
+test_merge_replace_recursive (void)
+{
+	CK_ATTRIBUTE temp1 = {
+		{ CKA_VALUE, "nine", 4 },
+	};
+	CK_ATTRIBUTE initial = {
+		{ CKA_WRAP_TEMPLATE, temp1, sizeof (temp1) },
+		{ CKA_VALUE, "nine", 4 },
+	};

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/test-constants.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-constants.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/test-hash.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-hash.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-hex.c Added

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2024, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "hex.h"
+#include "test.h"
+
+static void
+assert_encode_eq (const char *out,
+		  const char *in,
+		  size_t in_len)
+{
+	char *hex = hex_encode ((const unsigned char *)in, in_len);
+	assert_str_eq (out, hex);
+	free (hex);
+}
+
+static void
+assert_decode_eq (const char *out,
+		  size_t out_len,
+		  const char *in)
+{
+	size_t bin_len = 0;
+	char *bin = (char *)hex_decode (in, &bin_len);
+	assert_mem_eq (out, out_len, bin, bin_len);
+	free (bin);
+}
+
+static void
+assert_decode_fail (const char *in)
+{
+	size_t i;
+	assert_ptr_eq (NULL, hex_decode (in, &i));
+}
+
+static void
+test_encode (void)
+{
+	assert_encode_eq ("", "", 0);
+	assert_encode_eq ("3a", "\x3a", 1);
+	assert_encode_eq ("3a:bc:f6:9a", "\x3a\xbc\xf6\x9a", 4);
+}
+
+static void
+test_decode (void)
+{
+	assert_decode_eq ("\x3a", 1, "3a");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3abcf69a");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3AbCf69a");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3ABCF69A");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3a:bc:f6:9a");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3a:Bc:F6:9A");
+	assert_decode_eq ("\x3a\xbc\xf6\x9a", 4, "3a:bc:f6:9a");
+	assert_decode_fail ("");
+	assert_decode_fail ("3");
+	assert_decode_fail (":a");
+	assert_decode_fail ("a:");
+	assert_decode_fail ("3ab");
+	assert_decode_fail ("3a:");
+	assert_decode_fail (":3a");
+	assert_decode_fail ("3a:b");
+	assert_decode_fail ("3:ab");
+	assert_decode_fail ("3a:bc:f6::9a");
+	assert_decode_fail ("3a:bc:f69a");
+	assert_decode_fail ("3a:bc:f6::9");
+	assert_decode_fail ("3a:bc:f69aa");
+	assert_decode_fail ("3a$bc:f6:9a");
+	assert_decode_fail ("3a:bc:f6$9a");
+}
+
+int
+main (int argc,
+      char *argv)
+{
+	p11_test (test_encode, "/hex/encode");
+	p11_test (test_decode, "/hex/decode");
+	return p11_test_run (argc, argv);
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-init.sh.in Added

@@ -0,0 +1,106 @@
+#!/bin/sh
+
+set -euf
+
+# -----------------------------------------------------------------------------
+# Basic fundamentals
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+libdir=@libdir@
+libexecdir=@libexecdir@
+privatedir=@privatedir@
+with_trust_paths=@with_trust_paths@
+script=$(basename $0)
+
+# -----------------------------------------------------------------------------
+# Testing
+
+warning()
+{
+	echo "$script: $@" >&2
+}
+
+assert_fail()
+{
+	warning $@
+	exit 1
+}
+
+assert_contains()
+{
+	if ! grep -qF "$2" "$1"; then
+		assert_fail "$1 does not contain $2"
+	fi
+}
+
+assert_not_contains()
+{
+	if grep -qF "$2" "$1"; then
+		assert_fail "$1 contains $2"
+	fi
+}
+
+teardown()
+{
+	:
+}
+
+teardown_dirty()
+{
+	echo "not ok $TEST_NUMBER $TEST_NAME"
+	teardown
+}
+
+skip()
+{
+	TEST_SKIP=yes
+	echo "ok $TEST_NUMBER # skip $TEST_NAME: $@"
+}
+
+setup()
+{
+	:
+}
+
+run()
+{
+	TOTAL=0
+	for TEST_NAME in $@; do
+		TOTAL=$(expr $TOTAL + 1)
+	done
+
+	echo "1..$TOTAL"
+
+	TEST_NUMBER=0
+	for TEST_NAME in $@; do
+		TEST_NUMBER=$(expr $TEST_NUMBER + 1)
+		(
+			trap teardown_dirty EXIT
+			trap "teardown_dirty; exit 127" INT TERM
+			TD=""
+
+			PATH="$exec_prefix/bin:$PATH"
+			export PATH
+
+			PKG_CONFIG_PATH="$libdir/pkgconfig:$datadir/pkgconfig"
+			export PKG_CONFIG_PATH
+
+			TEST_SKIP=no
+			setup
+
+			if  $TEST_SKIP != "yes" ; then
+				$TEST_NAME
+			fi
+			if  $TEST_SKIP != "yes" ; then
+				echo "ok $TEST_NUMBER $TEST_NAME"
+			fi
+
+			trap - EXIT
+			teardown
+		)
+	done
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/test-oid.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/test.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/test.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/common/test.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/common/test.h Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/common/types.h Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/config.h.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/config.h.in Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/configure -> _service:tar_scm:p11-kit-0.25.5.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for p11-kit 0.25.0.
+# Generated by GNU Autoconf 2.71 for p11-kit 0.25.5.
 #
 # Report bugs to <https://github.com/p11-glue/p11-kit/issues>.
 #
@@ -621,8 +621,8 @@
 # Identity of this package.
 PACKAGE_NAME='p11-kit'
 PACKAGE_TARNAME='p11-kit'
-PACKAGE_VERSION='0.25.0'
-PACKAGE_STRING='p11-kit 0.25.0'
+PACKAGE_VERSION='0.25.5'
+PACKAGE_STRING='p11-kit 0.25.5'
 PACKAGE_BUGREPORT='https://github.com/p11-glue/p11-kit/issues'
 PACKAGE_URL='https://p11-glue.github.io/p11-glue/p11-kit.html'
 
@@ -674,6 +674,9 @@
 privatedir
 p11_shlext
 SHLEXT
+PACKAGE_MICRO
+PACKAGE_MINOR
+PACKAGE_MAJOR
 P11KIT_LT_RELEASE
 WITH_COVERAGE_FALSE
 WITH_COVERAGE_TRUE
@@ -718,8 +721,14 @@
 p11_system_config_modules
 p11_system_config_file
 p11_system_config
+NEED_READPASSPHRASE_FALSE
+NEED_READPASSPHRASE_TRUE
+LIBBSD_LIBS
+LIBBSD_CFLAGS
 OS_WIN32_FALSE
 OS_WIN32_TRUE
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -737,6 +746,16 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+CASTXML
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_PLATFORM
+PYTHON_VERSION
+PYTHON
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -879,6 +898,9 @@
 with_sysroot
 enable_libtool_lock
 enable_ld_version_script
+with_python_sys_prefix
+with_python_prefix
+with_python_exec_prefix
 enable_nls
 enable_rpath
 with_libiconv_prefix
@@ -919,6 +941,9 @@
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+PYTHON
+LIBBSD_CFLAGS
+LIBBSD_LIBS
 LIBTASN1_CFLAGS
 LIBTASN1_LIBS
 LIBFFI_CFLAGS
@@ -1475,7 +1500,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures p11-kit 0.25.0 to adapt to many kinds of systems.
+\`configure' configures p11-kit 0.25.5 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1546,7 +1571,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of p11-kit 0.25.0:";;
+     short | recursive ) echo "Configuration of p11-kit 0.25.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1598,6 +1623,11 @@
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-python-sys-prefix
+                          use Python's sys.prefix and sys.exec_prefix values
+  --with-python_prefix    override the default PYTHON_PREFIX
+  --with-python_exec_prefix
+                          override the default PYTHON_EXEC_PREFIX
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1642,6 +1672,10 @@
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  PYTHON      the Python interpreter
+  LIBBSD_CFLAGS
+              C compiler flags for LIBBSD, overriding pkg-config
+  LIBBSD_LIBS linker flags for LIBBSD, overriding pkg-config
   LIBTASN1_CFLAGS
               C compiler flags for LIBTASN1, overriding pkg-config
   LIBTASN1_LIBS
@@ -1726,7 +1760,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-p11-kit configure 0.25.0
+p11-kit configure 0.25.5
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2383,7 +2417,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by p11-kit $as_me 0.25.0, which was
+It was created by p11-kit $as_me 0.25.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3149,9 +3183,9 @@
 #   +1    :     0    :  0   == removed an interface. Breaks old apps.
 #    ?    :    +1    :  ?   == internal changes that doesn't break anything.
 
-P11KIT_CURRENT=3
-P11KIT_REVISION=0
-P11KIT_AGE=3
+P11KIT_CURRENT=4
+P11KIT_REVISION=1
+P11KIT_AGE=4
 
 # ------------------------------------------------------------------------------
 # p11-kit RPC protocol versions
@@ -3680,7 +3714,7 @@
 
 # Define the identity of the package.
  PACKAGE='p11-kit'
- VERSION='0.25.0'
+ VERSION='0.25.5'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -14769,6 +14803,405 @@
 	fi
 fi
 
+
+
+
+
+
+        if test -n "$PYTHON"; then
+      # If the user set $PYTHON, use it and don't search something else.
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.6" >&5
+printf %s "checking whether $PYTHON version is >= 3.6... " >&6; }
+      prog="import sys
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '3.6'.split('.'))) + 0, 0, 0
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minveri
+sys.exit(sys.hexversion < minverhex)"
+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
+   ($PYTHON -c "$prog") >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+			       as_fn_error $? "Python interpreter is too old" "$LINENO" 5
+fi
+      am_display_PYTHON=$PYTHON
+    else
+      # Otherwise, try each interpreter until we find one that satisfies

_service:tar_scm:p11-kit-0.25.0.tar.xz/configure.ac -> _service:tar_scm:p11-kit-0.25.5.tar.xz/configure.ac Changed

@@ -1,7 +1,7 @@
 AC_PREREQ(2.61)
 
 AC_INIT(p11-kit,
-	0.25.0,
+	0.25.5,
 	https://github.com/p11-glue/p11-kit/issues,
 	p11-kit,
 	https://p11-glue.github.io/p11-glue/p11-kit.html)
@@ -13,9 +13,9 @@
 #   +1    :     0    :  0   == removed an interface. Breaks old apps.
 #    ?    :    +1    :  ?   == internal changes that doesn't break anything.
 
-P11KIT_CURRENT=3
-P11KIT_REVISION=0
-P11KIT_AGE=3
+P11KIT_CURRENT=4
+P11KIT_REVISION=1
+P11KIT_AGE=4
 
 # ------------------------------------------------------------------------------
 # p11-kit RPC protocol versions
@@ -63,6 +63,8 @@
 AC_PROG_CPP
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
+AM_PATH_PYTHON(3.6,, :)
+AM_MISSING_PROG(CASTXML, castxml)
 
 LINGUAS=""
 AM_GNU_GETTEXT(external, need-ngettext)
@@ -82,6 +84,12 @@
 		os_win32=yes
 		os_unix=no
 		;;
+	*-*-linux*)
+		AC_DEFINE_UNQUOTED(OS_UNIX, 1, Building for unix)
+		os_win32=no
+		os_unix=yes
+		os_linux=yes
+		;;
 	*)
 		AC_DEFINE_UNQUOTED(OS_UNIX, 1, Building for unix)
 		os_win32=no
@@ -93,6 +101,15 @@
 
 AC_C_BIGENDIAN
 
+case "$host_os" in
+kfreebsd*-gnu | gnu*)
+	PKG_CHECK_MODULES(LIBBSD, libbsd-overlay, 
+			   CFLAGS="$CFLAGS $LIBBSD_CFLAGS"
+			   LIBS="$LIBS $LIBBSD_LIBS"
+			   , AC_MSG_WARN(libbsd-overlay not found but probably needed))
+;;
+esac
+
 # ------------------------------------------------------------------------------
 # Checks for libraries and headers
 
@@ -133,7 +150,11 @@
 	AC_CHECK_HEADERS(sys/resource.h sys/un.h ucred.h)
 	AC_CHECK_MEMBERS(struct dirent.d_type,,,#include <dirent.h>)
 	AC_CHECK_FUNCS(getprogname getexecname basename mkstemp mkdtemp)
-	AC_CHECK_FUNCS(getauxval getresuid secure_getenv)
+	AC_CHECK_FUNCS(getresuid secure_getenv)
+	if test "$os_linux" = "yes"; then
+		# Use getauxval on Linux only.
+		AC_CHECK_FUNCS(getauxval)
+	fi
 	AC_CHECK_FUNCS(strnstr memdup strndup)
 	AC_CHECK_FUNCS(reallocarray)
 	AC_CHECK_DECLS(reallocarray, , , #include <stdlib.h>)
@@ -143,22 +164,19 @@
 	AC_CHECK_FUNCS(getpeerucred)
 	AC_CHECK_FUNCS(issetugid)
 	AC_CHECK_FUNCS(isatty)
+	AC_CHECK_FUNCS(readpassphrase)
+	AM_CONDITIONAL(NEED_READPASSPHRASE, test "$ac_cv_func_readpassphrase" != "yes")
 
 	AC_CHECK_FUNC(
 		strerror_r,
-		AC_RUN_IFELSE(
-			AC_LANG_SOURCE(
-				#include <errno.h>
-				#include <string.h>
-
-				int main (void)
-				{
-					char buf32;
-					return strerror_r (EINVAL, buf, 32);
-				}
-			),
-                        AC_DEFINE(HAVE_XSI_STRERROR_R, 1, Whether XSI-compliant strerror_r() is available),
+		AC_COMPILE_IFELSE(
+			AC_LANG_PROGRAM(#include <errno.h>
+					   #include <string.h>,
+					 /* GNU strerror_r returns char *, XSI returns int */
+					    char buf32;
+					    return *strerror_r (EINVAL, buf, 32);),
 			AC_DEFINE(HAVE_GNU_STRERROR_R, 1, Whether GNU-specific strerror_r() is available),
+                        AC_DEFINE(HAVE_XSI_STRERROR_R, 1, Whether XSI-compliant strerror_r() is available),
 			),
 		)
 
@@ -620,11 +638,20 @@
 P11KIT_LT_RELEASE=$P11KIT_CURRENT:$P11KIT_REVISION:$P11KIT_AGE
 AC_SUBST(P11KIT_LT_RELEASE)
 
-echo $PACKAGE_VERSION | tr '.' ' ' | while read major minor unused; do
-	AC_DEFINE_UNQUOTED(PACKAGE_MAJOR, $major, Major version of package)
-	AC_DEFINE_UNQUOTED(PACKAGE_MINOR, $minor, Minor version of package)
-	break
-done
+v=$PACKAGE_VERSION
+PACKAGE_MAJOR=${v%%\.*}
+v=${v#$PACKAGE_MAJOR\.}
+PACKAGE_MINOR=${v%%\.*}
+v=${v#$PACKAGE_MINOR\.}
+PACKAGE_MICRO=${v%%\.*}
+
+AC_SUBST(PACKAGE_MAJOR)
+AC_SUBST(PACKAGE_MINOR)
+AC_SUBST(PACKAGE_MICRO)
+
+AC_DEFINE_UNQUOTED(PACKAGE_MAJOR, $PACKAGE_MAJOR, Major version of package)
+AC_DEFINE_UNQUOTED(PACKAGE_MINOR, $PACKAGE_MINOR, Minor version of package)
+AC_DEFINE_UNQUOTED(PACKAGE_MICRO, $PACKAGE_MICRO, Micro version of package)
 
 case "$host" in
 *-*-darwin*)
@@ -687,12 +714,13 @@
 
 
 AC_CONFIG_FILES(Makefile
+	common/test-init.sh
 	doc/Makefile
 	doc/manual/Makefile
 	po/Makefile.in
 	p11-kit/p11-kit-1.pc
 	p11-kit/pkcs11.conf.example
-	trust/test-init.sh
+	p11-kit/version.h
 )
 AC_OUTPUT

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/Makefile.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/Makefile.in Changed

@@ -89,7 +89,8 @@
 host_triplet = @host@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/build-to-host.m4 \
+	$(top_srcdir)/build/m4/gettext.m4 \
 	$(top_srcdir)/build/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/build/m4/iconv.m4 \
 	$(top_srcdir)/build/m4/intlmacosx.m4 \
@@ -200,6 +201,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CASTXML = @CASTXML@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -244,6 +246,8 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_Z_NODELETE = @LDFLAGS_Z_NODELETE@
+LIBBSD_CFLAGS = @LIBBSD_CFLAGS@
+LIBBSD_LIBS = @LIBBSD_LIBS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
 LIBICONV = @LIBICONV@
@@ -277,6 +281,9 @@
 P11KIT_LT_RELEASE = @P11KIT_LT_RELEASE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR = @PACKAGE_MAJOR@
+PACKAGE_MICRO = @PACKAGE_MICRO@
+PACKAGE_MINOR = @PACKAGE_MINOR@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -287,6 +294,11 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -337,6 +349,8 @@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -351,10 +365,14 @@
 p11_user_config_file = @p11_user_config_file@
 p11_user_config_modules = @p11_user_config_modules@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 privatedir = @privatedir@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/Makefile.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/Makefile.in Changed

@@ -95,7 +95,8 @@
 host_triplet = @host@
 subdir = doc/manual
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/build-to-host.m4 \
+	$(top_srcdir)/build/m4/gettext.m4 \
 	$(top_srcdir)/build/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/build/m4/iconv.m4 \
 	$(top_srcdir)/build/m4/intlmacosx.m4 \
@@ -183,6 +184,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CASTXML = @CASTXML@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -227,6 +229,8 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_Z_NODELETE = @LDFLAGS_Z_NODELETE@
+LIBBSD_CFLAGS = @LIBBSD_CFLAGS@
+LIBBSD_LIBS = @LIBBSD_LIBS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
 LIBICONV = @LIBICONV@
@@ -260,6 +264,9 @@
 P11KIT_LT_RELEASE = @P11KIT_LT_RELEASE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_MAJOR = @PACKAGE_MAJOR@
+PACKAGE_MICRO = @PACKAGE_MICRO@
+PACKAGE_MINOR = @PACKAGE_MINOR@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -270,6 +277,11 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -320,6 +332,8 @@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -334,10 +348,14 @@
 p11_user_config_file = @p11_user_config_file@
 p11_user_config_modules = @p11_user_config_modules@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 privatedir = @privatedir@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/html/index.html -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/html/index.html Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/html/p11-kit-Future.html -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/html/p11-kit-Future.html Changed

@@ -897,7 +897,7 @@
 <a name="p11-kit-iter-get-attributes"></a><h3>p11_kit_iter_get_attributes ()</h3>
 <pre class="programlisting"><span class="returnvalue">CK_RV</span>
 p11_kit_iter_get_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
-                             <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *templ</code></em>,
                              <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
 <p>Get attributes for the current matching object.</p>
 <p>This calls <code class="literal">C_GetAttributeValue</code> for the object
@@ -922,7 +922,7 @@
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>template</p></td>
+<td class="parameter_name"><p>templ</p></td>
 <td class="parameter_description"><p>the attributes to get. </p></td>
 <td class="parameter_annotations"><span class="annotation"><acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym></span></td>
 </tr>
@@ -944,7 +944,7 @@
 <a name="p11-kit-iter-load-attributes"></a><h3>p11_kit_iter_load_attributes ()</h3>
 <pre class="programlisting"><span class="returnvalue">CK_RV</span>
 p11_kit_iter_load_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
-                              <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
+                              <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *templ</code></em>,
                               <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
 <p>Retrieve attributes for the current matching object.</p>
 <p>Each attribute in the array will be filled in with the value
@@ -977,7 +977,7 @@
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>template</p></td>
+<td class="parameter_name"><p>templ</p></td>
 <td class="parameter_description"><p>the attributes to load. </p></td>
 <td class="parameter_annotations"><span class="annotation"><acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym></span></td>
 </tr>
@@ -1246,6 +1246,14 @@
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-SESSION:CAPS"></a>P11_KIT_ITER_KIND_SESSION</p></td>
+<td class="enum_member_description">
+<p>The iterator is pointing to a token with an
+active session.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
 <td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-UNKNOWN:CAPS"></a>P11_KIT_ITER_KIND_UNKNOWN</p></td>
 <td class="enum_member_description">
 <p>The iterator doesn't point to anything.</p>
@@ -1313,6 +1321,19 @@
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-LOGIN:CAPS"></a>P11_KIT_ITER_WITH_LOGIN</p></td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-SESSIONS:CAPS"></a>P11_KIT_ITER_WITH_SESSIONS</p></td>
+<td class="enum_member_description">
+<p>Stop at each token while iterating (after
+opening a session).</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/html/p11-kit-PIN-Callbacks.html -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/html/p11-kit-PIN-Callbacks.html Changed

@@ -219,7 +219,7 @@
 <span class="w">                             </span><span class="k">const</span><span class="w"> </span><span class="kt">char</span><span class="w"> </span><span class="o">*</span><span class="n">pin_description</span><span class="p">,</span><span class="w"> </span><span class="n">P11KitPinFlags</span><span class="w"> </span><span class="n">pin_flags</span><span class="p">,</span>
 <span class="w">                             </span><span class="kt">void</span><span class="w"> </span><span class="o">*</span><span class="n">callback_data</span><span class="p">)</span>
 <span class="p">{</span>
-<span class="w">    </span><span class="k">return</span><span class="w"> </span><span class="n">p11_kit_pin_new_from_string</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;pin-value&quot;</span><span class="p">);</span>
+<span class="w">    </span><span class="k">return</span><span class="w"> </span><span class="n">p11_kit_pin_new_for_string</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;pin-value&quot;</span><span class="p">);</span>
 <span class="p">}</span>
 
 <span class="n">p11_kit_pin_register_callback</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;my-application&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">my_application_pin_callback</span><span class="p">,</span>

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/html/p11-kit.devhelp2 -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/html/p11-kit.devhelp2 Changed

@@ -195,6 +195,7 @@
     <keyword type="constant" name="P11_KIT_ITER_KIND_SLOT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-SLOT:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_KIND_TOKEN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-TOKEN:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_KIND_OBJECT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-OBJECT:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_SESSION" link="p11-kit-Future.html#P11-KIT-ITER-KIND-SESSION:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_KIND_UNKNOWN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-UNKNOWN:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_BUSY_SESSIONS" link="p11-kit-Future.html#P11-KIT-ITER-BUSY-SESSIONS:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_WANT_WRITABLE" link="p11-kit-Future.html#P11-KIT-ITER-WANT-WRITABLE:CAPS"/>
@@ -202,5 +203,7 @@
     <keyword type="constant" name="P11_KIT_ITER_WITH_SLOTS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-SLOTS:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_WITH_TOKENS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-TOKENS:CAPS"/>
     <keyword type="constant" name="P11_KIT_ITER_WITHOUT_OBJECTS" link="p11-kit-Future.html#P11-KIT-ITER-WITHOUT-OBJECTS:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITH_LOGIN" link="p11-kit-Future.html#P11-KIT-ITER-WITH-LOGIN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITH_SESSIONS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-SESSIONS:CAPS"/>
   </functions>
 </book>

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/html/p11-kit.html -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/html/p11-kit.html Changed

@@ -31,17 +31,19 @@
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
 <div class="cmdsynopsis"><p><code class="command">p11-kit list-modules</code> </p></div>
-<div class="cmdsynopsis"><p><code class="command">p11-kit list-profiles</code>  ...
-	</p></div>
-<div class="cmdsynopsis"><p><code class="command">p11-kit add-profile</code>  ...
-	</p></div>
-<div class="cmdsynopsis"><p><code class="command">p11-kit delete-profile</code>  ...
-	</p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit list-tokens ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit list-objects ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit import-object ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit export-object ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit delete-object ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit generate-keypair ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit list-profiles ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit add-profile ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit delete-profile ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit list-mechanisms ...</code> </p></div>
 <div class="cmdsynopsis"><p><code class="command">p11-kit print-config</code> </p></div>
-<div class="cmdsynopsis"><p><code class="command">p11-kit extract</code>  ...
-	</p></div>
-<div class="cmdsynopsis"><p><code class="command">p11-kit server</code>  ...
-	</p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit extract ...</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit server ...</code> </p></div>
 </div>
 <div class="refsect1">
 <a name="p11-kit-description"></a><h2>Description</h2>
@@ -79,30 +81,370 @@
 	the PKCS#11 modules will be displayed.</p>
 </div>
 <div class="refsect1">
+<a name="p11-kit-list-tokens"></a><h2>List Tokens</h2>
+<p>List all tokens available in system configured PKCS#11 modules.</p>
+<pre class="programlisting">
+$ p11-kit list-tokens pkcs11:token
+</pre>
+<p>This retrieves all tokens and displays some of their
+	common attributes.</p>
+<p>This subcommand takes the following options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--only-uris</code></span></p></td>
+<td><p>Print only the matching token URIs.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--provider=&lt;module_path&gt;</code></span></p></td>
+<td>
+<p>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <em class="parameter"><code>module_path</code></em> is a relative path, the module is loaded from the default module path. This path can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_path</strong></span>
+/usr/lib64/pkcs11</pre>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-list-objects"></a><h2>List Objects</h2>
+<p>List objects matching given PKCS#11 URI.</p>
+<pre class="programlisting">
+$ p11-kit list-objects pkcs11:object_on_token
+</pre>
+<p>This retrieves all objects that match given PKCS#11 URI and displays
+        some of their common attributes. Storage objects also have their PKCS#11 URI
+        displayed.</p>
+<p>This subcommand takes the following options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--login</code></span></p></td>
+<td><p>Authenticate to the token before enumerating objects. The PIN value is read from either the <code class="literal">pin-value</code> attribute in the URI or from the terminal.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--provider=&lt;module_path&gt;</code></span></p></td>
+<td>
+<p>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <em class="parameter"><code>module_path</code></em> is a relative path, the module is loaded from the default module path. This path can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_path</strong></span>
+/usr/lib64/pkcs11</pre>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-import-object"></a><h2>Import Object</h2>
+<p>Import object into PKCS#11 token.</p>
+<pre class="programlisting">
+$ p11-kit import-object --file=file.pem --label=label --id=object_id pkcs11:token
+</pre>
+<p>Takes either an X.509 certificate or a public key in the form of a PEM file
+	and imports it into the first token matched by given PKCS#11 URI.</p>
+<p>The following options are required:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody><tr>
+<td><p><span class="term"><code class="option">--file=&lt;file.pem&gt;</code></span></p></td>
+<td><p>File containing either an X.509 certificate
+			or a public key in PEM format.</p></td>
+</tr></tbody>
+</table></div>
+<p>This subcommand also accepts the following options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--label=&lt;label&gt;</code></span></p></td>
+<td><p>Assigns label to the imported object.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--id=&lt;object_id&gt;</code></span></p></td>
+<td><p>Assigns ID to the imported object. The ID should be specified in hexadecimal format without '0x' prefix.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--login</code></span></p></td>
+<td><p>Authenticate to the token before enumerating objects. The PIN value is read from either the <code class="literal">pin-value</code> attribute in the URI or from the terminal.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--provider=&lt;module_path&gt;</code></span></p></td>
+<td>
+<p>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <em class="parameter"><code>module_path</code></em> is a relative path, the module is loaded from the default module path. This path can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_path</strong></span>
+/usr/lib64/pkcs11</pre>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-export-object"></a><h2>Export Object</h2>
+<p>Export object matching PKCS#11 URI.</p>
+<pre class="programlisting">
+$ p11-kit export-object pkcs11:object_on_token
+</pre>
+<p>Displays PEM formatted contents of the first object matched by given PKCS#11 URI.
+	The matched object has to either be an X.509 certificate or a public key.</p>
+<p>This subcommand takes the following options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--login</code></span></p></td>
+<td><p>Authenticate to the token before enumerating objects. The PIN value is read from either the <code class="literal">pin-value</code> attribute in the URI or from the terminal.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--provider=&lt;module_path&gt;</code></span></p></td>
+<td>
+<p>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <em class="parameter"><code>module_path</code></em> is a relative path, the module is loaded from the default module path. This path can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_path</strong></span>
+/usr/lib64/pkcs11</pre>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-delete-object"></a><h2>Delete Object</h2>
+<p>Delete object matching PKCS#11 URI.</p>
+<pre class="programlisting">
+$ p11-kit delete-object pkcs11:object_on_token
+</pre>
+<p>Destroys the first object matched by given PKCS#11 URI.</p>
+<p>This subcommand takes the following options:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--login</code></span></p></td>
+<td><p>Authenticate to the token before enumerating objects. The PIN value is read from either the <code class="literal">pin-value</code> attribute in the URI or from the terminal.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--provider=&lt;module_path&gt;</code></span></p></td>
+<td>
+<p>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <em class="parameter"><code>module_path</code></em> is a relative path, the module is loaded from the default module path. This path can be determined by running:</p>

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/meson.build Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/doc/manual/p11-kit.xml -> _service:tar_scm:p11-kit-0.25.5.tar.xz/doc/manual/p11-kit.xml Changed

@@ -33,22 +33,43 @@
 		<command>p11-kit list-modules</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
-		<command>p11-kit list-profiles</command> ...
+		<command>p11-kit list-tokens ...</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
-		<command>p11-kit add-profile</command> ...
+		<command>p11-kit list-objects ...</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
-		<command>p11-kit delete-profile</command> ...
+		<command>p11-kit import-object ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit export-object ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit delete-object ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit generate-keypair ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit list-profiles ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit add-profile ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit delete-profile ...</command>
+	</cmdsynopsis>
+	<cmdsynopsis>
+		<command>p11-kit list-mechanisms ...</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
 		<command>p11-kit print-config</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
-		<command>p11-kit extract</command> ...
+		<command>p11-kit extract ...</command>
 	</cmdsynopsis>
 	<cmdsynopsis>
-		<command>p11-kit server</command> ...
+		<command>p11-kit server ...</command>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -90,6 +111,228 @@
 
 </refsect1>
 
+<refsect1 id="p11-kit-list-tokens">
+	<title>List Tokens</title>
+
+	<para>List all tokens available in system configured PKCS#11 modules.</para>
+
+<programlisting>
+$ p11-kit list-tokens pkcs11:token
+</programlisting>
+
+	<para>This retrieves all tokens and displays some of their
+	common attributes.</para>
+
+	<para>This subcommand takes the following options:</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><option>--only-uris</option></term>
+			<listitem><para>Print only the matching token URIs.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--provider=&lt;module_path&gt;</option></term>
+			<listitem><para>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <parameter>module_path</parameter> is a relative path, the module is loaded from the default module path. This path can be determined by running:</para>
+			<programlisting>
+$ <command>pkg-config p11-kit-1 --variable p11_module_path</command>
+/usr/lib64/pkcs11</programlisting></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1 id="p11-kit-list-objects">
+	<title>List Objects</title>
+
+	<para>List objects matching given PKCS#11 URI.</para>
+
+<programlisting>
+$ p11-kit list-objects pkcs11:object_on_token
+</programlisting>
+
+	<para>This retrieves all objects that match given PKCS#11 URI and displays
+        some of their common attributes. Storage objects also have their PKCS#11 URI
+        displayed.</para>
+
+	<para>This subcommand takes the following options:</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><option>--login</option></term>
+			<listitem><para>Authenticate to the token before enumerating objects. The PIN value is read from either the <literal>pin-value</literal> attribute in the URI or from the terminal.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--provider=&lt;module_path&gt;</option></term>
+			<listitem><para>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <parameter>module_path</parameter> is a relative path, the module is loaded from the default module path. This path can be determined by running:</para>
+			<programlisting>
+$ <command>pkg-config p11-kit-1 --variable p11_module_path</command>
+/usr/lib64/pkcs11</programlisting></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1 id="p11-kit-import-object">
+	<title>Import Object</title>
+
+	<para>Import object into PKCS#11 token.</para>
+
+<programlisting>
+$ p11-kit import-object --file=file.pem &lsqb;--label=label&rsqb; &lsqb;--id=object_id&rsqb; pkcs11:token
+</programlisting>
+
+	<para>Takes either an X.509 certificate or a public key in the form of a PEM file
+	and imports it into the first token matched by given PKCS#11 URI.</para>
+
+	<para>The following options are required:</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><option>--file=&lt;file.pem&gt;</option></term>
+			<listitem><para>File containing either an X.509 certificate
+			or a public key in PEM format.</para></listitem>
+		</varlistentry>
+	</variablelist>
+
+	<para>This subcommand also accepts the following options:</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><option>--label=&lt;label&gt;</option></term>
+			<listitem><para>Assigns label to the imported object.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--id=&lt;object_id&gt;</option></term>
+			<listitem><para>Assigns ID to the imported object. The ID should be specified in hexadecimal format without '0x' prefix.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--login</option></term>
+			<listitem><para>Authenticate to the token before enumerating objects. The PIN value is read from either the <literal>pin-value</literal> attribute in the URI or from the terminal.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--provider=&lt;module_path&gt;</option></term>
+			<listitem><para>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <parameter>module_path</parameter> is a relative path, the module is loaded from the default module path. This path can be determined by running:</para>
+			<programlisting>
+$ <command>pkg-config p11-kit-1 --variable p11_module_path</command>
+/usr/lib64/pkcs11</programlisting></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1 id="p11-kit-export-object">
+	<title>Export Object</title>
+
+	<para>Export object matching PKCS#11 URI.</para>
+
+<programlisting>
+$ p11-kit export-object pkcs11:object_on_token
+</programlisting>
+
+	<para>Displays PEM formatted contents of the first object matched by given PKCS#11 URI.
+	The matched object has to either be an X.509 certificate or a public key.</para>
+
+	<para>This subcommand takes the following options:</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><option>--login</option></term>
+			<listitem><para>Authenticate to the token before enumerating objects. The PIN value is read from either the <literal>pin-value</literal> attribute in the URI or from the terminal.</para></listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><option>--provider=&lt;module_path&gt;</option></term>
+			<listitem><para>Load only the given PKCS#11 module instead of enumerating modules installed on the system. If <parameter>module_path</parameter> is a relative path, the module is loaded from the default module path. This path can be determined by running:</para>
+			<programlisting>
+$ <command>pkg-config p11-kit-1 --variable p11_module_path</command>
+/usr/lib64/pkcs11</programlisting></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1 id="p11-kit-delete-object">
+	<title>Delete Object</title>
+
+	<para>Delete object matching PKCS#11 URI.</para>
+
+<programlisting>
+$ p11-kit delete-object pkcs11:object_on_token
+</programlisting>
+
+	<para>Destroys the first object matched by given PKCS#11 URI.</para>
+
+	<para>This subcommand takes the following options:</para>

_service:tar_scm:p11-kit-0.25.0.tar.xz/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/meson.build Changed

@@ -1,6 +1,6 @@
 project('p11-kit', 'c',
-        version: '0.25.0',
-        meson_version: '>= 0.49')
+        version: '0.25.5',
+        meson_version: '>= 0.51')
 
 version_arr = meson.project_version().split('.')
 major_version = version_arr0.to_int()
@@ -9,9 +9,9 @@
 
 cc = meson.get_compiler('c')
 
-current = 3
-revision = 0
-age = 3
+current = 4
+revision = 1
+age = 4
 
 soversion = current - age
 library_version = '@0@.@1@.@2@'.format(soversion, age, revision)
@@ -29,6 +29,7 @@
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set('PACKAGE_MAJOR', major_version)
 conf.set('PACKAGE_MINOR', minor_version)
+conf.set('PACKAGE_MICRO', micro_version)
 
 host_system = host_machine.system()
 if host_system == 'windows'
@@ -59,13 +60,27 @@
 
 conf.set10('WITH_STRICT', get_option('strict'))
 
+system_deps = 
+
+if 'gnu', 'gnu/kfreebsd'.contains(host_system)
+  libbsd_overlay_dep = dependency('libbsd-overlay')
+  system_deps += libbsd_overlay_dep
+  add_project_dependencies(libbsd_overlay_dep, language: 'c')
+endif
+
 libintl_deps = 
 if get_option('nls') and cc.has_header('libintl.h')
   conf.set('ENABLE_NLS', 1)
-  libintl = dependency('intl', required: false)
+  libintl = cc.find_library('intl', required: false)
   if libintl.found()
     if cc.has_function('dgettext', dependencies : libintl)
-      libintl_deps += libintl
+      libintl_deps += libintl
+      if 'darwin', 'ios'.contains(host_system)
+        appleframeworks = dependency('appleframeworks', modules : 'CoreFoundation')
+        if appleframeworks.found()
+          libintl_deps += appleframeworks
+        endif
+      endif
     endif
   endif
 endif
@@ -170,18 +185,17 @@
   headers = 
     'sys/resource.h',
     'sys/un.h',
-    'ucred.h'
+    'ucred.h',
   
 
   foreach h : headers
-    if cc.has_header(h)
+    if cc.has_header(h, dependencies: system_deps)
       conf.set('HAVE_' + h.underscorify().to_upper(), 1)
     endif
   endforeach
 
   functions = 
     'fdwalk',
-    'getauxval',
     'getexecname',
     'getpeereid',
     'getpeerucred',
@@ -191,12 +205,19 @@
     'issetugid',
     'mkdtemp',
     'mkstemp',
+    'readpassphrase',
     'secure_getenv',
-    'strndup'
+    'strndup',
+    'strnstr'
   
+  if 'linux'.contains(host_system)
+    functions += 
+      'getauxval'
+    
+  endif
 
   foreach f : functions
-    if cc.has_function(f)
+    if cc.has_function(f, dependencies: system_deps)
       conf.set('HAVE_' + f.underscorify().to_upper(), 1)
     endif
   endforeach
@@ -301,20 +322,21 @@
 
 if cc.has_function('strerror_r', prefix: '#include <string.h>')
   strerror_r_code = '''
+#define _GNU_SOURCE
 #include <errno.h>
 #include <string.h>
 
 int main (void)
 {
+    /* GNU strerror_r returns char *, XSI returns int */
     char buf32;
-    return strerror_r (EINVAL, buf, 32);
+    return *strerror_r (EINVAL, buf, 32);
 }
 '''
-  strerror_r_check = cc.run(strerror_r_code, name : 'strerror_r check')
-  if strerror_r_check.returncode() == 0
-    conf.set('HAVE_XSI_STRERROR_R', 1)
-  else
+  if cc.compiles(strerror_r_code, name : 'GNU strerror_r check')
     conf.set('HAVE_GNU_STRERROR_R', 1)
+  else
+    conf.set('HAVE_XSI_STRERROR_R', 1)
   endif
 endif
 
@@ -397,6 +419,7 @@
 # --------------------------------------------------------------------
 # Trust Module
 
+with_asn1 = false
 with_trust_module = false
 libtasn1_deps = 
 libtasn1 = dependency('libtasn1', version: '>= 2.3',
@@ -406,6 +429,7 @@
   if asn1Parser.found()
     conf.set('WITH_ASN1', 1)
     libtasn1_deps += libtasn1
+    with_asn1 = true
     with_trust_module = true
   endif
 endif
@@ -421,7 +445,7 @@
 libsystemd = dependency('libsystemd', required: get_option('systemd'))
 systemd = dependency('systemd', required: get_option('systemd'))
 if libsystemd.found() and systemd.found()
-  systemduserunitdir = systemd.get_pkgconfig_variable('systemduserunitdir')
+  systemduserunitdir = systemd.get_variable(pkgconfig : 'systemduserunitdir')
   conf.set('WITH_SYSTEMD', 1)
   libsystemd_deps += libsystemd
   with_systemd = true
@@ -432,6 +456,16 @@
 gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
+python = import('python').find_installation()
+python_version = python.language_version()
+python_version_req = '>=3.6'
+if not python_version.version_compare(python_version_req)
+  error('Requires Python @0@, @1@ found.'.format(python_version_req, python_version))
+endif
+
+pkcs11_json_project = subproject('pkcs11-json')
+pkcs11_json_gen = pkcs11_json_project.get_variable('pkcs11_json_gen')
+pkcs11_json = pkcs11_json_gen.process('common/pkcs11.h')
 
 subdir('common')
 subdir('p11-kit')

_service:tar_scm:p11-kit-0.25.0.tar.xz/meson_options.txt -> _service:tar_scm:p11-kit-0.25.5.tar.xz/meson_options.txt Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/Makefile.am -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/Makefile.am Changed

@@ -25,44 +25,51 @@
 	p11-kit/rpc-client.c \
 	p11-kit/uri.c \
 	p11-kit/virtual.c p11-kit/virtual.h \
-	p11-kit/virtual-fixed.h \
 	$(inc_HEADERS)
 
-BUILT_SOURCES += \
-	p11-kit/virtual-fixed-generated.h \
+VIRTUAL_GENERATED = \
+	p11-kit/virtual-ffi-generated.h \
+	p11-kit/virtual-fixed-wrappers.h \
+	p11-kit/virtual-fixed-closures.h \
+	p11-kit/virtual-stack-generated.h \
+	p11-kit/virtual-base-generated.h \
 	$(NULL)
 
-p11-kit/virtual.c: p11-kit/virtual-fixed-generated.h
+BUILT_SOURCES += $(VIRTUAL_GENERATED)
 
-CLEANFILES += \
-	p11-kit/virtual-fixed-generated.h \
-	$(NULL)
+p11-kit/virtual.c: $(VIRTUAL_GENERATED)
 
-p11-kit/virtual-fixed-generated.h: Makefile
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  echo; \
-	  counter=0; \
-	  while test $$counter -lt $(closures); do \
-	    echo "P11_VIRTUAL_FIXED_FUNCTIONS($$counter)"; \
-	    counter=`expr $$counter + 1`; \
-	  done; \
-	  echo; \
-	  echo "CK_FUNCTION_LIST_3_0 p11_virtual_fixedP11_VIRTUAL_MAX_FIXED = {"; \
-	  counter=0; \
-	  while test $$counter -lt $(closures); do \
-	    echo "	P11_VIRTUAL_FIXED_INITIALIZER($$counter),"; \
-	    counter=`expr $$counter + 1`; \
-	  done; \
-	  echo '};'; \
-	  echo; \
-	  counter=0; \
-	  while test $$counter -lt $(closures); do \
-	    echo "P11_VIRTUAL_FIXED_GET_FUNCTION_LIST($$counter)"; \
-	    counter=`expr $$counter + 1`; \
-	  done; \
-	} > $@-t && \
-	mv -f $@-t $@
+CLEANFILES += $(VIRTUAL_GENERATED)
+
+p11-kit/virtual-ffi-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/generated/pkcs11.json
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
+		--template $(srcdir)/p11-kit/templates/binding-wrappers.py \
+		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
+		--infile $(srcdir)/subprojects/pkcs11-json/generated/pkcs11.json --outfile $@
+
+p11-kit/virtual-fixed-wrappers.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/generated/pkcs11.json
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
+		--template $(srcdir)/p11-kit/templates/fixed-wrappers.py \
+		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
+		--renames C_GetFunctionStatus:short C_CancelFunction:short \
+		--concat-lines \
+		--infile $(srcdir)/subprojects/pkcs11-json/generated/pkcs11.json --outfile $@
+
+p11-kit/virtual-fixed-closures.h: Makefile p11-kit/gen-fixed-closures.py
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-fixed-closures.py \
+		--closures $(closures) --outfile $@
+
+p11-kit/virtual-stack-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/generated/pkcs11.json
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
+		--template $(srcdir)/p11-kit/templates/stack-wrappers.py \
+		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
+		--infile $(srcdir)/subprojects/pkcs11-json/generated/pkcs11.json --outfile $@
+
+p11-kit/virtual-base-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/generated/pkcs11.json
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
+		--template $(srcdir)/p11-kit/templates/base-wrappers.py \
+		--excludes $(srcdir)/p11-kit/templates/virtual-excludes.list \
+		--infile $(srcdir)/subprojects/pkcs11-json/generated/pkcs11.json --outfile $@
 
 lib_LTLIBRARIES += \
 	libp11-kit.la
@@ -97,6 +104,22 @@
 libp11_kit_la_LDFLAGS += -export-symbols-regex '^C_GetFunctionList|^C_GetInterface|^p11_kit_'
 endif
 
+PROXY_GENERATED = \
+	p11-kit/proxy-generated.h \
+	$(NULL)
+
+BUILT_SOURCES += $(PROXY_GENERATED)
+
+p11-kit/proxy.c: $(PROXY_GENERATED)
+
+CLEANFILES += $(PROXY_GENERATED)
+
+p11-kit/proxy-generated.h: Makefile p11-kit/gen-wrappers.py subprojects/pkcs11-json/generated/pkcs11.json
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/p11-kit/gen-wrappers.py \
+		--template $(srcdir)/p11-kit/templates/proxy-wrappers.py \
+		--excludes $(srcdir)/p11-kit/templates/proxy-excludes.list \
+		--infile $(srcdir)/subprojects/pkcs11-json/generated/pkcs11.json --outfile $@
+
 libp11_kit_la_SOURCES = \
 	p11-kit/proxy.c p11-kit/proxy.h p11-kit/proxy-init.c \
 	p11-kit/rpc-server.c \
@@ -225,7 +248,8 @@
 EXTRA_DIST += \
 	p11-kit/docs.h \
 	p11-kit/gen-pkcs11-gnu.sh \
-	p11-kit/gen-virtual-fixed.sh \
+	p11-kit/gen-wrappers.py \
+	p11-kit/gen-fixed-closures.py \
 	p11-kit/meson.build \
 	p11-kit/meson_post_install.sh \
 	p11-kit/libp11-kit.map \
@@ -236,22 +260,41 @@
 
 bin_PROGRAMS += p11-kit/p11-kit
 
-p11_kit_p11_kit_CFLAGS = $(COMMON_CFLAGS)
-
 p11_kit_p11_kit_SOURCES = \
 	p11-kit/add-profile.c \
+	p11-kit/delete-object.c \
 	p11-kit/delete-profile.c \
+	p11-kit/export-object.c \
+	p11-kit/generate-keypair.c \
+	p11-kit/import-object.c \
+	p11-kit/list-objects.c \
 	p11-kit/list-profiles.c \
+	p11-kit/list-mechanisms.c \
+	p11-kit/list-tokens.c \
 	p11-kit/lists.c \
 	p11-kit/p11-kit.c \
 	p11-kit/print-config.c \
+	p11-kit/tool.c \
+	p11-kit/tool.h \
 	$(NULL)
 
-p11_kit_p11_kit_LDADD = \
+if !OS_WIN32
+p11_kit_p11_kit_SOURCES += p11-kit/tty.c p11-kit/tty.h
+endif
+
+p11_kit_p11_kit_CFLAGS = $(COMMON_CFLAGS)
+p11_kit_p11_kit_LDADD =
+
+if WITH_ASN1
+p11_kit_p11_kit_CFLAGS += $(LIBTASN1_CFLAGS)
+p11_kit_p11_kit_LDADD += libp11-asn1.la $(LIBTASN1_LIBS)
+endif
+
+p11_kit_p11_kit_LDADD += \
 	libp11-kit.la \
 	libp11-kit-internal.la \
-	libp11-tool.la \
 	libp11-common.la \
+	libp11-tool.la \
 	$(LTLIBINTL) \
 	$(NULL)
 
@@ -260,22 +303,24 @@
 endif
 
 check_PROGRAMS += p11-kit/p11-kit-testable
-p11_kit_p11_kit_testable_SOURCES = \
-	p11-kit/add-profile.c \
-	p11-kit/delete-profile.c \
-	p11-kit/list-profiles.c \
-	p11-kit/lists.c \
-	p11-kit/p11-kit.c \
-	p11-kit/print-config.c \
-	$(NULL)
+p11_kit_p11_kit_testable_SOURCES = $(p11_kit_p11_kit_SOURCES)
 
-p11_kit_p11_kit_testable_LDADD = \
-	libp11-tool.la \
+p11_kit_p11_kit_testable_CFLAGS =
+p11_kit_p11_kit_testable_LDADD =
+
+if WITH_ASN1
+p11_kit_p11_kit_testable_CFLAGS += $(LIBTASN1_CFLAGS)
+p11_kit_p11_kit_testable_LDADD += libp11-asn1.la $(LIBTASN1_LIBS)
+endif
+
+p11_kit_p11_kit_testable_LDADD += \
 	libp11-common.la \
+	libp11-tool.la \
 	libp11-kit-testable.la \
 	$(NULL)
 
-p11_kit_p11_kit_testable_CFLAGS = \
+p11_kit_p11_kit_testable_CFLAGS += \
+	-DP11_KIT_TESTABLE \
 	$(COMMON_CFLAGS) \
 	$(NULL)
 
@@ -378,11 +423,24 @@

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/add-profile.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/add-profile.c Changed

@@ -41,11 +41,13 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
+#include "options.h"
 #include "tool.h"
 
 #include <assert.h>
-#include <stdbool.h>
+#include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -58,112 +60,81 @@
 p11_kit_add_profile (int argc,
 		     char *argv);
 
-static bool
-profile_exists (CK_FUNCTION_LIST *module,
-		CK_PROFILE_ID profile)
-{
-	CK_RV rv;
-	P11KitIter *iter = NULL;
-	CK_OBJECT_CLASS klass = CKO_PROFILE;
-	CK_PROFILE_ID profile_id = CKP_INVALID_ID;
-	CK_ATTRIBUTE matching = { CKA_CLASS, &klass, sizeof (klass) };
-	CK_ATTRIBUTE attr = { CKA_PROFILE_ID, &profile_id, sizeof (profile_id) };
-	CK_FUNCTION_LIST *modules = { module, NULL };
-
-	iter = p11_kit_iter_new (NULL, 0);
-	if (iter == NULL) {
-		p11_message (_("failed to initialize iterator"));
-		return false;
-	}
-
-	p11_kit_iter_add_filter (iter, &matching, 1);
-	p11_kit_iter_begin (iter, modules);
-	while ((rv = p11_kit_iter_next (iter)) == CKR_OK) {
-		rv = p11_kit_iter_get_attributes (iter, &attr, 1);
-		if (rv != CKR_OK) {
-			p11_message (_("failed to retrieve attribute of an object"));
-			p11_kit_iter_free (iter);
-			return false;
-		}
-
-		if (profile_id == profile) {
-			p11_kit_iter_free (iter);
-			return true;
-		}
-	}
-	p11_kit_iter_free (iter);
-
-	return false;
-}
-
 static int
-add_profile (const char *token_str,
+add_profile (p11_tool *tool,
 	     CK_PROFILE_ID profile)
 {
 	int ret = 1;
 	CK_RV rv;
+	CK_ULONG count = 0;
 	CK_OBJECT_HANDLE object = 0;
 	CK_SESSION_HANDLE session = 0;
-	CK_FUNCTION_LIST *prev_module = NULL;
 	CK_FUNCTION_LIST *module = NULL;
-	CK_FUNCTION_LIST **modules = NULL;
-	P11KitUri *uri = NULL;
 	P11KitIter *iter = NULL;
+	CK_BBOOL token = CK_TRUE;
 	CK_OBJECT_CLASS klass = CKO_PROFILE;
 	CK_ATTRIBUTE template = {
 	    { CKA_CLASS, &klass, sizeof (klass) },
+	    { CKA_TOKEN, &token, sizeof (token) },
 	    { CKA_PROFILE_ID, &profile, sizeof (profile) }
 	};
 	CK_ULONG template_len = sizeof (template) / sizeof (template0);
 
-	uri = p11_kit_uri_new ();
-	if (uri == NULL) {
-		p11_message (_("failed to allocate memory for URI"));
-		goto cleanup;
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WANT_WRITABLE | P11_KIT_ITER_WITH_SESSIONS | P11_KIT_ITER_WITHOUT_OBJECTS);
+	if (iter == NULL) {
+		p11_message (_("failed to initialize iterator"));
+		return 1;
 	}
 
-	if (p11_kit_uri_parse (token_str, P11_KIT_URI_FOR_TOKEN, uri) != P11_KIT_URI_OK) {
-		p11_message (_("failed to parse the token URI"));
+	rv = p11_kit_iter_next (iter);
+	if (rv != CKR_OK) {
+		if (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	modules = p11_kit_modules_load_and_initialize (0);
-	if (modules == NULL) {
-		p11_message (_("failed to load and initialize modules"));
+	/* Module and session should always be set at this point.  */
+	module = p11_kit_iter_get_module (iter);
+	return_val_if_fail (module != NULL, 1);
+	session = p11_kit_iter_get_session (iter);
+	return_val_if_fail (session != CK_INVALID_HANDLE, 1);
+
+	rv = module->C_FindObjectsInit (session, template, template_len);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to initialize search for objects: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	iter = p11_kit_iter_new (uri, P11_KIT_ITER_WANT_WRITABLE);
-	if (iter == NULL) {
-		p11_message (_("failed to initialize iterator"));
+	rv = module->C_FindObjects (session, &object, 1, &count);
+	if (rv != CKR_OK) {
+		module->C_FindObjectsFinal (session);
+		p11_message (_("failed to search for objects: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	p11_kit_iter_begin (iter, modules);
-	while ((rv = p11_kit_iter_next (iter)) == CKR_OK) {
-		module = p11_kit_iter_get_module (iter);
-		if (module == prev_module || profile_exists (module, profile)) {
-			prev_module = module;
-			continue;
-		}
+	rv = module->C_FindObjectsFinal (session);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to finalize search for objects: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
 
-		session = p11_kit_iter_get_session (iter);
-		rv = module->C_CreateObject (session, template, template_len, &object);
-		if (rv != CKR_OK) {
-			p11_message (_("failed to create the profile object: %s"), p11_kit_strerror (rv));
-			goto cleanup;
-		}
+	if (count != 0) {
+		p11_message (_("profile already exists"));
+		goto cleanup;
+	}
 
-		prev_module = module;
+	rv = module->C_CreateObject (session, template, template_len, &object);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to create profile object: %s"), p11_kit_strerror (rv));
+		goto cleanup;
 	}
 
 	ret = 0;
 
 cleanup:
-	p11_kit_iter_free (iter);
-	p11_kit_modules_finalize (modules);
-	p11_kit_modules_release (modules);
-	p11_kit_uri_free (uri);
+	p11_tool_end_iter (tool, iter);
 
 	return ret;
 }
@@ -175,12 +146,17 @@
 	int opt, ret = 2;
 	CK_ULONG profile = CKA_INVALID;
 	p11_dict *profile_nicks = NULL;
+	bool login = false;
+	p11_tool *tool = NULL;
+	const char *provider = NULL;
 
 	enum {
 		opt_verbose = 'v',
 		opt_quiet = 'q',
 		opt_help = 'h',
 		opt_profile = 'p',
+		opt_login = 'l',
+		opt_provider = CHAR_MAX + 2,
 	};
 
 	struct option options = {
@@ -188,12 +164,16 @@
 		{ "quiet", no_argument, NULL, opt_quiet },
 		{ "help", no_argument, NULL, opt_help },
 		{ "profile", required_argument, NULL, opt_profile },
+		{ "login", no_argument, NULL, opt_login },
+		{ "provider", required_argument, NULL, opt_provider },
 		{ 0 },
 	};
 
 	p11_tool_desc usages = {
 		{ 0, "usage: p11-kit add-profile --profile profile pkcs11:token" },
 		{ opt_profile, "specify the profile to add" },
+		{ opt_login, "login to the token" },

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/conf.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/conf.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/delete-object.c Added

@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include "debug.h"
+#include "iter.h"
+#include "message.h"
+#include "options.h"
+#include "tool.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_delete_object (int argc,
+		       char *argv);
+
+static int
+delete_object (p11_tool *tool)
+{
+	int ret = 1;
+	CK_RV rv;
+	P11KitIter *iter = NULL;
+
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WANT_WRITABLE);
+	if (iter == NULL) {
+		p11_message (_("failed to initialize iterator"));
+		return 1;
+	}
+
+	rv = p11_kit_iter_next (iter);
+	if (rv != CKR_OK) {
+		if (rv == CKR_CANCEL)
+			p11_message (_("no matching object"));
+		else
+			p11_message (_("failed to find object: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	rv = p11_kit_iter_destroy_object (iter);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to destroy an object: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	ret = 0;
+
+cleanup:
+	p11_tool_end_iter (tool, iter);
+
+	return ret;
+}
+
+int
+p11_kit_delete_object (int argc,
+		       char *argv)
+{
+	int opt, ret = 2;
+	bool login = false;
+	p11_tool *tool = NULL;
+	const char *provider = NULL;
+
+	enum {
+		opt_verbose = 'v',
+		opt_quiet = 'q',
+		opt_help = 'h',
+		opt_login = 'l',
+		opt_provider = CHAR_MAX + 2,
+	};
+
+	struct option options = {
+		{ "verbose", no_argument, NULL, opt_verbose },
+		{ "quiet", no_argument, NULL, opt_quiet },
+		{ "help", no_argument, NULL, opt_help },
+		{ "login", no_argument, NULL, opt_login },
+		{ "provider", required_argument, NULL, opt_provider },
+		{ 0 },
+	};
+
+	p11_tool_desc usages = {
+		{ 0, "usage: p11-kit delete-object pkcs11:token" },
+		{ opt_login, "login to the token" },
+		{ opt_provider, "specify the module to use" },
+		{ 0 },
+	};
+
+	while ((opt = p11_tool_getopt (argc, argv, options)) != -1) {
+		switch (opt) {
+		case opt_login:
+			login = true;
+			break;
+		case opt_provider:
+			provider = optarg;
+			break;
+		case opt_verbose:
+			p11_kit_be_loud ();
+			break;
+		case opt_quiet:
+			p11_kit_be_quiet ();
+			break;
+		case opt_help:
+			p11_tool_usage (usages, options);
+			return 0;
+		case '?':
+			return 2;
+		default:
+			assert_not_reached ();
+			break;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 1) {
+		p11_tool_usage (usages, options);
+		return 2;
+	}
+
+	tool = p11_tool_new ();
+	if (!tool) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	if (p11_tool_set_uri (tool, *argv, P11_KIT_URI_FOR_OBJECT_ON_TOKEN) != P11_KIT_URI_OK) {
+		p11_message (_("failed to parse URI"));
+		goto cleanup;
+	}
+
+	if (!p11_tool_set_provider (tool, provider)) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	p11_tool_set_login (tool, login);
+
+	ret = delete_object (tool);
+
+ cleanup:
+	p11_tool_free (tool);
+
+	return ret;
+}

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/delete-profile.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/delete-profile.c Changed

@@ -41,10 +41,13 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
+#include "options.h"
 #include "tool.h"
 
 #include <assert.h>
+#include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -53,70 +56,85 @@
 #define _(x) (x)
 #endif
 
+#define MAX_OBJECTS 4
+
 int
 p11_kit_delete_profile (int argc,
 			char *argv);
 
 static int
-delete_profile (const char *token_str,
+delete_profile (p11_tool *tool,
 		CK_PROFILE_ID profile)
 {
 	int ret = 1;
-	CK_FUNCTION_LIST **modules = NULL;
-	P11KitUri *uri = NULL;
+	CK_RV rv;
+	CK_OBJECT_HANDLE objectsMAX_OBJECTS;
+	CK_ULONG i, count = 0;
+	CK_SESSION_HANDLE session = 0;
+	CK_FUNCTION_LIST *module = NULL;
 	P11KitIter *iter = NULL;
 	CK_OBJECT_CLASS klass = CKO_PROFILE;
-	CK_PROFILE_ID profile_id = CKP_INVALID_ID;
-	CK_ATTRIBUTE matching = { CKA_CLASS, &klass, sizeof (klass) };
-	CK_ATTRIBUTE attr = { CKA_PROFILE_ID, &profile_id, sizeof (profile_id) };
-	CK_RV rv;
+	CK_ATTRIBUTE template = {
+		{ CKA_CLASS, &klass, sizeof (klass) },
+		{ CKA_PROFILE_ID, &profile, sizeof (profile) }
+	};
+	CK_ULONG template_len = sizeof (template) / sizeof (template0);
 
-	uri = p11_kit_uri_new ();
-	if (uri == NULL) {
-		p11_message (_("failed to allocate memory for URI"));
-		goto cleanup;
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WANT_WRITABLE | P11_KIT_ITER_WITH_SESSIONS | P11_KIT_ITER_WITHOUT_OBJECTS);
+	if (iter == NULL) {
+		p11_message (_("failed to initialize iterator"));
+		return 1;
 	}
 
-	if (p11_kit_uri_parse (token_str, P11_KIT_URI_FOR_TOKEN, uri) != P11_KIT_URI_OK) {
-		p11_message (_("failed to parse the token URI"));
+	rv = p11_kit_iter_next (iter);
+	if (rv != CKR_OK) {
+		if (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	modules = p11_kit_modules_load_and_initialize (0);
-	if (modules == NULL) {
-		p11_message (_("failed to load and initialize modules"));
-		goto cleanup;
-	}
+	/* Module and session should always be set at this point.  */
+	module = p11_kit_iter_get_module (iter);
+	return_val_if_fail (module != NULL, 1);
+	session = p11_kit_iter_get_session (iter);
+	return_val_if_fail (session != CK_INVALID_HANDLE, 1);
 
-	iter = p11_kit_iter_new (uri, P11_KIT_ITER_WANT_WRITABLE);
-	if (iter == NULL) {
-		p11_message (_("failed to initialize iterator"));
+	rv = module->C_FindObjectsInit (session, template, template_len);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to initialize search for objects: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	p11_kit_iter_add_filter (iter, &matching, 1);
-	p11_kit_iter_begin (iter, modules);
-	while ((rv = p11_kit_iter_next (iter)) == CKR_OK) {
-		rv = p11_kit_iter_get_attributes (iter, &attr, 1);
+	do {
+		rv = module->C_FindObjects (session, objects, MAX_OBJECTS, &count);
 		if (rv != CKR_OK) {
-			p11_message (_("failed to retrieve attribute of an object"));
+			module->C_FindObjectsFinal (session);
+			p11_message (_("failed to search for objects: %s"), p11_kit_strerror (rv));
 			goto cleanup;
 		}
 
-		if (profile_id == profile) {
-			rv = p11_kit_iter_destroy_object (iter);
-			if (rv != CKR_OK)
-				p11_message (_("failed to delete the profile"));
+		for (i = 0; i < count; ++i) {
+			rv = module->C_DestroyObject (session, objectsi);
+			if (rv != CKR_OK) {
+				module->C_FindObjectsFinal (session);
+				p11_message (_("failed to destroy an object: %s"), p11_kit_strerror (rv));
+				goto cleanup;
+			}
 		}
+	} while (count > 0);
+
+	rv = module->C_FindObjectsFinal (session);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to finalize search for objects: %s"), p11_kit_strerror (rv));
+		goto cleanup;
 	}
 
 	ret = 0;
 
 cleanup:
-	p11_kit_iter_free (iter);
-	p11_kit_modules_finalize (modules);
-	p11_kit_modules_release (modules);
-	p11_kit_uri_free (uri);
+	p11_tool_end_iter (tool, iter);
 
 	return ret;
 }
@@ -128,12 +146,17 @@
 	int opt, ret = 2;
 	CK_ULONG profile = CKA_INVALID;
 	p11_dict *profile_nicks = NULL;
+	bool login = false;
+	p11_tool *tool = NULL;
+	const char *provider = NULL;
 
 	enum {
 		opt_verbose = 'v',
 		opt_quiet = 'q',
 		opt_help = 'h',
 		opt_profile = 'p',
+		opt_login = 'l',
+		opt_provider = CHAR_MAX + 2,
 	};
 
 	struct option options = {
@@ -141,12 +164,16 @@
 		{ "quiet", no_argument, NULL, opt_quiet },
 		{ "help", no_argument, NULL, opt_help },
 		{ "profile", required_argument, NULL, opt_profile },
+		{ "login", no_argument, NULL, opt_login },
+		{ "provider", required_argument, NULL, opt_provider },
 		{ 0 },
 	};
 
 	p11_tool_desc usages = {
 		{ 0, "usage: p11-kit delete-profile --profile profile pkcs11:token" },
 		{ opt_profile, "specify the profile to delete" },
+		{ opt_login, "login to the token" },
+		{ opt_provider, "specify the module to use" },
 		{ 0 },
 	};
 
@@ -182,6 +209,12 @@
 				goto cleanup;
 			}
 			break;
+		case opt_login:
+			login = true;
+			break;
+		case opt_provider:
+			provider = optarg;
+			break;
 		case '?':
 			goto cleanup;
 		default:
@@ -203,9 +236,28 @@
 		goto cleanup;
 	}
 
-	ret = delete_profile (*argv, profile);
+	tool = p11_tool_new ();
+	if (!tool) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	if (p11_tool_set_uri (tool, *argv, P11_KIT_URI_FOR_TOKEN) != P11_KIT_URI_OK) {
+		p11_message (_("failed to parse URI"));
+		goto cleanup;
+	}
+
+	if (!p11_tool_set_provider (tool, provider)) {
+		p11_message (_("failed to allocate memory"));

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/export-object.c Added

@@ -0,0 +1,579 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>, Daiki Ueno <dueno@redhat.com>
+ */
+
+#include "config.h"
+
+#include "attrs.h"
+#include "buffer.h"
+#include "constants.h"
+#define P11_DEBUG_FLAG P11_DEBUG_TOOL
+#include "debug.h"
+#include "iter.h"
+#include "message.h"
+#include "pem.h"
+#include "options.h"
+#include "tool.h"
+
+#ifdef WITH_ASN1
+#include "asn1.h"
+#include "oid.h"
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_export_object (int argc,
+		       char *argv);
+
+#ifdef WITH_ASN1
+
+typedef struct {
+	p11_dict *defs;
+	P11KitIter *iter;
+} ExportData;
+
+static void
+export_data_uninit (ExportData *data)
+{
+	p11_dict_free (data->defs);
+}
+
+static void
+prepend_leading_zero (CK_ATTRIBUTE *attr)
+{
+	if (*((unsigned char *)attr->pValue) & 0x80) {
+		unsigned char *padded;
+
+		return_if_fail (attr->ulValueLen < ULONG_MAX);
+		padded = malloc (attr->ulValueLen + 1);
+		return_if_fail (padded);
+		memcpy (padded + 1, attr->pValue, attr->ulValueLen);
+		*padded = 0x00;
+		free (attr->pValue);
+		attr->pValue = padded;
+		attr->ulValueLen++;
+	}
+}
+
+static unsigned char *
+encode_pubkey_rsa (const ExportData *data,
+		   CK_ATTRIBUTE *attrs,
+		   size_t *len)
+{
+	asn1_node asn = NULL;
+	CK_ATTRIBUTE *modulus, *public_exponent;
+	unsigned char *der = NULL;
+	int result;
+
+	modulus = p11_attrs_find_valid (attrs, CKA_MODULUS);
+	public_exponent = p11_attrs_find_valid (attrs, CKA_PUBLIC_EXPONENT);
+
+	if (!modulus || !public_exponent) {
+		p11_message (_("failed to retrieve attributes"));
+		goto cleanup;
+	}
+
+	asn = p11_asn1_create (data->defs, "PKIX1.RSAPublicKey");
+	if (!asn) {
+		p11_debug ("unable to create RSAPublicKey");
+		return NULL;
+	}
+
+	prepend_leading_zero (modulus);
+	result = asn1_write_value (asn, "modulus", modulus->pValue, modulus->ulValueLen);
+	if (result != ASN1_SUCCESS) {
+		p11_debug ("unable to write modulus");
+		goto cleanup;
+	}
+
+	prepend_leading_zero (public_exponent);
+	result = asn1_write_value (asn, "publicExponent", public_exponent->pValue, public_exponent->ulValueLen);
+	if (result != ASN1_SUCCESS) {
+		p11_debug ("unable to write publicExponent");
+		goto cleanup;
+	}
+
+	der = p11_asn1_encode (asn, len);
+	if (!der) {
+		p11_message ("unable to encode RSAPublicKey");
+		goto cleanup;
+	}
+
+ cleanup:
+	p11_asn1_free (asn);
+	return der;
+}
+
+static unsigned char *
+export_pubkey_rsa (const ExportData *data,
+		   size_t *len)
+{
+	CK_ATTRIBUTE template = {
+		{ CKA_MODULUS, },
+		{ CKA_PUBLIC_EXPONENT, },
+		{ CKA_INVALID },
+	};
+	CK_ATTRIBUTE *attrs = NULL;
+	asn1_node asn = NULL;
+	int result;
+	unsigned char *spk = NULL, *der = NULL;
+	const unsigned char null = { 0x05, 0x00 };
+	size_t n_spk;
+
+	attrs = p11_attrs_buildn (NULL, template, p11_attrs_count (template));
+	if (!attrs) {
+		p11_debug ("unable to build attributes");
+		return NULL;
+	}
+
+	if (p11_kit_iter_load_attributes (data->iter,
+					  attrs,
+					  p11_attrs_count (attrs)) != CKR_OK) {
+		p11_message (_("failed to retrieve attributes"));
+		goto cleanup;
+	}
+
+	asn = p11_asn1_create (data->defs, "PKIX1.SubjectPublicKeyInfo");
+	if (!asn) {
+		p11_debug ("unable to create SubjectPublicKeyInfo");
+		goto cleanup;
+	}
+
+	result = asn1_write_value (asn, "algorithm.algorithm",
+				   P11_OID_PKIX1_RSA_STR, 1);
+	if (result != ASN1_SUCCESS) {
+		p11_debug ("unable to write algorithm OID");
+		goto cleanup;
+	}
+
+	result = asn1_write_value (asn, "algorithm.parameters",
+				   null, sizeof (null));
+	if (result != ASN1_SUCCESS) {
+		p11_debug ("unable to write algorithm parameters");
+		goto cleanup;
+	}
+

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/fixtures/package-modules/fourteen.module Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/fixtures/package-modules/thirteen.module Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/fixtures/package-modules/twelve.module Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/fixtures/package-modules/win32/twelve.module Added

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/frob-setuid.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/frob-setuid.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/gen-fixed-closures.py Added

@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+"""
+SPDX-License-Identifier: BSD-3-Clause
+"""
+
+import sys
+
+INDENT = "        "
+
+
+def write_fixed_instantiate(output, closures):
+    for i in range(closures):
+        output.write(f"P11_VIRTUAL_FIXED_FUNCTIONS({i})\n")
+
+    initializers_concatenated = ",\n".join(
+        f"{INDENT}P11_VIRTUAL_FIXED_INITIALIZER({i})"
+        for i in range(closures)
+    )
+    output.write(f'''
+CK_FUNCTION_LIST_3_0 p11_virtual_fixedP11_VIRTUAL_MAX_FIXED = {{
+{initializers_concatenated}
+}};
+
+''')
+    for i in range(closures):
+        output.write(f"""\
+P11_VIRTUAL_FIXED_GET_FUNCTION_LIST({i})
+P11_VIRTUAL_FIXED_GET_INTERFACE_LIST({i})
+P11_VIRTUAL_FIXED_GET_INTERFACE({i})
+""")
+
+
+if __name__ == "__main__":
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--closures", type=int,
+                        default=64)
+    parser.add_argument("--outfile", type=argparse.FileType("w"),
+                        default=sys.stdout)
+    args = parser.parse_args()
+
+    write_fixed_instantiate(args.outfile, args.closures)

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/gen-wrappers.py Added

@@ -0,0 +1,171 @@
+#!/usr/bin/python
+
+"""
+SPDX-License-Identifier: BSD-3-Clause
+"""
+
+import ast
+import json
+import sys
+
+INDENT = "        "
+X_EXCLUDES = 
+    "C_GetFunctionList",
+    "C_GetFunctionStatus",
+    "C_CancelFunction",
+    "C_GetInterfaceList",
+    "C_GetInterface",
+
+
+
+def emit_wrapper_function(function, templates, concat_lines=False):
+    arglist_separator = ", \\\n" if concat_lines else ",\n"
+
+    function_name = templates"function_name".format(
+        function=function"name",
+    )
+    arglist_indent = " " * len(f"{function_name} (")
+    arglist = f"{arglist_separator}{arglist_indent}".join(
+        templates"function_argument".format(
+            argument_index=index,
+            argument_name=argument"name",
+            argument_type=argument"type",
+        )
+        for index, argument in enumerate(function"arguments")
+    )
+
+    call_lower_template = templates"call_lower"
+    if function"version" >= 3:
+        call_lower_template = templates.get("call_lower_v3",
+                                            call_lower_template)
+
+    call_lower = call_lower_template.format(
+        function=function"name",
+    )
+    call_lower_arglist_indent = " " * len(f"{INDENT}{call_lower} (")
+    call_lower_arglist = f"{arglist_separator}{call_lower_arglist_indent}".join(
+        templates"call_lower_argument".format(
+            argument_index=index,
+            argument_name=argument"name",
+            argument_type=argument"type",
+        )
+        for index, argument in enumerate(function"arguments")
+    )
+
+    has_slot_id = next((argument for argument in function"arguments" if argument"type" == "CK_SLOT_ID"), None)
+    has_session_handle = next((argument for argument in function"arguments" if argument"type" == "CK_SESSION_HANDLE"), None)
+    assert not (has_slot_id and has_session_handle)
+
+    function_body_template = templates.get("function_body")
+    if function_body_template and function"version" >= 3:
+        function_body_template = templates.get("function_body_v3",
+                                               function_body_template)
+
+    if has_slot_id:
+        template = templates.get("function_body_with_slot")
+        if template is not None:
+            function_body_template = templates.get(
+                "function_body_with_slot_v3",
+                template,
+            )
+    elif has_session_handle:
+        template = templates.get("function_body_with_session")
+        if template is not None:
+            function_body_template = templates.get(
+                "function_body_with_session_v3",
+                template,
+            )
+
+    return function_body_template.format(
+        indent=INDENT,
+        function_name=function_name,
+        arglist=arglist,
+        arglist_indent=arglist_indent,
+        call_lower=call_lower,
+        call_lower_arglist=call_lower_arglist,
+        call_lower_arglist_indent=call_lower_arglist_indent,
+    )
+
+
+def emit_wrapper_entry(function, templates, suffix=None):
+    if suffix is not None:
+        template_name = f"function_name_{suffix}"
+    else:
+        template_name = "function_name"
+
+    function_name = templatestemplate_name.format(
+        function=function"name",
+    )
+
+    entry_arglist = ", ".join(
+        templates"entry_argument".format(
+            argument_ffi_type=argument"ffi-type",
+        )
+        for argument in function"arguments"
+    )
+
+    return templates"entry".format(
+        function_name=function_name,
+        entry_arglist=entry_arglist,
+    )
+
+
+if __name__ == "__main__":
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--template", required=True,
+                        type=argparse.FileType("r"))
+    parser.add_argument("--concat-lines", action="store_true")
+    parser.add_argument("--excludes", type=argparse.FileType("r"))
+    parser.add_argument("--renames", nargs="*")
+    parser.add_argument("--infile", required=True,
+                        type=argparse.FileType("r"))
+    parser.add_argument("--outfile", type=argparse.FileType("w"),
+                        default=sys.stdout)
+    args = parser.parse_args()
+
+    functions = json.load(args.infile)"functions"
+    templates = ast.literal_eval(args.template.read())
+
+    excludes = 
+    if args.excludes:
+        excludes.extend(args.excludes.read().split())
+
+    renames = {}
+    if args.renames:
+        renames.update({k: v for k, v in r.split(":") for r in args.renames})
+
+    separator = "\\\n" if args.concat_lines else "\n"
+    wrappers = separator.join(
+        emit_wrapper_function(
+            function,
+            templates,
+            args.concat_lines,
+        )
+        for function in functions if function"name" not in excludes
+    )
+
+    separator = ", \\\n" if args.concat_lines else ",\n"
+    xentries = separator.join(
+        INDENT + emit_wrapper_entry(
+            function,
+            templates,
+            renames.get(function"name"),
+        )
+        for function in functions if function"name" not in X_EXCLUDES
+    )
+    entries = separator.join(
+        INDENT + emit_wrapper_entry(
+            function,
+            templates,
+            renames.get(function"name"),
+        )
+        for function in functions
+    )
+
+    args.outfile.write(templates"outer".format(
+        indent=INDENT,
+        wrappers=wrappers,
+        xentries=xentries,
+        entries=entries,
+    ))

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/generate-keypair.c Added

@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include "attrs.h"
+#include "compat.h"
+#include "debug.h"
+#include "hex.h"
+#include "iter.h"
+#include "message.h"
+#include "options.h"
+#include "tool.h"
+
+#ifdef P11_KIT_TESTABLE
+#include "mock.h"
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_generate_keypair (int argc,
+			  char *argv);
+
+static CK_MECHANISM
+get_mechanism (const char *type)
+{
+	CK_MECHANISM m = { CKA_INVALID, NULL_PTR, 0 };
+
+#ifdef P11_KIT_TESTABLE
+	if (p11_ascii_strcaseeq (type, "mock")) {
+		m.mechanism = CKM_MOCK_GENERATE;
+		m.pParameter = "generate";
+		m.ulParameterLen = 9;
+		return m;
+	}
+#endif
+	if (p11_ascii_strcaseeq (type, "rsa"))
+		m.mechanism = CKM_RSA_PKCS_KEY_PAIR_GEN;
+	else if (p11_ascii_strcaseeq (type, "ecdsa"))
+		m.mechanism = CKM_ECDSA_KEY_PAIR_GEN;
+	else if (p11_ascii_strcaseeq (type, "eddsa"))
+		m.mechanism = CKM_EC_EDWARDS_KEY_PAIR_GEN;
+
+	return m;
+}
+
+static const uint8_t *
+get_ec_params (const char *curve,
+	       size_t *ec_params_len)
+{
+	static const uint8_t OID_SECP256R1 = { 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07 };
+	static const uint8_t OID_SECP384R1 = { 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x22 };
+	static const uint8_t OID_SECP521R1 = { 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x23 };
+	static const uint8_t OID_ED25519 = { 0x06, 0x03, 0x2b, 0x65, 0x70 };
+	static const uint8_t OID_ED448 = { 0x06, 0x03, 0x2b, 0x65, 0x71 };
+
+	if (p11_ascii_strcaseeq (curve, "secp256r1")) {
+		*ec_params_len = sizeof (OID_SECP256R1);
+		return OID_SECP256R1;
+	} else if (p11_ascii_strcaseeq (curve, "secp384r1")) {
+		*ec_params_len = sizeof (OID_SECP384R1);
+		return OID_SECP384R1;
+	} else if (p11_ascii_strcaseeq (curve, "secp521r1")) {
+		*ec_params_len = sizeof (OID_SECP521R1);
+		return OID_SECP521R1;
+	} else if (p11_ascii_strcaseeq (curve, "ed25519")) {
+		*ec_params_len = sizeof (OID_ED25519);
+		return OID_ED25519;
+	} else if (p11_ascii_strcaseeq (curve, "ed448")) {
+		*ec_params_len = sizeof (OID_ED448);
+		return OID_ED448;
+	}
+
+	return NULL;
+}
+
+static bool
+check_args (CK_MECHANISM_TYPE type,
+	    CK_ULONG bits,
+	    const uint8_t *ec_params)
+{
+	switch (type) {
+#ifdef P11_KIT_TESTABLE
+	case CKM_MOCK_GENERATE:
+		break;
+#endif
+	case CKM_RSA_PKCS_KEY_PAIR_GEN:
+		if (bits == 0) {
+			p11_message (_("no bits specified"));
+			return false;
+		}
+		break;
+	case CKM_ECDSA_KEY_PAIR_GEN:
+	case CKM_EC_EDWARDS_KEY_PAIR_GEN:
+		if (ec_params == NULL) {
+			p11_message (_("no curve specified"));
+			return false;
+		}
+		break;
+	case CKA_INVALID:
+		p11_message (_("no type specified"));
+		return false;
+	default:
+		p11_message (_("unkwnown mechanism type in %s"), __func__);
+		return false;
+	}
+
+	if (bits != 0 && ec_params != NULL) {
+		p11_message (_("both %s and %s cannot be specified at once"), "--bits", "--curve");
+		return false;
+	}
+
+	return true;
+}
+
+static bool
+get_templates (const char *label,
+	       const char *id,
+	       CK_MECHANISM_TYPE type,
+	       CK_ULONG bits,
+	       const uint8_t *ec_params,
+	       size_t ec_params_len,
+	       CK_ATTRIBUTE **pubkey,
+	       CK_ATTRIBUTE **privkey)
+{
+	CK_BBOOL tval = CK_TRUE, fval = CK_FALSE;
+	CK_ATTRIBUTE *pub = NULL, *priv = NULL, *tmp;
+	CK_ATTRIBUTE attr_token = { CKA_TOKEN, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_private_true = { CKA_PRIVATE, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_private_false = { CKA_PRIVATE, &fval, sizeof (fval) };
+	CK_ATTRIBUTE attr_sign = { CKA_SIGN, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_verify = { CKA_VERIFY, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_decrypt = { CKA_DECRYPT, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_modulus = { CKA_MODULUS_BITS, &bits, sizeof (bits) };
+	CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, (void *)ec_params, ec_params_len };
+
+	pub = p11_attrs_build (NULL, &attr_token, &attr_private_false, &attr_verify, NULL);
+	if (pub == NULL) {
+		p11_message (_("failed to allocate memory"));
+		goto error;
+	}
+	priv = p11_attrs_build (NULL, &attr_token, &attr_private_true, &attr_sign, NULL);
+	if (priv == NULL) {
+		p11_message (_("failed to allocate memory"));
+		goto error;
+	}
+
+	if (label != NULL) {
+		CK_ATTRIBUTE attr_label = { CKA_LABEL, (void *)label, strlen (label) };
+
+		tmp = p11_attrs_build (pub, &attr_label, NULL);
+		if (tmp == NULL) {
+			p11_message (_("failed to allocate memory"));

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/import-object.c Added

@@ -0,0 +1,668 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include "attrs.h"
+#include "compat.h"
+#include "debug.h"
+#include "dict.h"
+#include "hex.h"
+#include "iter.h"
+#include "message.h"
+#include "pem.h"
+#include "options.h"
+#include "tool.h"
+
+#ifdef WITH_ASN1
+#include "asn1.h"
+#include "oid.h"
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_import_object (int argc,
+		       char *argv);
+
+#ifdef WITH_ASN1
+
+typedef struct {
+	bool parse_error;
+	p11_dict *defs;
+	CK_FUNCTION_LIST *module;
+	CK_SESSION_HANDLE session;
+	const char *label;
+	const char *id;
+} import_data;
+
+static bool
+import_x509_cert (const unsigned char *der,
+		  size_t der_len,
+		  const import_data *data)
+{
+	bool ok = false;
+	int start = 0, end = 0;
+	CK_RV rv;
+	asn1_node asn = NULL;
+	CK_OBJECT_HANDLE object = 0;
+	CK_ATTRIBUTE *attrs = NULL, *tmp = NULL;
+	CK_BBOOL tval = CK_TRUE, fval = CK_FALSE;
+	CK_OBJECT_CLASS class = CKO_CERTIFICATE;
+	CK_CERTIFICATE_TYPE cert_type = CKC_X_509;
+	CK_ATTRIBUTE attr_class = { CKA_CLASS, &class, sizeof (class) };
+	CK_ATTRIBUTE attr_token = { CKA_TOKEN, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_private = { CKA_PRIVATE, &fval, sizeof (fval) };
+	CK_ATTRIBUTE attr_cert_type = { CKA_CERTIFICATE_TYPE, &cert_type, sizeof (cert_type) };
+	CK_ATTRIBUTE attr_value = { CKA_VALUE, (void *)der, der_len };
+	CK_ATTRIBUTE attr_subject = { CKA_SUBJECT, };
+
+	return_val_if_fail (data != NULL, false);
+	return_val_if_fail (data->module != NULL, false);
+
+	asn = p11_asn1_decode (data->defs, "PKIX1.Certificate", der, der_len, NULL);
+	if (asn == NULL) {
+		p11_message (_("failed to parse ASN.1 structure"));
+		goto cleanup;
+	}
+
+	if (asn1_der_decoding_startEnd (asn, der, der_len, "tbsCertificate.subject",
+					&start, &end) != ASN1_SUCCESS) {
+		p11_message (_("failed to obtain certificate subject name"));
+		goto cleanup;
+	}
+	attr_subject.pValue = (void *)(der + start);
+	attr_subject.ulValueLen = end - start + 1;
+
+	attrs = p11_attrs_build (NULL, &attr_class, &attr_token, &attr_private,
+				 &attr_cert_type, &attr_value, &attr_subject, NULL);
+	if (attrs == NULL) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	if (data->label != NULL) {
+		CK_ATTRIBUTE attr_label = { CKA_LABEL, (void *)data->label, strlen (data->label) };
+
+		tmp = p11_attrs_build (attrs, &attr_label, NULL);
+		if (tmp == NULL) {
+			p11_message (_("failed to allocate memory"));
+			goto cleanup;
+		}
+		attrs = tmp;
+	}
+
+	if (data->id != NULL) {
+		size_t bin_len = 0;
+		unsigned char *bin = NULL;
+		CK_ATTRIBUTE attr_id = { CKA_ID, NULL, 0 };
+
+		bin = hex_decode (data->id, &bin_len);
+		if (bin == NULL) {
+			p11_message (_("failed to decode hex value: %s"), data->id);
+			goto cleanup;
+		}
+
+		attr_id.pValue = (void *)bin;
+		attr_id.ulValueLen = bin_len;
+
+		tmp = p11_attrs_build (attrs, &attr_id, NULL);
+		free (bin);
+		if (tmp == NULL) {
+			p11_message (_("failed to allocate memory"));
+			goto cleanup;
+		}
+		attrs = tmp;
+	}
+
+	rv = data->module->C_CreateObject (data->session, attrs, p11_attrs_count (attrs), &object);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to create object: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	ok = true;
+
+cleanup:
+	p11_attrs_free (attrs);
+	p11_asn1_free (asn);
+
+	return ok;
+}
+
+static CK_ATTRIBUTE *
+init_attrs_pubkey (const unsigned char *info,
+		   size_t info_len,
+		   const import_data *data)
+{
+	CK_ATTRIBUTE *attrs = NULL, *tmp = NULL;
+	CK_BBOOL tval = CK_TRUE, fval = CK_FALSE;
+	CK_OBJECT_CLASS class = CKO_PUBLIC_KEY;
+	CK_ATTRIBUTE attr_class = { CKA_CLASS, &class, sizeof (class) };
+	CK_ATTRIBUTE attr_token = { CKA_TOKEN, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_private = { CKA_PRIVATE, &fval, sizeof (fval) };
+	CK_ATTRIBUTE attr_verify = { CKA_VERIFY, &tval, sizeof (tval) };
+	CK_ATTRIBUTE attr_info = { CKA_PUBLIC_KEY_INFO, (void *)info, info_len };
+
+	return_val_if_fail (data != NULL, NULL);
+
+	attrs = p11_attrs_build (NULL, &attr_class, &attr_token, &attr_private,
+				 &attr_verify, &attr_info, NULL);
+	if (attrs == NULL) {
+		p11_message (_("failed to allocate memory"));
+		return NULL;
+	}
+

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/iter.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/iter.c Changed

@@ -36,15 +36,24 @@
 
 #include "array.h"
 #include "attrs.h"
+#include "compat.h"
 #include "debug.h"
 #include "iter.h"
 #include "pin.h"
 #include "private.h"
 
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
 typedef struct _Callback {
 	p11_kit_iter_callback func;
 	void *callback_data;
@@ -66,6 +75,8 @@
 	CK_ATTRIBUTE *match_attrs;
 	CK_SLOT_ID match_slot_id;
 	Callback *callbacks;
+	char *pin_value;
+	char *pin_source;
 
 	/* The input modules */
 	p11_array *modules;
@@ -104,6 +115,8 @@
 	unsigned int with_slots : 1;
 	unsigned int with_tokens : 1;
 	unsigned int with_objects : 1;
+	unsigned int with_login : 1;
+	unsigned int with_sessions : 1;
 };
 
 /**
@@ -111,6 +124,8 @@
  * @P11_KIT_ITER_KIND_MODULE: The iterator is pointing to a module.
  * @P11_KIT_ITER_KIND_SLOT: The iterator is pointing to a slot.
  * @P11_KIT_ITER_KIND_TOKEN: The iterator is pointing to a token.
+ * @P11_KIT_ITER_KIND_SESSION: The iterator is pointing to a token with an
+ *   active session.
  * @P11_KIT_ITER_KIND_OBJECT: The iterator is pointing to an object.
  * @P11_KIT_ITER_KIND_UNKNOWN: The iterator doesn't point to anything.
  *
@@ -126,6 +141,8 @@
  * @P11_KIT_ITER_WITH_MODULES: Stop at each module while iterating.
  * @P11_KIT_ITER_WITH_SLOTS: Stop at each slot while iterating.
  * @P11_KIT_ITER_WITH_TOKENS: Stop at each token while iterating.
+ * @P11_KIT_ITER_WITH_SESSIONS: Stop at each token while iterating (after
+ *   opening a session).
  * @P11_KIT_ITER_WITHOUT_OBJECTS: Ignore objects while iterating.
  *
  * Various flags controlling the behavior of the iterator.
@@ -167,7 +184,9 @@
 	iter->with_modules = !!(behavior & P11_KIT_ITER_WITH_MODULES);
 	iter->with_slots = !!(behavior & P11_KIT_ITER_WITH_SLOTS);
 	iter->with_tokens = !!(behavior & P11_KIT_ITER_WITH_TOKENS);
+	iter->with_sessions = !!(behavior & P11_KIT_ITER_WITH_SESSIONS);
 	iter->with_objects = !(behavior & P11_KIT_ITER_WITHOUT_OBJECTS);
+	iter->with_login = !!(behavior & P11_KIT_ITER_WITH_LOGIN);
 
 	p11_kit_iter_set_uri (iter, uri);
 	return iter;
@@ -199,6 +218,7 @@
 	CK_SLOT_INFO *sinfo;
 	CK_INFO *minfo;
 	CK_ULONG count;
+	const char *pin_value;
 
 	return_if_fail (iter != NULL);
 
@@ -224,6 +244,21 @@
 			tinfo = p11_kit_uri_get_token_info (uri);
 			if (tinfo != NULL)
 				memcpy (&iter->match_token, tinfo, sizeof (CK_TOKEN_INFO));
+
+			pin_value = p11_kit_uri_get_pin_value (uri);
+			if (pin_value != NULL)
+				iter->pin_value = strdup (pin_value);
+			else {
+				/* If the PIN is not immediately available
+				 * through pin-value, keep pin-source for later
+				 * retrieval.
+				 */
+				const char *pin_source;
+
+				pin_source = p11_kit_uri_get_pin_source (uri);
+				if (pin_source != NULL)
+					iter->pin_source = strdup (pin_source);
+			}
 		}
 	} else {
 		/* Match any module version number and slot ID */
@@ -508,6 +543,32 @@
 #define COROUTINE_RETURN(name,i,x) do { iter->name ## _state = i; return x; case i:; } while (0)
 #define COROUTINE_END(name) }
 
+static P11KitPin *
+request_pin (P11KitIter *iter)
+{
+	P11KitPin *pin;
+	char *pin_description;
+
+	if (iter->pin_value) {
+		return p11_kit_pin_new_for_string (iter->pin_value);
+	}
+
+	if (asprintf (&pin_description,
+		      _("PIN for %.*s"),
+		      (int) p11_kit_space_strlen (iter->token_info.label,
+						  sizeof (iter->token_info.label)),
+		      iter->token_info.label) < 0) {
+		return NULL;
+	}
+
+	pin = p11_kit_pin_request (iter->pin_source,
+				   NULL,
+				   pin_description,
+				   P11_KIT_PIN_FLAGS_USER_LOGIN);
+	free (pin_description);
+	return pin;
+}
+
 static CK_RV
 move_next_session (P11KitIter *iter)
 {
@@ -542,7 +603,7 @@
 			COROUTINE_RETURN (move_next_session, 1, CKR_OK);
 		}
 
-		if (iter->with_slots || iter->with_tokens || iter->with_objects) {
+		if (iter->with_slots || iter->with_tokens || iter->with_sessions || iter->with_objects) {
 			CK_SLOT_ID *slots;
 
 			rv = (iter->module->C_GetSlotList) (CK_TRUE, NULL, &num_slots);
@@ -563,7 +624,8 @@
 	}
 
 	/* Move to the next slot, and open a session on it */
-	while ((iter->with_slots || iter->with_tokens || iter->with_objects) &&
+	while ((iter->with_slots || iter->with_tokens || iter->with_sessions ||
+		iter->with_objects) &&
 	       iter->saw_slots < iter->num_slots) {
 		iter->slot = iter->slotsiter->saw_slots++;
 
@@ -580,6 +642,7 @@
 		rv = (iter->module->C_GetTokenInfo) (iter->slot, &iter->token_info);
 		if (rv != CKR_OK || !p11_match_uri_token_info (&iter->match_token, &iter->token_info))
 			continue;
+
 		if (iter->with_tokens) {
 			iter->kind = P11_KIT_ITER_KIND_TOKEN;
 			COROUTINE_RETURN (move_next_session, 3, CKR_OK);
@@ -597,10 +660,31 @@
 			return finish_iterating (iter, rv);
 
 		if (iter->session != 0) {
-			iter->move_next_session_state = 0;
-			iter->kind = P11_KIT_ITER_KIND_UNKNOWN;
-			return CKR_OK;
+			if (iter->with_login &&
+			    (iter->pin_value != NULL || iter->pin_source != NULL)) {
+				P11KitPin *pin;
+
+				pin = request_pin (iter);
+				if (!pin)
+					continue;
+
+				rv = (iter->module->C_Login) (iter->session, CKU_USER,
+							      (unsigned char *) p11_kit_pin_get_value (pin, NULL),
+							      p11_kit_pin_get_length (pin));
+				p11_kit_pin_unref (pin);
+				if (rv != CKR_OK)
+					return finish_iterating (iter, rv);
+			}
+
+			if (iter->with_sessions) {
+				iter->kind = P11_KIT_ITER_KIND_SESSION;
+				COROUTINE_RETURN (move_next_session, 4, CKR_OK);
+			}
 		}
+
+		iter->move_next_session_state = 0;
+		iter->kind = P11_KIT_ITER_KIND_UNKNOWN;
+		return CKR_OK;
 	}
 
 	COROUTINE_END (move_next_session);
@@ -644,7 +728,8 @@
 	if (iter->match_nothing)
 		return finish_iterating (iter, CKR_CANCEL);

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/iter.gnu.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/iter.gnu.c Changed

@@ -67,6 +67,7 @@
 	P11_KIT_ITER_KIND_SLOT,
 	P11_KIT_ITER_KIND_TOKEN,
 	P11_KIT_ITER_KIND_OBJECT,
+	P11_KIT_ITER_KIND_SESSION,
 	P11_KIT_ITER_KIND_UNKNOWN = -1,
 } P11KitIterKind;
 
@@ -77,6 +78,8 @@
 	P11_KIT_ITER_WITH_SLOTS = 1 << 4,
 	P11_KIT_ITER_WITH_TOKENS = 1 << 5,
 	P11_KIT_ITER_WITHOUT_OBJECTS = 1 << 6,
+	P11_KIT_ITER_WITH_LOGIN = 1 << 7,
+	P11_KIT_ITER_WITH_SESSIONS = 1 << 8,
 } P11KitIterBehavior;
 
 typedef CK_RV      (* p11_kit_iter_callback)                (P11KitIter *iter,
@@ -125,11 +128,11 @@
 CK_OBJECT_HANDLE      p11_kit_iter_get_object               (P11KitIter *iter);
 
 CK_RV                 p11_kit_iter_get_attributes           (P11KitIter *iter,
-                                                             CK_ATTRIBUTE *template,
+                                                             CK_ATTRIBUTE *templ,
                                                              CK_ULONG count);
 
 CK_RV                 p11_kit_iter_load_attributes          (P11KitIter *iter,
-                                                             CK_ATTRIBUTE *template,
+                                                             CK_ATTRIBUTE *templ,
                                                              CK_ULONG count);
 
 CK_SESSION_HANDLE     p11_kit_iter_keep_session             (P11KitIter *iter);

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/iter.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/iter.h Changed

@@ -63,6 +63,7 @@
 	P11_KIT_ITER_KIND_SLOT,
 	P11_KIT_ITER_KIND_TOKEN,
 	P11_KIT_ITER_KIND_OBJECT,
+	P11_KIT_ITER_KIND_SESSION,
 	P11_KIT_ITER_KIND_UNKNOWN = -1,
 } P11KitIterKind;
 
@@ -73,6 +74,8 @@
 	P11_KIT_ITER_WITH_SLOTS = 1 << 4,
 	P11_KIT_ITER_WITH_TOKENS = 1 << 5,
 	P11_KIT_ITER_WITHOUT_OBJECTS = 1 << 6,
+	P11_KIT_ITER_WITH_LOGIN = 1 << 7,
+	P11_KIT_ITER_WITH_SESSIONS = 1 << 8,
 } P11KitIterBehavior;
 
 typedef CK_RV      (* p11_kit_iter_callback)                (P11KitIter *iter,
@@ -121,11 +124,11 @@
 CK_OBJECT_HANDLE      p11_kit_iter_get_object               (P11KitIter *iter);
 
 CK_RV                 p11_kit_iter_get_attributes           (P11KitIter *iter,
-                                                             CK_ATTRIBUTE *template,
+                                                             CK_ATTRIBUTE *templ,
                                                              CK_ULONG count);
 
 CK_RV                 p11_kit_iter_load_attributes          (P11KitIter *iter,
-                                                             CK_ATTRIBUTE *template,
+                                                             CK_ATTRIBUTE *templ,
                                                              CK_ULONG count);
 
 CK_SESSION_HANDLE     p11_kit_iter_keep_session             (P11KitIter *iter);

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/list-mechanisms.c Added

@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Alexander Sosedkin <asosedkin@redhat.com>
+ */
+
+#include "config.h"
+
+#include "constants.h"
+#define P11_DEBUG_FLAG P11_DEBUG_TOOL
+#include "debug.h"
+#include "iter.h"
+#include "message.h"
+#include "pkcs11.h"
+#include "print.h"
+#include "options.h"
+#include "tool.h"
+#include "uri.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_list_mechanisms (int argc,
+		         char *argv);
+
+static void
+print_mechanism_with_info (CK_MECHANISM_TYPE mechanism,
+		           CK_MECHANISM_INFO info)
+{
+	const char *mechanism_nick = NULL;
+
+	mechanism_nick = p11_constant_nick (p11_constant_mechanisms, mechanism);
+	if (mechanism_nick == NULL)
+		printf ("0x%lX (unknown):", mechanism);
+	else
+		printf ("%s:", mechanism_nick);
+
+	if (info.flags & CKF_HW)
+		printf (" hw");
+	if (info.flags & CKF_MESSAGE_ENCRYPT)
+		printf (" message-encrypt");
+	if (info.flags & CKF_MESSAGE_DECRYPT)
+		printf (" message-decrypt");
+	if (info.flags & CKF_MESSAGE_SIGN)
+		printf (" message-sign");
+	if (info.flags & CKF_MESSAGE_VERIFY)
+		printf (" message-verify");
+	if (info.flags & CKF_MULTI_MESSAGE)
+		printf (" multi-message");
+	if (info.flags & CKF_FIND_OBJECTS)
+		printf (" find-objects");
+	if (info.flags & CKF_ENCRYPT)
+		printf (" encrypt");
+	if (info.flags & CKF_DECRYPT)
+		printf (" decrypt");
+	if (info.flags & CKF_DIGEST)
+		printf (" digest");
+	if (info.flags & CKF_SIGN)
+		printf (" sign");
+	if (info.flags & CKF_SIGN_RECOVER)
+		printf (" sign-recover");
+	if (info.flags & CKF_VERIFY)
+		printf (" verify");
+	if (info.flags & CKF_SIGN_RECOVER)
+		printf (" verify-recover");
+	if (info.flags & CKF_GENERATE)
+		printf (" generate");
+	if (info.flags & CKF_GENERATE_KEY_PAIR)
+		printf (" generate-key-pair");
+	if (info.flags & CKF_WRAP)
+		printf (" wrap");
+	if (info.flags & CKF_UNWRAP)
+		printf (" unwrap");
+	if (info.flags & CKF_DERIVE)
+		printf (" derive");
+	if (info.flags & CKF_EXTENSION)
+		printf (" extension");
+
+	if (info.ulMaxKeySize)
+		printf (" key-size=%lu-%lu", info.ulMinKeySize, info.ulMaxKeySize);
+	printf ("\n");
+}
+
+static int
+list_mechanisms (p11_tool *tool)
+{
+	int ret = 1;
+	CK_FUNCTION_LIST *module = NULL;
+	P11KitIter *iter = NULL;
+	CK_SESSION_HANDLE session = 0;
+	CK_SLOT_ID slot = 0;
+	CK_TOKEN_INFO token_info;
+	CK_MECHANISM_INFO mechanism_info;
+	CK_MECHANISM_TYPE_PTR mechanisms = NULL;
+	CK_MECHANISM_TYPE_PTR mechanisms_new = NULL;
+	unsigned long mechanisms_count = 0;
+	unsigned long i;
+	p11_list_printer printer;
+	CK_RV rv;
+
+	p11_list_printer_init (&printer, stdout, 0);
+
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WITH_LOGIN | P11_KIT_ITER_WITH_TOKENS | P11_KIT_ITER_WITHOUT_OBJECTS);
+	if (iter == NULL) {
+		p11_debug ("failed to initialize iterator");
+		return 1;
+	}
+
+	rv = p11_kit_iter_next (iter);
+	if (rv != CKR_OK) {
+		if (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	module = p11_kit_iter_get_module (iter);
+	if (module == NULL) {
+		p11_message (_("failed to obtain module"));
+		goto cleanup;
+	}
+
+	slot = p11_kit_iter_get_slot (iter);
+
+	rv = module->C_GetTokenInfo (slot, &token_info);
+	if (rv != CKR_OK) {
+		p11_message (_("couldn't load token info: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	rv = module->C_GetMechanismList (slot, NULL, &mechanisms_count);
+	if (rv != CKR_OK) {
+		p11_message (_("querying amount of mechanisms failed: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	mechanisms_new = reallocarray (mechanisms, mechanisms_count, sizeof (CK_MECHANISM_TYPE));
+	if (mechanisms_new == NULL) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+	mechanisms = mechanisms_new;
+
+	rv = module->C_GetMechanismList (slot, mechanisms, &mechanisms_count);
+	if (rv != CKR_OK) {
+		p11_message (_("querying mechanisms failed: %s"), p11_kit_strerror (rv));
+		goto cleanup;
+	}
+
+	for (i = 0; i < mechanisms_count; i++) {
+		rv = module->C_GetMechanismInfo (slot, mechanismsi, &mechanism_info);
+		if (rv != CKR_OK) {
+			p11_message (_("querying mechanism info failed: %s"), p11_kit_strerror (rv));
+			goto cleanup;
+		}
+
+		print_mechanism_with_info (mechanismsi, mechanism_info);
+	}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/list-objects.c Added

@@ -0,0 +1,463 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#include "attrs.h"
+#include "buffer.h"
+#include "constants.h"
+#include "debug.h"
+#include "hex.h"
+#include "iter.h"
+#include "message.h"
+#include "print.h"
+#include "options.h"
+#include "tool.h"
+
+#include "uri.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+int
+p11_kit_list_objects (int argc,
+		      char *argv);
+
+static inline bool
+is_storage_object (CK_OBJECT_CLASS klass)
+{
+	return klass == CKO_DATA || klass == CKO_CERTIFICATE || klass == CKO_PUBLIC_KEY ||
+	       klass == CKO_PRIVATE_KEY || klass == CKO_SECRET_KEY;
+}
+
+static inline void
+print_ulong_attribute (p11_list_printer *printer,
+		       const CK_ATTRIBUTE *attr,
+		       const p11_constant *constants)
+{
+	const char *type_str;
+	const char *value_str;
+
+	if (attr->ulValueLen == CK_UNAVAILABLE_INFORMATION)
+		return;
+
+	type_str = p11_constant_nick (p11_constant_types, attr->type);
+	if (type_str == NULL)
+		type_str = "(unknown)";
+
+	value_str = p11_constant_nick (constants, *((CK_ULONG *)attr->pValue));
+	if (value_str == NULL)
+		p11_list_printer_write_value (printer, type_str, "0x%lX (unknown)", attr->pValue);
+	else
+		p11_list_printer_write_value (printer, type_str, "%s", value_str);
+}
+
+static inline void
+print_string_attribute (p11_list_printer *printer,
+			const CK_ATTRIBUTE *attr)
+{
+	const char *type_str;
+
+	if (attr->pValue == NULL || attr->ulValueLen == CK_UNAVAILABLE_INFORMATION)
+		return;
+
+	type_str = p11_constant_nick (p11_constant_types, attr->type);
+	if (type_str == NULL)
+		type_str = "(unknown)";
+
+	p11_list_printer_write_value (printer, type_str, "%s", attr->pValue);
+}
+
+static inline void
+print_byte_array_attribute (p11_list_printer *printer,
+			    const CK_ATTRIBUTE *attr)
+{
+	const char *type_str;
+	char *value;
+
+	if (attr->pValue == NULL || attr->ulValueLen == CK_UNAVAILABLE_INFORMATION)
+		return;
+
+	type_str = p11_constant_nick (p11_constant_types, attr->type);
+	if (type_str == NULL)
+		type_str = "(unknown)";
+
+	value = hex_encode (attr->pValue, attr->ulValueLen);
+	p11_list_printer_write_value (printer, type_str, "%s", value);
+	free (value);
+}
+
+static inline void
+print_date_attribute (p11_list_printer *printer,
+		      const CK_ATTRIBUTE *attr)
+{
+	const char *type_str;
+	char year5 = { '\0' };
+	char month3 = { '\0' };
+	char day3 = { '\0' };
+
+	if (attr->ulValueLen == CK_UNAVAILABLE_INFORMATION ||
+	    attr->ulValueLen < sizeof (CK_DATE))
+		return;
+
+	type_str = p11_constant_nick (p11_constant_types, attr->type);
+	if (type_str == NULL)
+		type_str = "(unknown)";
+
+	memcpy (year, ((CK_DATE *)attr->pValue)->year, 4);
+	memcpy (month, ((CK_DATE *)attr->pValue)->month, 2);
+	memcpy (day, ((CK_DATE *)attr->pValue)->day, 2);
+
+	p11_list_printer_write_value (printer, type_str, "%s.%s.%s", year, month, day);
+}
+
+static inline void
+p11_array_push_flag (p11_array *flags,
+		     const CK_ATTRIBUTE *attr)
+{
+	const char *type_str;
+
+	if (attr->ulValueLen == CK_UNAVAILABLE_INFORMATION ||
+	    attr->ulValueLen < sizeof (CK_BBOOL) ||
+	    !*((CK_BBOOL *)attr->pValue))
+		return;
+
+	type_str = p11_constant_nick (p11_constant_types, attr->type);
+	if (type_str == NULL)
+		type_str = "(unknown)";
+
+	p11_array_push (flags, (void *)type_str);
+}
+
+static char *
+get_object_uri (P11KitIter *iter,
+		CK_OBJECT_CLASS klass,
+		CK_ATTRIBUTE *attr_label,
+		CK_ATTRIBUTE *attr_id)
+{
+	int ret;
+	P11KitUri *uri;
+	char *str = NULL;
+	CK_ATTRIBUTE attr_class = { CKA_CLASS, &klass, sizeof (klass) };
+
+	uri = p11_kit_uri_new ();
+	if (uri == NULL) {
+		p11_message (_("failed to allocate memory"));
+		return NULL;
+	}
+
+	ret = p11_kit_uri_set_attribute (uri, &attr_class);
+	if (ret != P11_KIT_URI_OK) {
+		p11_message (_("failed to set attribute for URI: %s"), p11_kit_uri_message (ret));
+		goto cleanup;
+	}
+
+	if (attr_label->ulValueLen != CK_UNAVAILABLE_INFORMATION) {
+	        ret = p11_kit_uri_set_attribute (uri, attr_label);
+	        if (ret != P11_KIT_URI_OK) {

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/list-profiles.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/list-profiles.c Changed

@@ -40,11 +40,14 @@
 #include "debug.h"
 #include "iter.h"
 #include "message.h"
+#include "options.h"
 #include "tool.h"
 
 #include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -53,70 +56,90 @@
 #define _(x) (x)
 #endif
 
+#define MAX_OBJECTS 4
+
 int
 p11_kit_list_profiles (int argc,
 		       char *argv);
 
 static int
-list_profiles (const char *token_str)
+list_profiles (p11_tool *tool)
 {
 	int ret = 1;
+	CK_RV rv;
 	const char *profile_nick = NULL;
-	CK_FUNCTION_LIST **modules = NULL;
-	P11KitUri *uri = NULL;
+	CK_OBJECT_HANDLE objectsMAX_OBJECTS;
+	CK_ULONG i, count = 0;
+	CK_SESSION_HANDLE session = 0;
+	CK_FUNCTION_LIST *module = NULL;
 	P11KitIter *iter = NULL;
-	CK_OBJECT_CLASS klass = CKO_PROFILE;
 	CK_PROFILE_ID profile_id = CKP_INVALID_ID;
-	CK_ATTRIBUTE matching = { CKA_CLASS, &klass, sizeof (klass) };
+	CK_OBJECT_CLASS klass = CKO_PROFILE;
+	CK_ATTRIBUTE template = { CKA_CLASS, &klass, sizeof (klass) };
 	CK_ATTRIBUTE attr = { CKA_PROFILE_ID, &profile_id, sizeof (profile_id) };
-	CK_RV rv;
 
-	uri = p11_kit_uri_new ();
-	if (uri == NULL) {
-		p11_message (_("failed to allocate memory for URI"));
-		goto cleanup;
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WITH_SESSIONS | P11_KIT_ITER_WITHOUT_OBJECTS);
+	if (iter == NULL) {
+		p11_message (_("failed to initialize iterator"));
+		return 1;
 	}
 
-	if (p11_kit_uri_parse (token_str, P11_KIT_URI_FOR_TOKEN, uri) != P11_KIT_URI_OK) {
-		p11_message (_("failed to parse the token URI"));
+	rv = p11_kit_iter_next (iter);
+	if (rv != CKR_OK) {
+		if (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	modules = p11_kit_modules_load_and_initialize (0);
-	if (modules == NULL) {
-		p11_message (_("failed to load and initialize modules"));
-		goto cleanup;
-	}
+	/* Module and session should always be set at this point.  */
+	module = p11_kit_iter_get_module (iter);
+	return_val_if_fail (module != NULL, 1);
+	session = p11_kit_iter_get_session (iter);
+	return_val_if_fail (session != CK_INVALID_HANDLE, 1);
 
-	iter = p11_kit_iter_new (uri, 0);
-	if (iter == NULL) {
-		p11_message (_("failed to initialize iterator"));
+	rv = module->C_FindObjectsInit (session, &template, 1);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to initialize search for objects: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 
-	p11_kit_iter_add_filter (iter, &matching, 1);
-	p11_kit_iter_begin (iter, modules);
-	while ((rv = p11_kit_iter_next (iter)) == CKR_OK) {
-		rv = p11_kit_iter_get_attributes (iter, &attr, 1);
+	do {
+		rv = module->C_FindObjects (session, objects, MAX_OBJECTS, &count);
 		if (rv != CKR_OK) {
-			p11_message (_("failed to retrieve attribute of an object"));
+			module->C_FindObjectsFinal (session);
+			p11_message (_("failed to search for objects: %s"), p11_kit_strerror (rv));
 			goto cleanup;
 		}
 
-		profile_nick = p11_constant_nick (p11_constant_profiles, profile_id);
-		if (profile_nick == NULL)
-			printf ("0x%lX (unknown)\n", profile_id);
-		else
-			printf ("%s\n", profile_nick);
+		for (i = 0; i < count; ++i) {
+			rv = module->C_GetAttributeValue (session, objectsi, &attr, 1);
+			if (rv != CKR_OK) {
+				module->C_FindObjectsFinal (session);
+				p11_message (_("failed to retrieve attribute of an object: %s"),
+					     p11_kit_strerror (rv));
+				goto cleanup;
+			}
+
+			profile_nick = p11_constant_nick (p11_constant_profiles, profile_id);
+			if (profile_nick == NULL)
+				printf ("0x%lX (unknown)\n", profile_id);
+			else
+				printf ("%s\n", profile_nick);
+		}
+	} while (count > 0);
+
+	rv = module->C_FindObjectsFinal (session);
+	if (rv != CKR_OK) {
+		p11_message (_("failed to finalize search for objects: %s"), p11_kit_strerror (rv));
+		goto cleanup;
 	}
 
 	ret = 0;
 
 cleanup:
-	p11_kit_iter_free (iter);
-	p11_kit_modules_finalize (modules);
-	p11_kit_modules_release (modules);
-	p11_kit_uri_free (uri);
+	p11_tool_end_iter (tool, iter);
 
 	return ret;
 }
@@ -125,23 +148,32 @@
 p11_kit_list_profiles (int argc,
 		       char *argv)
 {
-	int opt;
+	int opt, ret = 2;
+	bool login = false;
+	p11_tool *tool = NULL;
+	const char *provider = NULL;
 
 	enum {
 		opt_verbose = 'v',
 		opt_quiet = 'q',
 		opt_help = 'h',
+		opt_login = 'l',
+		opt_provider = CHAR_MAX + 2,
 	};
 
 	struct option options = {
 		{ "verbose", no_argument, NULL, opt_verbose },
 		{ "quiet", no_argument, NULL, opt_quiet },
 		{ "help", no_argument, NULL, opt_help },
+		{ "login", no_argument, NULL, opt_login },
+		{ "provider", required_argument, NULL, opt_provider },
 		{ 0 },
 	};
 
 	p11_tool_desc usages = {
 		{ 0, "usage: p11-kit list-profiles pkcs11:token" },
+		{ opt_login, "login to the token" },
+		{ opt_provider, "specify the module to use" },
 		{ 0 },
 	};
 
@@ -156,6 +188,12 @@
 		case opt_help:
 			p11_tool_usage (usages, options);
 			return 0;
+		case opt_login:
+			login = true;
+			break;
+		case opt_provider:
+			provider = optarg;
+			break;
 		case '?':
 			return 2;
 		default:
@@ -172,5 +210,28 @@
 		return 2;
 	}
 
-	return list_profiles (*argv);
+	tool = p11_tool_new ();
+	if (!tool) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	if (p11_tool_set_uri (tool, *argv, P11_KIT_URI_FOR_TOKEN) != P11_KIT_URI_OK) {
+		p11_message (_("failed to parse URI"));

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/list-tokens.c Added

@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2023, Red Hat, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#include "config.h"
+
+#define P11_DEBUG_FLAG P11_DEBUG_TOOL
+#include "debug.h"
+#include "iter.h"
+#include "message.h"
+#include "print.h"
+#include "options.h"
+#include "tool.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(x) dgettext(PACKAGE_NAME, x)
+#else
+#define _(x) (x)
+#endif
+
+void  print_token_info    (p11_list_printer *printer,
+                           CK_TOKEN_INFO    *info);
+
+char *format_token_uri    (CK_TOKEN_INFO    *info);
+
+int   p11_kit_list_tokens (int               argc,
+                           char             *argv);
+
+static int
+list_tokens (p11_tool *tool,
+	     bool only_uris)
+{
+	P11KitIter *iter = NULL;
+	p11_list_printer printer;
+
+	p11_list_printer_init (&printer, stdout, 0);
+
+	iter = p11_tool_begin_iter (tool, P11_KIT_ITER_WITH_TOKENS |
+				    P11_KIT_ITER_WITHOUT_OBJECTS);
+	if (iter == NULL) {
+		p11_debug ("failed to initialize iterator");
+		return 1;
+	}
+
+	while (p11_kit_iter_next (iter) == CKR_OK) {
+		CK_TOKEN_INFO *info = p11_kit_iter_get_token (iter);
+		char *value;
+
+		if (only_uris) {
+			value = format_token_uri (info);
+			if (value)
+				printf ("%s\n", value);
+			free (value);
+		} else {
+			value = p11_kit_space_strdup (info->label, sizeof (info->label));
+			p11_list_printer_start_section (&printer, "token", "%s", value);
+			free (value);
+
+			print_token_info (&printer, info);
+			p11_list_printer_end_section (&printer);
+		}
+	}
+
+	p11_tool_end_iter (tool, iter);
+
+	return 0;
+}
+
+int
+p11_kit_list_tokens (int argc,
+		     char *argv)
+{
+	int opt, ret = 2;
+	bool only_uris = false;
+	p11_tool *tool = NULL;
+	const char *provider = NULL;
+
+	enum {
+		opt_verbose = 'v',
+		opt_quiet = 'q',
+		opt_help = 'h',
+		opt_only_urls = CHAR_MAX + 1,
+		opt_provider = CHAR_MAX + 2,
+	};
+
+	struct option options = {
+		{ "verbose", no_argument, NULL, opt_verbose },
+		{ "quiet", no_argument, NULL, opt_quiet },
+		{ "only-uris", no_argument, NULL, opt_only_urls },
+		{ "provider", required_argument, NULL, opt_provider },
+		{ "help", no_argument, NULL, opt_help },
+		{ 0 },
+	};
+
+	p11_tool_desc usages = {
+		{ 0, "usage: p11-kit list-tokens --only-uris pkcs11:token" },
+		{ opt_verbose, "show verbose debug output", },
+		{ opt_quiet, "suppress command output", },
+		{ opt_only_urls, "only print token URIs", },
+		{ opt_provider, "specify the module to use" },
+		{ 0 },
+	};
+
+	while ((opt = p11_tool_getopt (argc, argv, options)) != -1) {
+		switch (opt) {
+
+		case opt_verbose:
+			p11_kit_be_loud ();
+			break;
+
+		case opt_quiet:
+			p11_kit_be_quiet ();
+			break;
+
+		case opt_only_urls:
+			only_uris = true;
+			break;
+
+		case opt_provider:
+			provider = optarg;
+			break;
+
+		case opt_help:
+			p11_tool_usage (usages, options);
+			return 0;
+		case '?':
+			return 2;
+		default:
+			assert_not_reached ();
+			break;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 1) {
+		p11_tool_usage (usages, options);
+		return 2;
+	}
+
+	tool = p11_tool_new ();
+	if (!tool) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	if (p11_tool_set_uri (tool, *argv, P11_KIT_URI_FOR_TOKEN) != P11_KIT_URI_OK) {
+		p11_message (_("failed to parse URI"));
+		goto cleanup;
+	}
+
+	if (!p11_tool_set_provider (tool, provider)) {
+		p11_message (_("failed to allocate memory"));
+		goto cleanup;
+	}
+
+	ret = list_tokens (tool, only_uris);
+ cleanup:
+	p11_tool_free (tool);
+
+	return ret;
+}

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/lists.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/lists.c Changed

@@ -36,6 +36,7 @@
 
 #include "compat.h"
 #include "debug.h"
+#include "hex.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -49,7 +50,7 @@
 #include "message.h"
 #include "p11-kit.h"
 #include "print.h"
-#include "tool.h"
+#include "options.h"
 #include "uri.h"
 
 #ifdef ENABLE_NLS
@@ -64,33 +65,6 @@
 
 bool verbose = false;
 
-static const char HEXC_LOWER = "0123456789abcdef";
-
-static char *
-hex_encode (const unsigned char *data,
-            size_t n_data)
-{
-	char *result;
-	size_t i;
-	size_t o;
-
-	if ((SIZE_MAX - 1) / 3 < n_data)
-		return NULL;
-	result = malloc (n_data * 3 + 1);
-	if (result == NULL)
-		return NULL;
-
-	for (i = 0, o = 0; i < n_data; i++) {
-		if (i > 0)
-			resulto++ = ':';
-		resulto++ = HEXC_LOWERdatai >> 4 & 0xf;
-		resulto++ = HEXC_LOWERdatai & 0xf;
-	}
-
-	resulto = 0;
-	return result;
-}
-
 static bool
 is_ascii_string (const unsigned char *data,
                  size_t n_data)
@@ -106,51 +80,75 @@
 	return true;
 }
 
-static void
-print_token_info (p11_list_printer *printer, CK_FUNCTION_LIST_PTR module, CK_SLOT_ID slot_id)
+char *format_token_uri (CK_TOKEN_INFO    *info);
+
+void  print_token_info (p11_list_printer *printer,
+                        CK_TOKEN_INFO    *info);
+
+char *
+format_token_uri (CK_TOKEN_INFO *info)
 {
-	CK_TOKEN_INFO info;
 	char *value;
-	CK_RV rv;
-	p11_array *flags;
+	P11KitUri *uri;
+	int ret;
 
-	rv = (module->C_GetTokenInfo) (slot_id, &info);
-	if (rv != CKR_OK) {
-		p11_message (_("couldn't load module info: %s"), p11_kit_strerror (rv));
-		return;
+	uri = p11_kit_uri_new ();
+	if (uri == NULL) {
+		p11_message (_("failed to allocate memory"));
+		return NULL;
+	}
+
+	memcpy (p11_kit_uri_get_token_info (uri), info, sizeof (*info));
+	ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_TOKEN, &value);
+	p11_kit_uri_free (uri);
+	if (ret != P11_KIT_URI_OK) {
+		p11_message (_("couldn't format URI into string: %s"),
+			     p11_kit_uri_message (ret));
+		return NULL;
 	}
 
-	value = p11_kit_space_strdup (info.label, sizeof (info.label));
-	p11_list_printer_start_section (printer, "token", "%s", value);
+	return value;
+}
+
+void
+print_token_info (p11_list_printer *printer,
+		  CK_TOKEN_INFO *info)
+{
+	char *value;
+	p11_array *flags;
+
+	value = format_token_uri (info);
+	if (value)
+		p11_list_printer_write_value (printer, "uri", "%s", value);
 	free (value);
 
-	value = p11_kit_space_strdup (info.manufacturerID, sizeof (info.manufacturerID));
+	value = p11_kit_space_strdup (info->manufacturerID, sizeof (info->manufacturerID));
 	p11_list_printer_write_value (printer, "manufacturer", "%s", value);
 	free (value);
 
-	value = p11_kit_space_strdup (info.model, sizeof (info.model));
+	value = p11_kit_space_strdup (info->model, sizeof (info->model));
 	p11_list_printer_write_value (printer, "model", "%s", value);
 	free (value);
 
-	if (is_ascii_string (info.serialNumber, sizeof (info.serialNumber)))
-		value = p11_kit_space_strdup (info.serialNumber, sizeof (info.serialNumber));
+	if (is_ascii_string (info->serialNumber, sizeof (info->serialNumber)))
+		value = p11_kit_space_strdup (info->serialNumber, sizeof (info->serialNumber));
 	else
-		value = hex_encode (info.serialNumber, sizeof (info.serialNumber));
+		value = hex_encode (info->serialNumber, sizeof (info->serialNumber));
 	p11_list_printer_write_value (printer, "serial-number", "%s", value);
 	free (value);
 
-	if (info.hardwareVersion.major || info.hardwareVersion.minor)
+	if (info->hardwareVersion.major || info->hardwareVersion.minor)
 		p11_list_printer_write_value (printer, "hardware-version",
-					      "%d.%d", info.hardwareVersion.major, info.hardwareVersion.minor);
+					      "%d.%d", info->hardwareVersion.major, info->hardwareVersion.minor);
 
-	if (info.firmwareVersion.major || info.firmwareVersion.minor)
+	if (info->firmwareVersion.major || info->firmwareVersion.minor)
 		p11_list_printer_write_value (printer, "firmware-version",
-					      "%d.%d", info.firmwareVersion.major, info.firmwareVersion.minor);
+					      "%d.%d", info->firmwareVersion.major, info->firmwareVersion.minor);
 
 	flags = p11_array_new (NULL);
 	return_if_fail (flags);
 
-	#define X(x, y)   if (info.flags & (x)) (void) p11_array_push (flags, y)
+	#define X(x, y)   if (info->flags & (x)) (void) p11_array_push (flags, y)
 	X(CKF_RNG, "rng");
 	X(CKF_WRITE_PROTECTED, "write-protected");
 	X(CKF_LOGIN_REQUIRED, "login-required");
@@ -173,55 +171,113 @@
 
 	p11_list_printer_write_array (printer, "flags", flags);
 	p11_array_free (flags);
+}
+
+static char *
+format_module_uri (CK_INFO *info)
+{
+	char *value;
+	P11KitUri *uri;
+	int ret;
+
+	uri = p11_kit_uri_new ();
+	if (uri == NULL) {
+		p11_message (_("failed to allocate memory"));
+		return NULL;
+	}
 
-	p11_list_printer_end_section (printer);
+	memcpy (p11_kit_uri_get_module_info (uri), info, sizeof (*info));
+	ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_MODULE, &value);
+	p11_kit_uri_free (uri);
+	if (ret != P11_KIT_URI_OK) {
+		p11_message (_("couldn't format URI into string: %s"),
+			     p11_kit_uri_message (ret));
+		return NULL;
+	}
+
+	return value;
 }
 
 static void
-print_module_info (p11_list_printer *printer, CK_FUNCTION_LIST_PTR module)
+print_module_info (p11_list_printer *printer,
+		   CK_INFO *info)
 {
-	CK_SLOT_ID slot_list256;
-	CK_ULONG i, count;
-	CK_INFO info;
 	char *value;
-	CK_RV rv;
 
-	rv = (module->C_GetInfo) (&info);
-	if (rv != CKR_OK) {
-		p11_message (_("couldn't load module info: %s"), p11_kit_strerror (rv));
-		return;
-	}
+	value = format_module_uri (info);
+	if (value)
+		p11_list_printer_write_value (printer, "uri", "%s", value);
+	free (value);

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/log.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/log.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/meson.build Changed

@@ -1,9 +1,18 @@
+version_h = configure_file(
+  input: 'version.h.in',
+  output: '@BASENAME@',
+  configuration: conf,
+)
+
+version_h_dep = declare_dependency(sources: version_h)
+
 install_headers('deprecated.h',
                 'iter.h',
                 'p11-kit.h',
                 'pin.h',
                 'remote.h',
                 'uri.h',
+                version_h,
                 subdir: 'p11-kit-1/p11-kit')
 
 libp11_kit_internal_sources = 
@@ -15,11 +24,63 @@
   'rpc-client.c'
 
 
-libp11_kit_internal_sources += custom_target('generate virtual-fixed-generated.h',
-                                             output: 'virtual-fixed-generated.h',
+libp11_kit_internal_sources += custom_target('generate virtual-ffi-generated.h',
+                                             input: pkcs11_json,
+                                             output: 'virtual-ffi-generated.h',
+                                             command: 
+                                               python,
+                                               meson.current_source_dir() / 'gen-wrappers.py',
+                                               '--template', meson.current_source_dir() / 'templates' / 'binding-wrappers.py',
+                                               '--excludes', meson.current_source_dir() / 'templates' / 'virtual-excludes.list',
+                                               '--infile', '@INPUT@',
+                                               '--outfile', '@OUTPUT@',
+                                             )
+libp11_kit_internal_sources += custom_target('generate virtual-fixed-wrappers.h',
+                                             input: pkcs11_json,
+                                             output: 'virtual-fixed-wrappers.h',
+                                             command: 
+                                               python,
+                                               meson.current_source_dir() / 'gen-wrappers.py',
+                                               '--template', meson.current_source_dir() / 'templates' / 'fixed-wrappers.py',
+                                               '--excludes', meson.current_source_dir() / 'templates' / 'virtual-excludes.list',
+                                               '--renames',
+                                               'C_GetFunctionStatus:short',
+                                               'C_CancelFunction:short',
+                                               '--concat-lines',
+                                               '--infile', '@INPUT@',
+                                               '--outfile', '@OUTPUT@',
+                                             )
+
+libp11_kit_internal_sources += custom_target('generate virtual-fixed-closures.h',
+                                             output: 'virtual-fixed-closures.h',
+                                             command: 
+                                               python,
+                                               meson.current_source_dir() / 'gen-fixed-closures.py',
+                                               '--closures', '@0@'.format(closures),
+                                               '--outfile', '@OUTPUT@',
+                                             )
+
+libp11_kit_internal_sources += custom_target('generate virtual-stack-generated.h',
+                                             input: pkcs11_json,
+                                             output: 'virtual-stack-generated.h',
                                              command: 
-                                               meson.current_source_dir() / 'gen-virtual-fixed.sh',
-                                               '@OUTPUT@', '@0@'.format(closures)
+                                               python,
+                                               meson.current_source_dir() / 'gen-wrappers.py',
+                                               '--template', meson.current_source_dir() / 'templates' / 'stack-wrappers.py',
+                                               '--excludes', meson.current_source_dir() / 'templates' / 'virtual-excludes.list',
+                                               '--infile', '@INPUT@',
+                                               '--outfile', '@OUTPUT@',
+                                             )
+libp11_kit_internal_sources += custom_target('generate virtual-base-generated.h',
+                                             input: pkcs11_json,
+                                             output: 'virtual-base-generated.h',
+                                             command: 
+                                               python,
+                                               meson.current_source_dir() / 'gen-wrappers.py',
+                                               '--template', meson.current_source_dir() / 'templates' / 'base-wrappers.py',
+                                               '--excludes', meson.current_source_dir() / 'templates' / 'virtual-excludes.list',
+                                               '--infile', '@INPUT@',
+                                               '--outfile', '@OUTPUT@',
                                              )
 libp11_kit_internal_sources += 'virtual.c'
 
@@ -51,6 +112,18 @@
   'util.c'
 
 
+libp11_kit_sources += custom_target('generate proxy-generated.h',
+                                    input: pkcs11_json,
+                                    output: 'proxy-generated.h',
+                                    command: 
+                                      python,
+                                      meson.current_source_dir() / 'gen-wrappers.py',
+                                      '--template', meson.current_source_dir() / 'templates' / 'proxy-wrappers.py',
+                                      '--excludes', meson.current_source_dir() / 'templates' / 'proxy-excludes.list',
+                                      '--infile', '@INPUT@',
+                                      '--outfile', '@OUTPUT@',
+                                    )
+
 libp11_kit_symbol_map = meson.current_source_dir() / 'libp11-kit.map'
 libp11_kit_ldflags = cc.get_supported_link_arguments(
   '-Wl,--version-script,' + libp11_kit_symbol_map
@@ -147,25 +220,39 @@
 
 p11_kit_sources = 
   'add-profile.c',
+  'delete-object.c',
   'delete-profile.c',
+  'export-object.c',
+  'generate-keypair.c',
+  'import-object.c',
+  'list-objects.c',
   'list-profiles.c',
+  'list-mechanisms.c',
+  'list-tokens.c',
   'lists.c',
   'p11-kit.c',
-  'print-config.c'
+  'print-config.c',
+  'tool.c'
 
 
+if host_system != 'windows'
+  p11_kit_sources += 'tty.c'
+endif
+
 executable('p11-kit',
            p11_kit_sources,
            c_args: common_c_args + libp11_kit_internal_c_args,
-           dependencies: libp11_tool_dep + libffi_deps + dlopen_deps,
+           dependencies: libp11_tool_dep + libp11_asn1_deps + libffi_deps + dlopen_deps,
            link_with: libp11_kit, libp11_kit_internal,
            install: true)
 
 if get_option('test')
   executable('p11-kit-testable',
              p11_kit_sources,
-             c_args: common_c_args + libp11_kit_internal_c_args,
-             dependencies: libp11_tool_dep + libffi_deps + dlopen_deps,
+             c_args: common_c_args + libp11_kit_internal_c_args + 
+               '-DP11_KIT_TESTABLE'
+             ,
+             dependencies: libp11_tool_dep + libp11_asn1_deps + libffi_deps + dlopen_deps,
              link_whole: libp11_kit_testable)
 endif
 
@@ -263,7 +350,8 @@
     'test-log3',
     'test-filter',
     'test-transport',
-    'test-transport3'
+    'test-transport3',
+    'test-version',
   
 
   # Some tests fail to link on macOS because they need p11_library_mutex, but
@@ -288,7 +376,7 @@
     t = executable(name, '@0@.c'.format(name),
                    c_args: tests_c_args + libp11_kit_testable_c_args,
                    include_directories: configinc, commoninc,
-                   dependencies: libp11_test_dep + libffi_deps + dlopen_deps,
+                   dependencies: libp11_test_dep, version_h_dep + libffi_deps + dlopen_deps,
                    link_with: link_with,
                    link_whole: link_whole)
     test(name, t)
@@ -309,11 +397,16 @@
 
   p11_kit_tests_env = environment()
   p11_kit_tests_env.set('abs_top_builddir', top_build_dir)
+  p11_kit_tests_env.set('abs_top_srcdir', top_source_dir)
   p11_kit_tests_env.set('P11_MODULE_PATH', meson.current_build_dir())
 
   if host_system != 'windows'
-    test('test-profiles.sh',
-         find_program('test-profiles.sh'),
+    test('test-objects.sh',
+         find_program('test-objects.sh'),
+         env: p11_kit_tests_env)
+
+    test('test-lists.sh',
+         find_program('test-lists.sh'),
          env: p11_kit_tests_env)
 
     test('test-messages.sh',
@@ -323,6 +416,41 @@
     test('test-server.sh',
          find_program('test-server.sh'),
          env: p11_kit_tests_env)
+
+    test('test-list-mechanisms.sh',
+         find_program('test-list-mechanisms.sh'),
+         env: p11_kit_tests_env)
+
+    test('test-list-tokens.sh',
+         find_program('test-list-tokens.sh'),
+         env: p11_kit_tests_env)

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/mock-module-ep10.c Added

@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2012 Stefan Walter
+ * Copyright (c) 2020 Red Hat, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stef@thewalter.net>, Daiki Ueno
+ */
+
+#include "config.h"
+
+#define CRYPTOKI_EXPORTS 1
+#include "pkcs11.h"
+
+#include "attrs.h"
+#include "debug.h"
+#include "mock.h"
+#include "test.h"
+#include <stdint.h>
+
+static const CK_TOKEN_INFO MOCK_TOKEN_INFO = {
+	"PUBKEY LABEL                    ",
+	"PUBKEY MANUFACTURER             ",
+	"PUBKEY MODEL    ",
+	"PUBKEY SERIAL   ",
+	CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_CLOCK_ON_TOKEN | CKF_TOKEN_INITIALIZED,
+	1,
+	2,
+	3,
+	4,
+	5,
+	6,
+	7,
+	8,
+	9,
+	10,
+	{ 75, 175 },
+	{ 85, 185 },
+	{ '1', '9', '9', '9', '0', '5', '2', '5', '0', '9', '1', '9', '5', '9', '0', '0' }
+};
+
+static uint8_t rsa_modulus = {
+	0xc0, 0xae, 0x21, 0x2e, 0x0b, 0x11, 0xc6, 0x5b, 0x55, 0xd0, 0xcb, 0x9d,
+	0x61, 0x6b, 0x76, 0xc9, 0x96, 0x16, 0x82, 0x31, 0xe1, 0xd4, 0x1d, 0x86,
+	0xe4, 0x4b, 0x89, 0x0d, 0x1b, 0xe3, 0x91, 0x82, 0x06, 0x88, 0x59, 0x7a,
+	0x9c, 0x39, 0x3d, 0x6a, 0x45, 0xb1, 0x6b, 0x08, 0x09, 0xa1, 0x59, 0xa7,
+	0x66, 0x0d, 0xd8, 0xd1, 0xae, 0x28, 0x82, 0x4d, 0x07, 0xf3, 0xef, 0x96,
+	0x5c, 0xe6, 0x63, 0x6d, 0x52, 0xf5, 0xbd, 0x8a, 0xbd, 0x7f, 0x14, 0x26,
+	0xd8, 0xa3, 0x0d, 0x64, 0xf5, 0xf4, 0x4c, 0xcf, 0xde, 0x7e, 0x1d, 0x0f,
+	0xf1, 0x83, 0x3c, 0x94, 0x0c, 0xb1, 0x8a, 0x20, 0xa7, 0x0b, 0x01, 0xa4,
+	0x7d, 0xf6, 0xd4, 0x16, 0xa3, 0x9a, 0xfb, 0xee, 0x13, 0xff, 0x7d, 0x05,
+	0x45, 0xf7, 0x97, 0x0f, 0x56, 0x1a, 0x35, 0x81, 0xf5, 0x64, 0xf7, 0xf6,
+	0x08, 0xa4, 0xa5, 0x9b, 0xab, 0x94, 0x23, 0x2a, 0x85, 0x39, 0xa9, 0x31,
+	0x2d, 0xc6, 0x93, 0x56, 0x3e, 0xa8, 0x5e, 0x27, 0xf8, 0x35, 0x6b, 0x60,
+	0xe8, 0x47, 0x6e, 0xe8, 0x8d, 0x6b, 0x11, 0x2d, 0x6c, 0x04, 0xc9, 0xec,
+	0x29, 0x04, 0x04, 0x94, 0xb5, 0xe8, 0x28, 0xb2, 0x68, 0xbe, 0x9c, 0xd9,
+	0x80, 0x87, 0x89, 0x7d, 0xac, 0x57, 0x86, 0x74, 0x31, 0x7d, 0x61, 0x47,
+	0xe1, 0x87, 0xb4, 0x04, 0x01, 0x78, 0x62, 0xdc, 0xe8, 0x0d, 0x75, 0xe7,
+	0x49, 0xf2, 0x95, 0x8a, 0x88, 0xb0, 0x35, 0x2d, 0x3a, 0x8b, 0xa6, 0x47,
+	0xf5, 0x9b, 0x5d, 0x3f, 0x6d, 0x13, 0x7b, 0x4f, 0xc1, 0x0e, 0x3c, 0x4f,
+	0x32, 0x64, 0xf0, 0x9a, 0x5f, 0xe3, 0xe4, 0xd5, 0xbf, 0x9c, 0xcd, 0x0d,
+	0xe2, 0xd9, 0x5d, 0x97, 0x61, 0xf1, 0x6f, 0x08, 0x04, 0x92, 0xaf, 0xa6,
+	0xe1, 0xa5, 0x45, 0x60, 0x6a, 0xe9, 0xd0, 0xa3, 0xa2, 0x86, 0x00, 0xb9,
+	0x90, 0x31, 0x8e, 0x7d
+};
+
+static uint8_t rsa_public_exponent = {
+	0x01, 0x00, 0x01
+};
+
+static uint8_t ec_params = {
+	0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07
+};
+
+static uint8_t ec_point = {
+	0x04, 0x41, 0x04, 0xb1, 0xa4, 0xc9, 0xb7, 0x47, 0x5e, 0x6d, 0x76, 0x96,
+	0xec, 0x7a, 0x5c, 0xae, 0x99, 0xfb, 0x5f, 0x4e, 0xd2, 0xb1, 0x39, 0x3d,
+	0xe8, 0xe2, 0x85, 0x6a, 0x5f, 0x7b, 0x47, 0x67, 0xfd, 0xc1, 0xeb, 0x66,
+	0x2b, 0xf1, 0x15, 0xc9, 0x92, 0x23, 0x0a, 0xcb, 0x61, 0xe2, 0xdb, 0xe4,
+	0x56, 0xdb, 0xf2, 0x56, 0xc6, 0xb0, 0x04, 0x5d, 0x00, 0xda, 0x22, 0x3b,
+	0x37, 0xeb, 0x99, 0x76, 0x23, 0xec, 0x87
+};
+
+static uint8_t spki = {
+	0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02,
+	0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
+	0x42, 0x00, 0x04, 0xb1, 0xa4, 0xc9, 0xb7, 0x47, 0x5e, 0x6d, 0x76, 0x96,
+	0xec, 0x7a, 0x5c, 0xae, 0x99, 0xfb, 0x5f, 0x4e, 0xd2, 0xb1, 0x39, 0x3d,
+	0xe8, 0xe2, 0x85, 0x6a, 0x5f, 0x7b, 0x47, 0x67, 0xfd, 0xc1, 0xeb, 0x66,
+	0x2b, 0xf1, 0x15, 0xc9, 0x92, 0x23, 0x0a, 0xcb, 0x61, 0xe2, 0xdb, 0xe4,
+	0x56, 0xdb, 0xf2, 0x56, 0xc6, 0xb0, 0x04, 0x5d, 0x00, 0xda, 0x22, 0x3b,
+	0x37, 0xeb, 0x99, 0x76, 0x23, 0xec, 0x87
+};
+
+static CK_RV
+override_C_Initialize (CK_VOID_PTR init_args)
+{
+	CK_OBJECT_CLASS klass = CKO_PUBLIC_KEY;
+	CK_KEY_TYPE rsa_type = CKK_RSA;
+	char rsa_label = "RSA";
+	CK_ATTRIBUTE rsa_pubkey = {
+		{ CKA_CLASS, &klass, sizeof (klass) },
+		{ CKA_LABEL, rsa_label, sizeof (rsa_label) - 1 },
+		{ CKA_KEY_TYPE, &rsa_type, sizeof (rsa_type) },
+		{ CKA_PUBLIC_KEY_INFO, NULL, 0 },
+		{ CKA_MODULUS, rsa_modulus, sizeof (rsa_modulus) },
+		{ CKA_PUBLIC_EXPONENT, rsa_public_exponent, sizeof (rsa_public_exponent) },
+		{ CKA_INVALID },
+	};
+	CK_KEY_TYPE ec_type = CKK_EC;
+	char ec_label = "EC";
+	CK_ATTRIBUTE ec_pubkey = {
+		{ CKA_CLASS, &klass, sizeof (klass) },
+		{ CKA_LABEL, ec_label, sizeof (ec_label) - 1 },
+		{ CKA_KEY_TYPE, &ec_type, sizeof (ec_type) },
+		{ CKA_PUBLIC_KEY_INFO, NULL, 0 },
+		{ CKA_EC_PARAMS, ec_params, sizeof (ec_params) },
+		{ CKA_EC_POINT, ec_point, sizeof (ec_point) },
+		{ CKA_INVALID },
+	};
+	char spki_label = "SPKI";
+	CK_ATTRIBUTE spki_pubkey = {
+		{ CKA_CLASS, &klass, sizeof (klass) },
+		{ CKA_LABEL, spki_label, sizeof (spki_label) - 1 },
+		{ CKA_KEY_TYPE, &ec_type, sizeof (ec_type) },
+		{ CKA_PUBLIC_KEY_INFO, spki, sizeof (spki) },
+		{ CKA_INVALID },
+	};
+	CK_RV rv;
+
+	rv = mock_C_Initialize (init_args);
+	mock_module_add_object (MOCK_SLOT_ONE_ID, rsa_pubkey);
+	mock_module_add_object (MOCK_SLOT_ONE_ID, ec_pubkey);
+	mock_module_add_object (MOCK_SLOT_ONE_ID, spki_pubkey);
+	return rv;
+}
+
+static CK_RV
+override_C_GetTokenInfo (CK_SLOT_ID slot_id,
+			 CK_TOKEN_INFO_PTR info)
+{
+	return_val_if_fail (info != NULL, CKR_ARGUMENTS_BAD);
+
+	if (slot_id == MOCK_SLOT_ONE_ID) {
+		memcpy (info, &MOCK_TOKEN_INFO, sizeof (*info));
+		return CKR_OK;
+	} else if (slot_id == MOCK_SLOT_TWO_ID) {
+		return CKR_TOKEN_NOT_PRESENT;
+	} else {
+		return CKR_SLOT_ID_INVALID;
+	}
+}
+
+#ifdef OS_WIN32
+__declspec(dllexport)
+#endif
+CK_RV
+C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
+{
+	mock_module_init ();
+	mock_module.C_GetFunctionList = C_GetFunctionList;
+	if (list == NULL)
+		return CKR_ARGUMENTS_BAD;
+	mock_module.C_Initialize = override_C_Initialize;
+	mock_module.C_GetTokenInfo = override_C_GetTokenInfo;
+	*list = &mock_module;
+	return CKR_OK;
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/mock-module-ep11.c Added

@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>
+ */
+
+#include "config.h"
+
+#define CRYPTOKI_EXPORTS 1
+#include "pkcs11.h"
+
+#include "attrs.h"
+#include "debug.h"
+#include "mock.h"
+
+#ifdef WITH_ASN1
+#include "persist.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+static const CK_TOKEN_INFO MOCK_TOKEN_INFO = {
+	"PROFILE LABEL ONE               ",
+	"PROFILE MANUFACTURER            ",
+	"PROFILE MODEL   ",
+	"PROFILE SERIAL  ",
+	CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_CLOCK_ON_TOKEN | CKF_TOKEN_INITIALIZED,
+	1,
+	2,
+	3,
+	4,
+	5,
+	6,
+	7,
+	8,
+	9,
+	10,
+	{ 75, 175 },
+	{ 85, 185 },
+	{ '1', '9', '9', '9', '0', '5', '2', '5', '0', '9', '1', '9', '5', '9', '0', '0' }
+};
+
+static CK_RV
+override_C_GetTokenInfo (CK_SLOT_ID slot_id,
+			 CK_TOKEN_INFO_PTR info)
+{
+	return_val_if_fail (info != NULL, CKR_ARGUMENTS_BAD);
+
+	switch (slot_id) {
+	case MOCK_SLOT_ONE_ID:
+		memcpy (info, &MOCK_TOKEN_INFO, sizeof (*info));
+		return CKR_OK;
+	case MOCK_SLOT_TWO_ID:
+		return CKR_TOKEN_NOT_PRESENT;
+	default:
+		return CKR_SLOT_ID_INVALID;
+	}
+}
+
+#ifdef WITH_ASN1
+static CK_RV
+override_C_Initialize (CK_VOID_PTR init_args)
+{
+	bool ok;
+	size_t i, size = 0;
+	void *data = NULL;
+	const char *filename = "test-profiles.p11-kit";
+	p11_mmap *map = NULL;
+	p11_persist *persist = NULL;
+	p11_array *objects = NULL;
+	CK_ATTRIBUTE *attrs = NULL;
+	CK_RV rv;
+
+	map = p11_mmap_open (filename, NULL, &data, &size);
+	if (map == NULL)
+		return mock_C_Initialize (init_args);
+
+	ok = p11_persist_magic (data, size);
+	return_val_if_fail (ok, CKR_GENERAL_ERROR);
+
+	persist = p11_persist_new ();
+	return_val_if_fail (persist != NULL, CKR_HOST_MEMORY);
+
+	objects = p11_array_new (NULL);
+	return_val_if_fail (objects != NULL, CKR_HOST_MEMORY);
+
+	ok = p11_persist_read (persist, filename, (const unsigned char *)data, size, objects);
+	return_val_if_fail (ok, CKR_GENERAL_ERROR);
+
+	rv = mock_C_Initialize (init_args);
+	for (i = 0; i < objects->num; ++i) {
+		attrs = p11_attrs_build (objects->elemi, NULL);
+		mock_module_add_object (MOCK_SLOT_ONE_ID, attrs);
+		p11_attrs_free (attrs);
+	}
+
+	p11_array_free (objects);
+	p11_persist_free (persist);
+	p11_mmap_close (map);
+	return rv;
+}
+
+static CK_RV
+override_C_Finalize (CK_VOID_PTR reserved)
+{
+	bool ok;
+	FILE *f = NULL;
+	const char *filename = "test-profiles.out.p11-kit";
+	p11_buffer buf;
+	p11_persist *persist = NULL;
+	CK_SESSION_HANDLE session = 0;
+	CK_OBJECT_HANDLE object = 0;
+	CK_ULONG count = 0;
+	CK_OBJECT_CLASS klass = CKO_PROFILE;
+	CK_BBOOL token;
+	CK_PROFILE_ID profile;
+	CK_ATTRIBUTE template = { CKA_CLASS, &klass, sizeof (klass) };
+	CK_ATTRIBUTE attrs = {
+		{ CKA_CLASS, &klass, sizeof (klass) },
+		{ CKA_TOKEN, &token, sizeof (token) },
+		{ CKA_PROFILE_ID, &profile, sizeof (profile) },
+		{ CKA_INVALID, NULL, 0 }
+	};
+	CK_ULONG n_attrs = sizeof (attrs) / sizeof (attrs0);
+	CK_RV rv;
+
+	ok = p11_buffer_init (&buf, 0);
+	return_val_if_fail (ok, CKR_HOST_MEMORY);
+
+	persist = p11_persist_new ();
+	return_val_if_fail (persist != NULL, CKR_HOST_MEMORY);
+
+	rv = mock_C_OpenSession (MOCK_SLOT_ONE_ID, CKF_SERIAL_SESSION, NULL, NULL, &session);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	rv = mock_C_FindObjectsInit (session, &template, 1);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	while ((rv = mock_C_FindObjects (session, &object, 1, &count)) == CKR_OK && count > 0) {
+		rv = mock_C_GetAttributeValue (session, object, attrs, n_attrs - 1);
+		return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+		ok = p11_persist_write (persist, attrs, &buf);
+		return_val_if_fail (ok, CKR_GENERAL_ERROR);
+	}
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	f = fopen (filename, "wb");
+	return_val_if_fail (f != NULL, CKR_HOST_MEMORY);
+	fwrite (buf.data, 1, buf.len, f);
+	fclose (f);
+
+	rv = mock_C_FindObjectsFinal (session);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	rv = mock_C_CloseSession (session);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	p11_persist_free (persist);
+	p11_buffer_uninit (&buf);
+	return mock_C_Finalize (reserved);
+}
+#endif /* WITH_ASN1 */
+
+#ifdef OS_WIN32
+__declspec(dllexport)
+#endif
+CK_RV
+C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
+{

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/mock-module-ep12.c Added

@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Zoltan Fridrich <zfridric@redhat.com>, Daiki Ueno
+ */
+
+#include "config.h"
+
+#define CRYPTOKI_EXPORTS 1
+#include "pkcs11.h"
+
+#include "attrs.h"
+#include "debug.h"
+#include "mock.h"
+
+#ifdef WITH_ASN1
+#include "persist.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+static const CK_TOKEN_INFO MOCK_TOKEN_INFO = {
+	"PERSIST LABEL ONE               ",
+	"PERSIST MANUFACTURER            ",
+	"PERSIST MODEL   ",
+	"PERSIST SERIAL  ",
+	CKF_LOGIN_REQUIRED | CKF_USER_PIN_INITIALIZED | CKF_CLOCK_ON_TOKEN | CKF_TOKEN_INITIALIZED,
+	1,
+	2,
+	3,
+	4,
+	5,
+	6,
+	7,
+	8,
+	9,
+	10,
+	{ 75, 175 },
+	{ 85, 185 },
+	{ '1', '9', '9', '9', '0', '5', '2', '5', '0', '9', '1', '9', '5', '9', '0', '0' }
+};
+
+static CK_RV
+override_C_GetTokenInfo (CK_SLOT_ID slot_id,
+			 CK_TOKEN_INFO_PTR info)
+{
+	return_val_if_fail (info != NULL, CKR_ARGUMENTS_BAD);
+
+	switch (slot_id) {
+	case MOCK_SLOT_ONE_ID:
+		memcpy (info, &MOCK_TOKEN_INFO, sizeof (*info));
+		return CKR_OK;
+	case MOCK_SLOT_TWO_ID:
+		return CKR_TOKEN_NOT_PRESENT;
+	default:
+		return CKR_SLOT_ID_INVALID;
+	}
+}
+
+#ifdef WITH_ASN1
+static CK_RV
+override_C_Initialize (CK_VOID_PTR init_args)
+{
+	bool ok;
+	size_t i, size = 0;
+	void *data = NULL;
+	const char *filename = "test-persist.p11-kit";
+	p11_mmap *map = NULL;
+	p11_persist *persist = NULL;
+	p11_array *objects = NULL;
+	CK_ATTRIBUTE *attrs = NULL;
+	CK_RV rv;
+
+	map = p11_mmap_open (filename, NULL, &data, &size);
+	if (map == NULL)
+		return mock_C_Initialize (init_args);
+
+	ok = p11_persist_magic (data, size);
+	return_val_if_fail (ok, CKR_GENERAL_ERROR);
+
+	persist = p11_persist_new ();
+	return_val_if_fail (persist != NULL, CKR_HOST_MEMORY);
+
+	objects = p11_array_new (NULL);
+	return_val_if_fail (objects != NULL, CKR_HOST_MEMORY);
+
+	ok = p11_persist_read (persist, filename, (const unsigned char *)data, size, objects);
+	return_val_if_fail (ok, CKR_GENERAL_ERROR);
+
+	rv = mock_C_Initialize (init_args);
+	for (i = 0; i < objects->num; ++i) {
+		attrs = p11_attrs_build (objects->elemi, NULL);
+		mock_module_add_object (MOCK_SLOT_ONE_ID, attrs);
+		p11_attrs_free (attrs);
+	}
+
+	p11_array_free (objects);
+	p11_persist_free (persist);
+	p11_mmap_close (map);
+	return rv;
+}
+
+struct WriteData {
+	p11_persist *persist;
+	p11_buffer buf;
+};
+
+static bool
+persist_enumerator (CK_OBJECT_HANDLE handle,
+		   CK_ATTRIBUTE *attrs,
+		   void *user_data)
+{
+	struct WriteData *data = user_data;
+
+	p11_persist_write (data->persist, attrs, &data->buf);
+
+	return true;
+}
+
+static CK_RV
+override_C_Finalize (CK_VOID_PTR reserved)
+{
+	bool ok;
+	FILE *f = NULL;
+	const char *filename = "test-persist.p11-kit";
+	CK_SESSION_HANDLE session = 0;
+	struct WriteData data;
+	CK_RV rv;
+
+	ok = p11_buffer_init (&data.buf, 0);
+	return_val_if_fail (ok, CKR_HOST_MEMORY);
+
+	data.persist = p11_persist_new ();
+	return_val_if_fail (data.persist != NULL, CKR_HOST_MEMORY);
+
+	rv = mock_C_OpenSession (MOCK_SLOT_ONE_ID, CKF_SERIAL_SESSION, NULL, NULL, &session);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	mock_module_enumerate_objects (session,
+				       persist_enumerator,
+				       &data);
+
+	rv = mock_C_CloseSession (session);
+	return_val_if_fail (rv == CKR_OK, CKR_GENERAL_ERROR);
+
+	f = fopen (filename, "wb");
+	return_val_if_fail (f != NULL, CKR_HOST_MEMORY);
+	fwrite (data.buf.data, 1, data.buf.len, f);
+	fclose (f);
+
+	p11_persist_free (data.persist);
+	p11_buffer_uninit (&data.buf);
+	return mock_C_Finalize (reserved);
+}
+#endif /* WITH_ASN1 */
+
+#ifdef OS_WIN32
+__declspec(dllexport)
+#endif
+CK_RV
+C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
+{
+	mock_module_init ();
+#ifdef WITH_ASN1
+	mock_module.C_Initialize = override_C_Initialize;
+	mock_module.C_Finalize = override_C_Finalize;
+#endif
+	mock_module.C_GetFunctionList = C_GetFunctionList;
+	mock_module.C_GetTokenInfo = override_C_GetTokenInfo;
+	if (list == NULL)

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/mock-module-ep9.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/mock-module-ep9.c Changed

@@ -37,13 +37,96 @@
 #define CRYPTOKI_EXPORTS 1
 #include "pkcs11.h"
 
+#include "attrs.h"
 #include "mock.h"
 
+#include <string.h>
+
 static CK_RV
 override_initialize (CK_VOID_PTR init_args)
 {
+	CK_OBJECT_CLASS cert_klass = CKO_CERTIFICATE;
+	char *cert_label = "TEST CERTIFICATE";
+	CK_CERTIFICATE_TYPE cert_type = CKC_X_509;
+	CK_BBOOL ck_true = CK_TRUE;
+	char cert_data = {
+		0x30, 0x82, 0x01, 0x6a, 0x30, 0x82, 0x01, 0x14, 0xa0, 0x03,
+		0x02, 0x01, 0x02, 0x02, 0x02, 0x03, 0xe7, 0x30, 0x0d, 0x06,
+		0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05,
+		0x05, 0x00, 0x30, 0x28, 0x31, 0x26, 0x30, 0x24, 0x06, 0x03,
+		0x55, 0x04, 0x03, 0x13, 0x1d, 0x66, 0x61, 0x72, 0x2d, 0x69,
+		0x6e, 0x2d, 0x74, 0x68, 0x65, 0x2d, 0x66, 0x75, 0x74, 0x75,
+		0x72, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+		0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x20, 0x17, 0x0d, 0x31, 0x33,
+		0x30, 0x33, 0x32, 0x37, 0x31, 0x36, 0x34, 0x39, 0x33, 0x33,
+		0x5a, 0x18, 0x0f, 0x32, 0x30, 0x36, 0x37, 0x31, 0x32, 0x32,
+		0x39, 0x31, 0x36, 0x34, 0x39, 0x33, 0x33, 0x5a, 0x30, 0x28,
+		0x31, 0x26, 0x30, 0x24, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
+		0x1d, 0x66, 0x61, 0x72, 0x2d, 0x69, 0x6e, 0x2d, 0x74, 0x68,
+		0x65, 0x2d, 0x66, 0x75, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x65,
+		0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d,
+		0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+		0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00,
+		0x30, 0x48, 0x02, 0x41, 0x00, 0xe2, 0x2d, 0x35, 0x70, 0x75,
+		0xc0, 0x07, 0x56, 0x40, 0x7d, 0x63, 0xbc, 0xd2, 0x60, 0xb3,
+		0xcf, 0xb8, 0x3d, 0x27, 0x6e, 0x10, 0xcd, 0x42, 0x50, 0x51,
+		0x9d, 0x79, 0x30, 0x79, 0x5a, 0xe3, 0xc3, 0x51, 0x38, 0x85,
+		0x4c, 0xb4, 0x91, 0xd9, 0xe6, 0x8d, 0x69, 0x6a, 0xd4, 0x9c,
+		0x1c, 0x49, 0xc2, 0x25, 0x2a, 0xc9, 0x2b, 0xf2, 0xf4, 0x8e,
+		0x8a, 0x3f, 0x8b, 0x4c, 0x97, 0xc3, 0x16, 0x96, 0x99, 0x02,
+		0x03, 0x01, 0x00, 0x01, 0xa3, 0x26, 0x30, 0x24, 0x30, 0x22,
+		0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x1b, 0x30, 0x19, 0x06,
+		0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x06,
+		0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x04, 0x06,
+		0x03, 0x2a, 0x03, 0x04, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+		0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03,
+		0x41, 0x00, 0xc2, 0x83, 0x27, 0x32, 0x80, 0x74, 0x73, 0xe2,
+		0xa3, 0x92, 0xaa, 0x7c, 0xd8, 0x50, 0xf4, 0x61, 0x50, 0xb1,
+		0x63, 0x9e, 0x29, 0xef, 0x38, 0x1d, 0xc0, 0x55, 0x20, 0x0f,
+		0x7e, 0xe9, 0x1f, 0xa1, 0x54, 0x1a, 0x5f, 0x8c, 0x26, 0x1b,
+		0x66, 0x96, 0x0e, 0x64, 0x52, 0x1c, 0x00, 0x96, 0xfb, 0x81,
+		0x77, 0xa2, 0x3a, 0x1d, 0x49, 0x0c, 0x03, 0xd5, 0x19, 0xf2,
+		0x6a, 0x01, 0x29, 0x31, 0xfb, 0xf5
+	};
+	CK_ATTRIBUTE cert_attrs = {
+		{ CKA_CLASS, &cert_klass, sizeof (cert_klass) },
+		{ CKA_LABEL, cert_label, strlen (cert_label) },
+		{ CKA_TRUSTED, &ck_true, sizeof (ck_true) },
+		{ CKA_COPYABLE, &ck_true, sizeof (ck_true) },
+		{ CKA_DESTROYABLE, &ck_true, sizeof (ck_true) },
+		{ CKA_CERTIFICATE_TYPE, &cert_type, sizeof (cert_type) },
+		{ CKA_VALUE, cert_data, sizeof (cert_data) },
+		{ CKA_INVALID, NULL, 0 },
+	};
+
+	CK_OBJECT_CLASS pubkey_klass = CKO_PUBLIC_KEY;
+	char *pubkey_label = "TEST PUBLIC KEY";
+	CK_KEY_TYPE pubkey_type = CKK_EC;
+	char pubkey_data = {
+		0x30, 0x76, 0x30, 0x10, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce,
+		0x3d, 0x02, 0x01, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x22,
+		0x03, 0x62, 0x00, 0x04, 0x9f, 0x52, 0xe5, 0xc0, 0xb3, 0x7f,
+		0x28, 0x16, 0x10, 0x45, 0x51, 0xfa, 0x1d, 0xf2, 0x0c, 0x4f,
+		0x37, 0xc4, 0xa8, 0x93, 0x95, 0xce, 0xd2, 0xde, 0x90, 0xb7,
+		0x21, 0xa7, 0x68, 0x62, 0xef, 0xc7, 0x02, 0x68, 0xc6, 0x3c,
+		0xd4, 0x50, 0x65, 0x62, 0xcf, 0x09, 0xf6, 0x5e, 0xe4, 0xad,
+		0xcf, 0x8c, 0xe1, 0xa0, 0x5e, 0x08, 0x66, 0x05, 0x8d, 0xb6,
+		0xbe, 0x86, 0x25, 0xed, 0xb4, 0x95, 0x8f, 0x2f, 0xbc, 0x9d,
+		0x94, 0x4f, 0xb9, 0x50, 0x6e, 0x14, 0x36, 0x49, 0xf7, 0x12,
+		0x8b, 0x3c, 0x12, 0x26, 0x41, 0xca, 0x2f, 0x43, 0x56, 0xcc,
+		0x9f, 0xcb, 0xd7, 0x9e, 0x8e, 0x1f, 0xbc, 0x01, 0x78, 0x29
+	};
+	CK_ATTRIBUTE pubkey_attrs = {
+		{ CKA_CLASS, &pubkey_klass, sizeof (pubkey_klass) },
+		{ CKA_LABEL, pubkey_label, strlen (pubkey_label) },
+		{ CKA_KEY_TYPE, &pubkey_type, sizeof (pubkey_type) },
+		{ CKA_PUBLIC_KEY_INFO, pubkey_data, sizeof (pubkey_data) },
+		{ CKA_INVALID, NULL, 0 },
+	};
+
 	CK_RV rv = mock_C_Initialize (init_args);
-	mock_module_add_profile (MOCK_SLOT_ONE_ID, CKP_PUBLIC_CERTIFICATES_TOKEN);
+	mock_module_add_object (MOCK_SLOT_ONE_ID, cert_attrs);
+	mock_module_add_object (MOCK_SLOT_ONE_ID, pubkey_attrs);
 	return rv;
 }

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/modules.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/modules.c Changed

@@ -365,6 +365,7 @@
 	dl_module_t dl;
 	char *error;
 	CK_RV rv;
+	int fallback = 0;
 
 	assert (mod != NULL);
 	assert (path != NULL);
@@ -383,18 +384,31 @@
 	mod->loaded_module = dl;
 
 	gi = p11_dl_symbol (dl, "C_GetInterface");
+
+#ifndef OS_WIN32
+	if (gi == C_GetInterface)
+		gi = NULL;
+#endif
+
 	if (gi) {
 		/* Get the default standard interface */
 		rv = gi ((unsigned char *)"PKCS 11", NULL, &interface, 0);
-		if (rv != CKR_OK) {
+		switch (rv) {
+		case CKR_FUNCTION_NOT_SUPPORTED:
+			fallback = 1;
+			break;
+		case CKR_OK:
+			/* TODO check the version and flag it somehere? */
+			*funcs = interface->pFunctionList;
+			break;
+		default:
 			p11_message (_("call to C_GetInterface failed in module: %s: %s"),
 				     path, p11_kit_strerror (rv));
 			return rv;
 		}
+	}
 
-		/* TODO check the version and flag it somehere? */
-		*funcs = interface->pFunctionList;
-	} else {
+	if (!gi || fallback) {
 		p11_debug ("C_GetInterface not available. Falling back to C_GetFunctionList()");
 
 		gfl = p11_dl_symbol (dl, "C_GetFunctionList");

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/p11-kit.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/p11-kit.c Changed

@@ -57,35 +57,63 @@
 #endif
 #define N_(x) (x)
 
-#include "tool.h"
+#include "options.h"
 
-int       p11_kit_list_modules    (int argc,
-                                   char *argv);
+int       p11_kit_list_modules     (int argc,
+                                    char *argv);
 
-int       p11_kit_list_profiles   (int argc,
-                                   char *argv);
+int       p11_kit_list_tokens      (int argc,
+                                    char *argv);
 
-int       p11_kit_add_profile     (int argc,
-                                   char *argv);
+int       p11_kit_list_objects     (int argc,
+                                    char *argv);
 
-int       p11_kit_delete_profile  (int argc,
-                                   char *argv);
+int       p11_kit_import_object    (int argc,
+                                    char *argv);
 
-int       p11_kit_print_config    (int argc,
-                                   char *argv);
+int       p11_kit_export_object    (int argc,
+                                    char *argv);
 
-int       p11_kit_trust           (int argc,
-                                   char *argv);
+int       p11_kit_delete_object    (int argc,
+                                    char *argv);
 
-int       p11_kit_external        (int argc,
-                                   char *argv);
+int       p11_kit_generate_keypair (int argc,
+                                    char *argv);
+
+int       p11_kit_list_profiles    (int argc,
+                                    char *argv);
+
+int       p11_kit_add_profile      (int argc,
+                                    char *argv);
+
+int       p11_kit_delete_profile   (int argc,
+                                    char *argv);
+
+int       p11_kit_list_mechanisms  (int argc,
+                                    char *argv);
+
+int       p11_kit_print_config     (int argc,
+                                    char *argv);
+
+int       p11_kit_trust            (int argc,
+                                    char *argv);
+
+int       p11_kit_external         (int argc,
+                                    char *argv);
 
 static const p11_tool_command commands = {
 	{ "list-modules", p11_kit_list_modules, N_("List modules and tokens") },
+	{ "list-tokens", p11_kit_list_tokens, N_("List tokens") },
+	{ "list-objects", p11_kit_list_objects, N_("List objects of a token") },
+	{ "import-object", p11_kit_import_object, N_("Import object into a token") },
+	{ "export-object", p11_kit_export_object, N_("Export object matching PKCS#11 URI") },
+	{ "delete-object", p11_kit_delete_object, N_("Delete objects matching PKCS#11 URI") },
+	{ "generate-keypair", p11_kit_generate_keypair, N_("Generate key-pair on a PKCS#11 token") },
 	{ "list-profiles", p11_kit_list_profiles, N_("List PKCS#11 profiles supported by the token") },
 	{ "add-profile", p11_kit_add_profile, N_("Add PKCS#11 profile to the token") },
 	{ "delete-profile", p11_kit_delete_profile, N_("Delete PKCS#11 profile from the token") },
 	{ "print-config", p11_kit_print_config, N_("Print merged configuration") },
+	{ "list-mechanisms", p11_kit_list_mechanisms, N_("List supported mechanisms") },
 	{ "remote", p11_kit_external, N_("Run a specific PKCS#11 module remotely") },
 	{ "server", p11_kit_external, N_("Run a server process that exposes PKCS#11 module remotely") },
 	{ P11_TOOL_FALLBACK, p11_kit_external, NULL },

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/pin.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/pin.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/print-config.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/print-config.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/proxy.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/proxy.c Changed

@@ -543,85 +543,6 @@
 }
 
 static CK_RV
-proxy_C_GetSlotInfo (CK_X_FUNCTION_LIST *self,
-                     CK_SLOT_ID id,
-                     CK_SLOT_INFO_PTR info)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_slot_to_real (state->px, &id, &map);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_GetSlotInfo) (id, info);
-}
-
-static CK_RV
-proxy_C_GetTokenInfo (CK_X_FUNCTION_LIST *self,
-                      CK_SLOT_ID id,
-                      CK_TOKEN_INFO_PTR info)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_slot_to_real (state->px, &id, &map);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_GetTokenInfo) (id, info);
-}
-
-static CK_RV
-proxy_C_GetMechanismList (CK_X_FUNCTION_LIST *self,
-                          CK_SLOT_ID id,
-                          CK_MECHANISM_TYPE_PTR mechanism_list,
-                          CK_ULONG_PTR count)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_slot_to_real (state->px, &id, &map);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_GetMechanismList) (id, mechanism_list, count);
-}
-
-static CK_RV
-proxy_C_GetMechanismInfo (CK_X_FUNCTION_LIST *self,
-                          CK_SLOT_ID id,
-                          CK_MECHANISM_TYPE type,
-                          CK_MECHANISM_INFO_PTR info)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_slot_to_real (state->px, &id, &map);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_GetMechanismInfo) (id, type, info);
-}
-
-static CK_RV
-proxy_C_InitToken (CK_X_FUNCTION_LIST *self,
-                   CK_SLOT_ID id,
-                   CK_UTF8CHAR_PTR pin,
-                   CK_ULONG pin_len,
-                   CK_UTF8CHAR_PTR label)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_slot_to_real (state->px, &id, &map);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_InitToken) (id, pin, pin_len, label);
-}
-
-static CK_RV
 proxy_C_WaitForSlotEvent (CK_X_FUNCTION_LIST *self,
                           CK_FLAGS flags,
                           CK_SLOT_ID_PTR slot,
@@ -805,1443 +726,7 @@
 	return rv;
 }
 
-static CK_RV
-proxy_C_InitPIN (CK_X_FUNCTION_LIST *self,
-                 CK_SESSION_HANDLE handle,
-                 CK_UTF8CHAR_PTR pin,
-                 CK_ULONG pin_len)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-
-	return (map.funcs->C_InitPIN) (handle, pin, pin_len);
-}
-
-static CK_RV
-proxy_C_SetPIN (CK_X_FUNCTION_LIST *self,
-                CK_SESSION_HANDLE handle,
-                CK_UTF8CHAR_PTR old_pin,
-                CK_ULONG old_pin_len,
-                CK_UTF8CHAR_PTR new_pin,
-                CK_ULONG new_pin_len)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-
-	return (map.funcs->C_SetPIN) (handle, old_pin, old_pin_len, new_pin, new_pin_len);
-}
-
-static CK_RV
-proxy_C_GetOperationState (CK_X_FUNCTION_LIST *self,
-                           CK_SESSION_HANDLE handle,
-                           CK_BYTE_PTR operation_state,
-                           CK_ULONG_PTR operation_state_len)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_GetOperationState) (handle, operation_state, operation_state_len);
-}
-
-static CK_RV
-proxy_C_SetOperationState (CK_X_FUNCTION_LIST *self,
-                           CK_SESSION_HANDLE handle,
-                           CK_BYTE_PTR operation_state,
-                           CK_ULONG operation_state_len,
-                           CK_OBJECT_HANDLE encryption_key,
-                           CK_OBJECT_HANDLE authentication_key)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_SetOperationState) (handle, operation_state, operation_state_len, encryption_key, authentication_key);
-}
-
-static CK_RV
-proxy_C_Login (CK_X_FUNCTION_LIST *self,
-               CK_SESSION_HANDLE handle,
-               CK_USER_TYPE user_type,
-               CK_UTF8CHAR_PTR pin,
-               CK_ULONG pin_len)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-
-	return (map.funcs->C_Login) (handle, user_type, pin, pin_len);
-}
-
-static CK_RV
-proxy_C_Logout (CK_X_FUNCTION_LIST *self,
-                CK_SESSION_HANDLE handle)
-{
-	State *state = (State *)self;
-	Mapping map;
-	CK_RV rv;
-
-	rv = map_session_to_real (state->px, &handle, &map, NULL);
-	if (rv != CKR_OK)
-		return rv;
-	return (map.funcs->C_Logout) (handle);
-}
-
-static CK_RV
-proxy_C_CreateObject (CK_X_FUNCTION_LIST *self,
-                      CK_SESSION_HANDLE handle,
-                      CK_ATTRIBUTE_PTR template,
-                      CK_ULONG count,
-                      CK_OBJECT_HANDLE_PTR new_object)
-{
-	State *state = (State *)self;

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/remote.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/remote.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/rpc-client.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/rpc-client.c Changed

@@ -173,6 +173,8 @@
            p11_rpc_message *msg,
            CK_RV ret)
 {
+	p11_buffer *buf;
+
 	assert (module != NULL);
 	assert (msg != NULL);
 
@@ -189,9 +191,9 @@
 
 	/* We used the same buffer for input/output, so this frees both */
 	assert (msg->input == msg->output);
-	p11_rpc_buffer_free (msg->input);
-
+	buf = msg->input;
 	p11_rpc_message_clear (msg);
+	p11_rpc_buffer_free (buf);
 
 	return ret;
 }
@@ -238,16 +240,11 @@
 		CK_ATTRIBUTE temp;
 
 		memset (&temp, 0, sizeof (temp));
-		if (!p11_rpc_buffer_get_attribute (msg->input, &offset, &temp)) {
+		if (!p11_rpc_message_get_attribute (msg, msg->input, &offset, &temp)) {
 			msg->parsed = offset;
 			return PARSE_ERROR;
 		}
 
-		if (IS_ATTRIBUTE_ARRAY (&temp)) {
-			p11_debug("recursive attribute array is not supported");
-			return PARSE_ERROR;
-		}
-
 		/* Try and stuff it in the output data */
 		if (arr) {
 			CK_ATTRIBUTE *attr = &(arri);
@@ -430,9 +427,13 @@
 	/* Make sure this is in the right order */
 	assert (!msg->signature || p11_rpc_message_verify_part (msg, "M"));
 
-	/* This case is valid for C_*Init () functions to cancel operation */
+	/*
+	 * The NULL mechanism is used for C_*Init () functions to
+	 * cancel operation.  We use a special value 0xffffffff as a
+	 * marker to indicate that.
+	 */
 	if (mech == NULL) {
-		p11_rpc_buffer_add_uint32 (msg->output, 0);
+		p11_rpc_buffer_add_uint32 (msg->output, 0xffffffff);
 		return p11_buffer_failed (msg->output) ? CKR_HOST_MEMORY : CKR_OK;
 	}
 
@@ -783,10 +784,11 @@
 			assert (module->vtable->disconnect != NULL);
 			(module->vtable->disconnect) (module->vtable, reserved);
 			ret = (module->vtable->connect) (module->vtable, reserved);
-
-			module->version = 0;
-			ret = (module->vtable->authenticate) (module->vtable,
-							      &module->version);
+			if (ret == CKR_OK) {
+				module->version = 0;
+				ret = (module->vtable->authenticate) (module->vtable,
+								      &module->version);
+			}
 		}
 #endif
 	}

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/rpc-message.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/rpc-message.c Changed

@@ -36,6 +36,7 @@
 #include "config.h"
 
 #define P11_DEBUG_FLAG P11_DEBUG_RPC
+#include "attrs.h"
 #include "debug.h"
 #include "library.h"
 #include "message.h"
@@ -243,34 +244,47 @@
 	return ok;
 }
 
-bool
-p11_rpc_message_write_attribute_buffer (p11_rpc_message *msg,
-                                        CK_ATTRIBUTE_PTR arr,
-                                        CK_ULONG num)
+static void
+p11_rpc_message_write_attribute_buffer_array (p11_rpc_message *msg,
+					      CK_ATTRIBUTE_PTR arr,
+					      CK_ULONG num)
 {
 	CK_ATTRIBUTE_PTR attr;
 	CK_ULONG i;
 
 	assert (num == 0 || arr != NULL);
-	assert (msg != NULL);
-	assert (msg->output != NULL);
-
-	/* Make sure this is in the right order */
-	assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
 
 	/* Write the number of items */
 	p11_rpc_buffer_add_uint32 (msg->output, num);
 
 	for (i = 0; i < num; ++i) {
-		attr = &(arri);
+		attr = arr + i;
 
 		/* The attribute type */
 		p11_rpc_buffer_add_uint32 (msg->output, attr->type);
 
 		/* And the attribute buffer length */
 		p11_rpc_buffer_add_uint32 (msg->output, attr->pValue ? attr->ulValueLen : 0);
+
+		if (IS_ATTRIBUTE_ARRAY (attr))
+			p11_rpc_message_write_attribute_buffer_array (
+				msg, attr->pValue,
+				attr->ulValueLen / sizeof (CK_ATTRIBUTE));
 	}
+}
+
+bool
+p11_rpc_message_write_attribute_buffer (p11_rpc_message *msg,
+					CK_ATTRIBUTE_PTR arr,
+					CK_ULONG num)
+{
+	assert (msg != NULL);
+	assert (msg->output != NULL);
 
+	/* Make sure this is in the right order */
+	assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
+
+	p11_rpc_message_write_attribute_buffer_array (msg, arr, num);
 	return !p11_buffer_failed (msg->output);
 }
 
@@ -903,19 +917,95 @@
 	}
 }
 
+static bool
+p11_rpc_message_get_byte_value (p11_rpc_message *msg,
+			        p11_buffer *buffer,
+			        size_t *offset,
+			        void *value,
+			        CK_ULONG *value_length)
+{
+	return p11_rpc_buffer_get_byte_value (buffer, offset, value, value_length);
+}
+
+static bool
+p11_rpc_message_get_ulong_value (p11_rpc_message *msg,
+			         p11_buffer *buffer,
+			         size_t *offset,
+			         void *value,
+			         CK_ULONG *value_length)
+{
+	return p11_rpc_buffer_get_ulong_value (buffer, offset, value, value_length);
+}
+
+static bool
+p11_rpc_message_get_attribute_array_value (p11_rpc_message *msg,
+					   p11_buffer *buffer,
+					   size_t *offset,
+					   void *value,
+					   CK_ULONG *value_length)
+{
+	uint32_t count, i;
+	CK_ATTRIBUTE *attr = value;
+
+	if (!p11_rpc_buffer_get_uint32 (buffer, offset, &count))
+		return false;
+
+	if (value_length != NULL)
+		*value_length = count * sizeof (CK_ATTRIBUTE);
+
+	if (value == NULL)
+		return true;
+
+	for (i = 0; i < count; ++i)
+		if (!p11_rpc_message_get_attribute (msg, buffer, offset, attr + i))
+			return false;
+
+	return true;
+}
+
+static bool
+p11_rpc_message_get_mechanism_type_array_value (p11_rpc_message *msg,
+					        p11_buffer *buffer,
+					        size_t *offset,
+					        void *value,
+					        CK_ULONG *value_length)
+{
+	return p11_rpc_buffer_get_mechanism_type_array_value (buffer, offset, value, value_length);
+}
+
+static bool
+p11_rpc_message_get_date_value (p11_rpc_message *msg,
+			        p11_buffer *buffer,
+			        size_t *offset,
+			        void *value,
+			        CK_ULONG *value_length)
+{
+	return p11_rpc_buffer_get_date_value (buffer, offset, value, value_length);
+}
+
+static bool
+p11_rpc_message_get_byte_array_value (p11_rpc_message *msg,
+				      p11_buffer *buffer,
+				      size_t *offset,
+				      void *value,
+				      CK_ULONG *value_length)
+{
+	return p11_rpc_buffer_get_byte_array_value (buffer, offset, value, value_length);
+}
+
 typedef struct {
 	p11_rpc_value_type type;
 	p11_rpc_value_encoder encode;
-	p11_rpc_value_decoder decode;
+	p11_rpc_message_decoder decode;
 } p11_rpc_attribute_serializer;
 
 static p11_rpc_attribute_serializer p11_rpc_attribute_serializers = {
-	{ P11_RPC_VALUE_BYTE, p11_rpc_buffer_add_byte_value, p11_rpc_buffer_get_byte_value },
-	{ P11_RPC_VALUE_ULONG, p11_rpc_buffer_add_ulong_value, p11_rpc_buffer_get_ulong_value },
-	{ P11_RPC_VALUE_ATTRIBUTE_ARRAY, p11_rpc_buffer_add_attribute_array_value, p11_rpc_buffer_get_attribute_array_value },
-	{ P11_RPC_VALUE_MECHANISM_TYPE_ARRAY, p11_rpc_buffer_add_mechanism_type_array_value, p11_rpc_buffer_get_mechanism_type_array_value },
-	{ P11_RPC_VALUE_DATE, p11_rpc_buffer_add_date_value, p11_rpc_buffer_get_date_value },
-	{ P11_RPC_VALUE_BYTE_ARRAY, p11_rpc_buffer_add_byte_array_value, p11_rpc_buffer_get_byte_array_value }
+	{ P11_RPC_VALUE_BYTE, p11_rpc_buffer_add_byte_value, p11_rpc_message_get_byte_value },
+	{ P11_RPC_VALUE_ULONG, p11_rpc_buffer_add_ulong_value, p11_rpc_message_get_ulong_value },
+	{ P11_RPC_VALUE_ATTRIBUTE_ARRAY, p11_rpc_buffer_add_attribute_array_value, p11_rpc_message_get_attribute_array_value },
+	{ P11_RPC_VALUE_MECHANISM_TYPE_ARRAY, p11_rpc_buffer_add_mechanism_type_array_value, p11_rpc_message_get_mechanism_type_array_value },
+	{ P11_RPC_VALUE_DATE, p11_rpc_buffer_add_date_value, p11_rpc_message_get_date_value },
+	{ P11_RPC_VALUE_BYTE_ARRAY, p11_rpc_buffer_add_byte_array_value, p11_rpc_message_get_byte_array_value }
 };
 
 P11_STATIC_ASSERT(sizeof(CK_BYTE) <= sizeof(uint8_t));
@@ -977,6 +1067,12 @@
 		return;
 	}
 
+	/* When value is NULL, write an empty attribute array */
+	if (attrs == NULL) {
+		p11_rpc_buffer_add_uint32 (buffer, 0);
+		return;
+	}
+
 	/* Write the number of items */
 	p11_rpc_buffer_add_uint32 (buffer, count);
 
@@ -1144,29 +1240,7 @@
 					  void *value,
 					  CK_ULONG *value_length)
 {
-	uint32_t count, i;
-	CK_ATTRIBUTE *attr, temp;
-
-	if (!p11_rpc_buffer_get_uint32 (buffer, offset, &count))
-		return false;
-
-	if (!value) {
-		memset (&temp, 0, sizeof (CK_ATTRIBUTE));
-		attr = &temp;
-	} else
-		attr = value;
-
-	for (i = 0; i < count; i++) {
-		if (!p11_rpc_buffer_get_attribute (buffer, offset, attr))

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/rpc-message.h -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/rpc-message.h Changed

@@ -276,9 +276,6 @@
 	P11_RPC_VALUE_BYTE_ARRAY
 } p11_rpc_value_type;
 
-typedef void (*p11_rpc_value_encoder) (p11_buffer *, const void *, CK_ULONG);
-typedef bool (*p11_rpc_value_decoder) (p11_buffer *, size_t *, void *, CK_ULONG *);
-
 typedef enum _p11_rpc_message_type {
 	P11_RPC_REQUEST = 1,
 	P11_RPC_RESPONSE
@@ -295,6 +292,10 @@
 	void *extra;
 } p11_rpc_message;
 
+typedef void (*p11_rpc_value_encoder) (p11_buffer *, const void *, CK_ULONG);
+typedef bool (*p11_rpc_value_decoder) (p11_buffer *, size_t *, void *, CK_ULONG *);
+typedef bool (*p11_rpc_message_decoder) (p11_rpc_message *msg, p11_buffer *, size_t *, void *, CK_ULONG *);
+
 void             p11_rpc_message_init                    (p11_rpc_message *msg,
                                                           p11_buffer *input,
                                                           p11_buffer *output);
@@ -371,6 +372,11 @@
 bool             p11_rpc_message_read_version            (p11_rpc_message *msg,
                                                           CK_VERSION* version);
 
+bool             p11_rpc_message_get_attribute           (p11_rpc_message *msg,
+							  p11_buffer *buffer,
+							  size_t *offset,
+							  CK_ATTRIBUTE *attr);
+
 p11_buffer *     p11_rpc_buffer_new                      (size_t reserve);
 
 p11_buffer *     p11_rpc_buffer_new_full                 (size_t reserve,

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/rpc-server.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/rpc-server.c Changed

@@ -247,21 +247,15 @@
 }
 
 static CK_RV
-proto_read_attribute_buffer (p11_rpc_message *msg,
-                             CK_ATTRIBUTE_PTR *result,
-                             CK_ULONG *n_result)
+proto_read_attribute_buffer_array (p11_rpc_message *msg,
+				   CK_ATTRIBUTE_PTR *result,
+				   CK_ULONG *n_result)
 {
-	CK_ATTRIBUTE_PTR attrs;
+	CK_RV rv;
+	CK_ATTRIBUTE_PTR attrs, array;
+	CK_ULONG n_array;
 	uint32_t n_attrs, i;
-	uint32_t value;
-
-	assert (msg != NULL);
-	assert (result != NULL);
-	assert (n_result != NULL);
-	assert (msg->input != NULL);
-
-	/* Make sure this is in the right order */
-	assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
+	uint32_t type, length;
 
 	/* Read the number of attributes */
 	if (!p11_rpc_buffer_get_uint32 (msg->input, &msg->parsed, &n_attrs))
@@ -276,23 +270,32 @@
 	for (i = 0; i < n_attrs; ++i) {
 
 		/* The attribute type */
-		if (!p11_rpc_buffer_get_uint32 (msg->input, &msg->parsed, &value))
+		if (!p11_rpc_buffer_get_uint32 (msg->input, &msg->parsed, &type))
 			return PARSE_ERROR;
 
-		attrsi.type = value;
+		attrsi.type = type;
 
 		/* The number of bytes to allocate */
-		if (!p11_rpc_buffer_get_uint32 (msg->input, &msg->parsed, &value))
+		if (!p11_rpc_buffer_get_uint32 (msg->input, &msg->parsed, &length))
 			return PARSE_ERROR;
 
-		if (value == 0) {
+		if (length == 0) {
 			attrsi.pValue = NULL;
 			attrsi.ulValueLen = 0;
+		} else if (IS_ATTRIBUTE_ARRAY (attrs + i)) {
+			rv = proto_read_attribute_buffer_array (msg, &array, &n_array);
+			if (rv != CKR_OK)
+				return rv;
+			if ((n_array != 0 && ULONG_MAX / n_array < sizeof (CK_ATTRIBUTE)) ||
+			    length < n_array * sizeof (CK_ATTRIBUTE))
+				return PARSE_ERROR;
+			attrsi.pValue = (n_array == 0) ? NULL : array;
+			attrsi.ulValueLen = n_array * sizeof (CK_ATTRIBUTE);
 		} else {
-			attrsi.pValue = p11_rpc_message_alloc_extra (msg, value);
+			attrsi.pValue = p11_rpc_message_alloc_extra (msg, length);
 			if (!attrsi.pValue)
 				return CKR_DEVICE_MEMORY;
-			attrsi.ulValueLen = value;
+			attrsi.ulValueLen = length;
 		}
 	}
 
@@ -302,6 +305,22 @@
 }
 
 static CK_RV
+proto_read_attribute_buffer (p11_rpc_message *msg,
+			     CK_ATTRIBUTE_PTR *result,
+			     CK_ULONG *n_result)
+{
+	assert (msg != NULL);
+	assert (result != NULL);
+	assert (n_result != NULL);
+	assert (msg->input != NULL);
+
+	/* Make sure this is in the right order */
+	assert (!msg->signature || p11_rpc_message_verify_part (msg, "fA"));
+
+	return proto_read_attribute_buffer_array (msg, result, n_result);
+}
+
+static CK_RV
 proto_read_attribute_array (p11_rpc_message *msg,
                             CK_ATTRIBUTE_PTR *result,
                             CK_ULONG *n_result)
@@ -327,39 +346,9 @@
 		return CKR_DEVICE_MEMORY;
 
 	/* Now go through and fill in each one */
-	for (i = 0; i < n_attrs; ++i) {
-		size_t offset = msg->parsed;
-		CK_ATTRIBUTE temp;
-
-		/* Check the length needed to store the value */
-		memset (&temp, 0, sizeof (temp));
-		if (!p11_rpc_buffer_get_attribute (msg->input, &offset, &temp)) {
-			msg->parsed = offset;
+	for (i = 0; i < n_attrs; ++i)
+		if (!p11_rpc_message_get_attribute (msg, msg->input, &msg->parsed, &attrsi))
 			return PARSE_ERROR;
-		}
-
-		if (IS_ATTRIBUTE_ARRAY (&temp)) {
-			p11_debug("recursive attribute array is not supported");
-			return PARSE_ERROR;
-		}
-
-		attrsi.type = temp.type;
-
-		/* Whether this one is valid or not */
-		if (temp.ulValueLen != ((CK_ULONG)-1)) {
-			size_t offset2 = msg->parsed;
-			attrsi.pValue = p11_rpc_message_alloc_extra (msg, temp.ulValueLen);
-			if (!p11_rpc_buffer_get_attribute (msg->input, &offset2, &attrsi)) {
-				msg->parsed = offset2;
-				return PARSE_ERROR;
-			}
-		} else {
-			attrsi.pValue = NULL;
-			attrsi.ulValueLen = -1;
-		}
-
-		msg->parsed = offset;
-	}
 
 	*result = attrs;
 	*n_result = n_attrs;
@@ -480,8 +469,14 @@
 		return PARSE_ERROR;
 	}
 
-	if (temp.mechanism == 0) {
+	/*
+	 * The NULL mechanism is used for C_*Init () functions to
+	 * cancel operation.  We use a special value 0xffffffff as a
+	 * marker to indicate that.
+	 */
+	if (temp.mechanism == 0xffffffff) {
 		*mech = NULL;
+		msg->parsed = offset;
 		return CKR_OK;
 	}

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/server.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/server.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/base-wrappers.py Added

@@ -0,0 +1,40 @@
+{
+    "function_name": "base_{function}",
+    "function_argument": "{argument_type} {argument_name}",
+    "call_lower": "return funcs->{function}",
+    "call_lower_argument": "{argument_name}",
+    "function_body": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}p11_virtual *virt = (p11_virtual *)self;
+{indent}CK_FUNCTION_LIST *funcs = virt->lower_module;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "function_body_v3": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}p11_virtual *virt = (p11_virtual *)self;
+{indent}CK_FUNCTION_LIST_3_0 *funcs = virt->lower_module;
+{indent}if (funcs->version.major < 3)
+{indent}{indent}return CKR_FUNCTION_NOT_SUPPORTED;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "entry_argument": "",       # unused
+    "entry": "{function_name}",
+    "outer": """
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+
+{wrappers}
+
+CK_X_FUNCTION_LIST p11_virtual_base = {{
+{indent}{{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }},  /* version */
+{xentries}
+}};
+"""
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/binding-wrappers.py Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/fixed-wrappers.py Added

@@ -0,0 +1,117 @@
+{
+    "function_name": "fixed ## fixed_index ## _{function}",
+    "function_name_short": "short_{function}",
+    "function_argument": "{argument_type} {argument_name}",
+    "call_lower": "return funcs->{function}",
+    "call_lower_argument": "{argument_name}",
+    "function_body": """\
+static CK_RV \\
+{function_name} ({arglist}) \\
+{{ \\
+{indent}CK_FUNCTION_LIST_3_0 *bound; \\
+{indent}Wrapper *wrapper; \\
+{indent}CK_X_FUNCTION_LIST *funcs; \\
+{indent}bound = fixed_closuresfixed_index; \\
+{indent}return_val_if_fail (bound != NULL, CKR_GENERAL_ERROR); \\
+{indent}wrapper = (Wrapper *) bound; \\
+{indent}funcs = &wrapper->virt->funcs; \\
+{indent}{call_lower} (funcs, \\
+{call_lower_arglist_indent}{call_lower_arglist}); \\
+}} \\
+""",
+    "entry_argument": "",
+    "entry": "{function_name}",
+    "outer": """
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+
+#define P11_VIRTUAL_FIXED_FUNCTIONS(fixed_index)        \\
+{wrappers}\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list); \\
+\\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetInterfaceList (CK_INTERFACE_PTR pInterfacesList, \\
+                                             CK_ULONG_PTR pulCount); \\
+\\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetInterface (CK_UTF8CHAR_PTR pInterfaceName, \\
+                                         CK_VERSION_PTR pVersion, \\
+                                         CK_INTERFACE_PTR_PTR ppInterface, \\
+                                         CK_FLAGS flags);
+
+#define P11_VIRTUAL_FIXED_GET_FUNCTION_LIST(fixed_index) \\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list) \\
+{{ \\
+        if (!list) \\
+                return CKR_ARGUMENTS_BAD; \\
+        *list = (CK_FUNCTION_LIST *)fixed_closuresfixed_index; \\
+        return CKR_OK; \\
+}}
+
+#define P11_VIRTUAL_FIXED_GET_INTERFACE_LIST(fixed_index) \\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetInterfaceList (CK_INTERFACE_PTR pInterfacesList, \\
+                                             CK_ULONG_PTR pulCount) \\
+{{ \\
+        CK_RV rv = CKR_OK; \\
+\\
+        if (pulCount == NULL_PTR) \\
+                return CKR_ARGUMENTS_BAD; \\
+\\
+        if (pInterfacesList == NULL_PTR) {{ \\
+                *pulCount = 1; \\
+                return CKR_OK; \\
+        }} \\
+\\
+        if (*pulCount < 1) {{ \\
+                *pulCount = 1; \\
+                return CKR_BUFFER_TOO_SMALL; \\
+        }} \\
+\\
+        if (rv == CKR_OK) {{ \\
+                memcpy (pInterfacesList, \\
+                        fixed_interfacesfixed_index, \\
+                        sizeof(CK_INTERFACE)); \\
+                *pulCount = 1; \\
+        }} \\
+\\
+        return rv; \\
+}}
+
+#define P11_VIRTUAL_FIXED_GET_INTERFACE(fixed_index) \\
+static CK_RV \\
+fixed ## fixed_index ## _C_GetInterface (CK_UTF8CHAR_PTR pInterfaceName, \\
+                                         CK_VERSION_PTR pVersion, \\
+                                         CK_INTERFACE_PTR_PTR ppInterface, \\
+                                         CK_FLAGS flags) \\
+{{ \\
+        CK_INTERFACE_PTR interface = fixed_interfacesfixed_index; \\
+        CK_VERSION_PTR cmp_version = &fixed_closuresfixed_index->version; \\
+\\
+        if (ppInterface == NULL_PTR) {{ \\
+                return CKR_ARGUMENTS_BAD; \\
+        }} \\
+\\
+        if (pInterfaceName == NULL) {{ \\
+                *ppInterface = interface; \\
+                return CKR_OK; \\
+        }} \\
+\\
+        if (strcmp ((char *)pInterfaceName, interface->pInterfaceName) != 0 || \\
+            (pVersion != NULL && (pVersion->major != cmp_version->major || \\
+                                  pVersion->minor != cmp_version->minor)) || \\
+            ((flags & interface->flags) != flags)) {{ \\
+                return CKR_ARGUMENTS_BAD; \\
+        }} \\
+        *ppInterface = interface; \\
+        return CKR_OK; \\
+}}
+
+#define P11_VIRTUAL_FIXED_INITIALIZER(fixed_index) \\
+{{ \\
+{indent}{{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }},  /* version */ \\
+{entries} \\
+}}
+"""
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/proxy-excludes.list Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/proxy-wrappers.py Added

@@ -0,0 +1,100 @@
+{
+    "function_name": "proxy_{function}",
+    "function_argument": "{argument_type} {argument_name}",
+    "call_lower": "return map.funcs->{function}",
+    "call_lower_v3": "return ((CK_FUNCTION_LIST_3_0_PTR)map.funcs)->{function}",
+    "call_lower_argument": "{argument_name}",
+    "function_body_with_slot": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}State *state = (State *)self;
+{indent}Mapping map;
+{indent}CK_RV rv;
+
+{indent}rv = map_slot_to_real (state->px, &slotID, &map);
+{indent}if (rv != CKR_OK)
+{indent}{indent}return rv;
+{indent}if (map.funcs->version.major < 3)
+{indent}{indent}return CKR_FUNCTION_NOT_SUPPORTED;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "function_body_with_slot_v3": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}State *state = (State *)self;
+{indent}Mapping map;
+{indent}CK_RV rv;
+
+{indent}rv = map_slot_to_real (state->px, &slotID, &map);
+{indent}if (rv != CKR_OK)
+{indent}{indent}return rv;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "function_body_with_session_v3": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}State *state = (State *)self;
+{indent}Mapping map;
+{indent}CK_RV rv;
+
+{indent}rv = map_session_to_real (state->px, &session, &map, NULL);
+{indent}if (rv != CKR_OK)
+{indent}{indent}return rv;
+{indent}if (map.funcs->version.major < 3)
+{indent}{indent}return CKR_FUNCTION_NOT_SUPPORTED;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "function_body_with_session": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}State *state = (State *)self;
+{indent}Mapping map;
+{indent}CK_RV rv;
+
+{indent}rv = map_session_to_real (state->px, &session, &map, NULL);
+{indent}if (rv != CKR_OK)
+{indent}{indent}return rv;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "function_body_with_session_v3": """\
+static CK_RV
+{function_name} (CK_X_FUNCTION_LIST *self,
+{arglist_indent}{arglist})
+{{
+{indent}State *state = (State *)self;
+{indent}Mapping map;
+{indent}CK_RV rv;
+
+{indent}rv = map_session_to_real (state->px, &session, &map, NULL);
+{indent}if (rv != CKR_OK)
+{indent}{indent}return rv;
+{indent}if (map.funcs->version.major < 3)
+{indent}{indent}return CKR_FUNCTION_NOT_SUPPORTED;
+{indent}{call_lower} ({call_lower_arglist});
+}}
+    """,
+    "entry_argument": "",       # unused
+    "entry": "{function_name}",
+    "outer": """
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+
+{wrappers}
+
+CK_X_FUNCTION_LIST proxy_functions = {{
+{indent}{{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }},  /* version */
+{xentries}
+}};
+"""
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/stack-wrappers.py Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/templates/virtual-excludes.list Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-export-public.sh Added

@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Test public key export from mock-twelve.so (mock-module-ep10.c).
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-objects-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_export_public_rsa() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=rsa --bits=2048 --label=RSA 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=RSA;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK4hLgsRxltV0MudYWt2
+yZYWgjHh1B2G5EuJDRvjkYIGiFl6nDk9akWxawgJoVmnZg3Y0a4ogk0H8++WXOZj
+bVL1vYq9fxQm2KMNZPX0TM/efh0P8YM8lAyxiiCnCwGkffbUFqOa++4T/30FRfeX
+D1YaNYH1ZPf2CKSlm6uUIyqFOakxLcaTVj6oXif4NWtg6Edu6I1rES1sBMnsKQQE
+lLXoKLJovpzZgIeJfaxXhnQxfWFH4Ye0BAF4YtzoDXXnSfKVioiwNS06i6ZH9Ztd
+P20Te0/BDjxPMmTwml/j5NW/nM0N4tldl2HxbwgEkq+m4aVFYGrp0KOihgC5kDGO
+fQIDAQAB
+-----END PUBLIC KEY-----
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q "pkcs11:model=PUBKEY%20MODEL;object=RSA;type=public" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_export_public_ec() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=ecdsa --curve=secp256r1 --label=EC 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=EC;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaTJt0debXaW7Hpcrpn7X07SsTk9
+6OKFal97R2f9wetmK/EVyZIjCsth4tvkVtvyVsawBF0A2iI7N+uZdiPshw==
+-----END PUBLIC KEY-----
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q "pkcs11:model=PUBKEY%20MODEL;object=EC;type=public" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_export_public_spki() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=ecdsa --curve=secp256r1 --label=EC 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=EC;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaTJt0debXaW7Hpcrpn7X07SsTk9
+6OKFal97R2f9wetmK/EVyZIjCsth4tvkVtvyVsawBF0A2iI7N+uZdiPshw==
+-----END PUBLIC KEY-----
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q "pkcs11:model=PUBKEY%20MODEL;object=SPKI;type=public" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+run test_export_public_rsa test_export_public_ec test_export_public_spki

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-generate-keypair.sh Added

@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+: ${P11_MODULE_PATH="$abs_top_builddir"/.libs}
+
+setup() {
+	testdir=$PWD/test-genkey-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_generate_keypair_mock() {
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label=mock --type=mock "pkcs11:token=PUBKEY%20LABEL?pin-value=booo"; then
+		assert_fail "unable to run p11-kit generate-keypair"
+	fi
+}
+
+test_generate_keypair_rsa() {
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label=rsa --type=rsa --bits=2048 "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+		assert_fail "expected to fail: p11-kit generate-keypair"
+	fi
+	assert_contains err.out "key-pair generation failed: The crypto mechanism is invalid or unrecognized"
+
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label=rsa --type=rsa "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+		assert_fail "expected to fail: p11-kit generate-keypair"
+	fi
+	assert_contains err.out "no bits specified"
+}
+
+test_generate_keypair_ecdsa() {
+	for curve in secp256r1 secp384r1 secp521r1; do
+		if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label="ecdsa-$curve" --type=ecdsa --curve="$curve" "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+			assert_fail "expected to fail: p11-kit generate-keypair"
+		fi
+		assert_contains err.out "key-pair generation failed: The crypto mechanism is invalid or unrecognized"
+	done
+
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label="ecdsa-unknown" --type=ecdsa --curve=unknown "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+		assert_fail "p11-kit generate-keypair succeeded for unknown ecdsa curve"
+	fi
+	assert_contains err.out "unknown curve name: unknown"
+}
+
+test_generate_keypair_eddsa() {
+	for curve in ed25519 ed448; do
+		if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label="eddsa-$curve" --type=eddsa --curve="$curve" "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+			assert_fail "expected to fail: p11-kit generate-keypair"
+		fi
+		assert_contains err.out "key-pair generation failed: The crypto mechanism is invalid or unrecognized"
+	done
+
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable generate-keypair --login --label="eddsa-unknown" --type=eddsa --curve=unknown "pkcs11:token=PUBKEY%20LABEL?pin-value=booo" 2> err.out; then
+		assert_fail "p11-kit generate-keypair succeeded for unknown eddsa curve"
+	fi
+	assert_contains err.out "unknown curve name: unknown"
+}
+
+run test_generate_keypair_mock test_generate_keypair_rsa \
+    test_generate_keypair_ecdsa test_generate_keypair_eddsa

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-import-public.sh Added

@@ -0,0 +1,98 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+test "${abs_top_srcdir+set}" = set || {
+	echo "set abs_top_srcdir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-import-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_import_cert() {
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable import-object -q --login --file="$abs_top_srcdir"/trust/fixtures/cacert3.pem --label=cert --id="1a:bc:f6:9a" "pkcs11:token=PERSIST%20LABEL%20ONE?pin-value=booo"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q --login "pkcs11:token=PERSIST%20LABEL%20ONE;object=cert;id=%1A%BC%F6%9A?pin-value=booo" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} "$abs_top_srcdir"/trust/fixtures/cacert3.pem export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_import_pubkey_rsa() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=rsa --bits=2048 --label=RSA 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=RSA;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK4hLgsRxltV0MudYWt2
+yZYWgjHh1B2G5EuJDRvjkYIGiFl6nDk9akWxawgJoVmnZg3Y0a4ogk0H8++WXOZj
+bVL1vYq9fxQm2KMNZPX0TM/efh0P8YM8lAyxiiCnCwGkffbUFqOa++4T/30FRfeX
+D1YaNYH1ZPf2CKSlm6uUIyqFOakxLcaTVj6oXif4NWtg6Edu6I1rES1sBMnsKQQE
+lLXoKLJovpzZgIeJfaxXhnQxfWFH4Ye0BAF4YtzoDXXnSfKVioiwNS06i6ZH9Ztd
+P20Te0/BDjxPMmTwml/j5NW/nM0N4tldl2HxbwgEkq+m4aVFYGrp0KOihgC5kDGO
+fQIDAQAB
+-----END PUBLIC KEY-----
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable import-object -q --login --file="export.exp" --label=rsa --id="2a:bc:f6:9a" "pkcs11:token=PERSIST%20LABEL%20ONE?pin-value=booo"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q --login "pkcs11:token=PERSIST%20LABEL%20ONE;object=rsa;id=%2A%BC%F6%9A?pin-value=booo" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_import_pubkey_ec() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=ecdsa --curve=secp256r1 --label=EC 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=EC;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaTJt0debXaW7Hpcrpn7X07SsTk9
+6OKFal97R2f9wetmK/EVyZIjCsth4tvkVtvyVsawBF0A2iI7N+uZdiPshw==
+-----END PUBLIC KEY-----
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable import-object -q --login --file="export.exp" --label=ec --id="3a:bc:f6:9a" "pkcs11:token=PERSIST%20LABEL%20ONE?pin-value=booo"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable export-object -q --login "pkcs11:token=PERSIST%20LABEL%20ONE;object=ec;id=%3A%BC%F6%9A?pin-value=booo" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+run test_import_cert test_import_pubkey_rsa test_import_pubkey_ec

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-iter.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-iter.c Changed

@@ -43,6 +43,7 @@
 #include "library.h"
 #include "message.h"
 #include "mock.h"
+#include "pin.h"
 
 #include <assert.h>
 #include <string.h>
@@ -91,7 +92,7 @@
 static void
 test_all (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR *modules;
 	CK_FUNCTION_LIST_PTR module;
 	CK_SESSION_HANDLE session;
@@ -179,7 +180,7 @@
 static void
 test_callback (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR *modules;
 	P11KitIter *iter;
 	CK_RV rv;
@@ -273,7 +274,7 @@
 static void
 test_with_session (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_SESSION_HANDLE session;
 	CK_FUNCTION_LIST_PTR module;
 	CK_SLOT_ID slot;
@@ -331,7 +332,7 @@
 static void
 test_with_slot (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR module;
 	CK_SLOT_ID slot;
 	P11KitIter *iter;
@@ -379,7 +380,7 @@
 static void
 test_with_module (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR module;
 	P11KitIter *iter;
 	CK_RV rv;
@@ -483,7 +484,7 @@
 static void
 test_uri_with_type (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR *modules;
 	P11KitIter *iter;
 	P11KitUri *uri;
@@ -556,7 +557,7 @@
 static void
 test_filter (void)
 {
-	CK_OBJECT_HANDLE objects128;
+	CK_OBJECT_HANDLE objects128 = { 0 };
 	CK_FUNCTION_LIST_PTR *modules;
 	P11KitIter *iter;
 	CK_RV rv;
@@ -958,7 +959,9 @@
 }
 
 static void
-test_token_match (void)
+iter_token_match (const char *string,
+		  P11KitIterBehavior behavior,
+		  int expected_count)
 {
 	CK_FUNCTION_LIST_PTR *modules;
 	P11KitIter *iter;
@@ -970,10 +973,10 @@
 	modules = initialize_and_get_modules ();
 
 	uri = p11_kit_uri_new ();
-	ret = p11_kit_uri_parse ("pkcs11:manufacturer=TEST%20MANUFACTURER", P11_KIT_URI_FOR_TOKEN, uri);
+	ret = p11_kit_uri_parse (string, P11_KIT_URI_FOR_TOKEN, uri);
 	assert_num_eq (P11_KIT_URI_OK, ret);
 
-	iter = p11_kit_iter_new (uri, 0);
+	iter = p11_kit_iter_new (uri, behavior);
 	p11_kit_uri_free (uri);
 
 	p11_kit_iter_begin (iter, modules);
@@ -985,7 +988,7 @@
 	assert (rv == CKR_CANCEL);
 
 	/* Three modules, each with 1 slot, and 3 public objects */
-	assert_num_eq (9, count);
+	assert_num_eq (expected_count, count);
 
 	p11_kit_iter_free (iter);
 
@@ -993,6 +996,46 @@
 }
 
 static void
+test_token_match (void)
+{
+	/* Three modules, each with 1 slot, and 3 public objects */
+	iter_token_match ("pkcs11:manufacturer=TEST%20MANUFACTURER", 0, 9);
+}
+
+static P11KitPin *
+login_callback (const char *pin_source,
+		P11KitUri *pin_uri,
+		const char *pin_description,
+		P11KitPinFlags pin_flags,
+		void *callback_data)
+{
+	int *called = callback_data;
+	(*called)++;
+
+	assert_str_eq ("PIN for TEST LABEL", pin_description);
+	return p11_kit_pin_new_for_buffer ((unsigned char*)strdup ("booo"), 4,
+					   free);
+}
+
+static void
+test_token_match_with_login (void)
+{
+	int called = 0;
+
+	p11_kit_pin_register_callback ("my-pin-source", login_callback,
+	                               &called, NULL);
+
+	/* Three modules, each with 1 slot, 3 public and 2 private objects */
+	iter_token_match ("pkcs11:manufacturer=TEST%20MANUFACTURER"
+			  "?pin-source=my-pin-source",
+			  P11_KIT_ITER_WITH_LOGIN, 15);
+
+	assert_num_eq (3, called);
+
+	p11_kit_pin_unregister_callback ("my-pin-source", login_callback, NULL);
+}
+
+static void
 test_token_mismatch (void)
 {
 	CK_FUNCTION_LIST_PTR *modules;
@@ -1028,7 +1071,9 @@
 }
 
 static void
-test_token_only (void)
+iter_token_only (const char *string,
+		 P11KitIterBehavior behavior,
+		 int expected_count)
 {
 	CK_FUNCTION_LIST_PTR *modules;
 	P11KitIter *iter;
@@ -1040,10 +1085,13 @@
 	modules = initialize_and_get_modules ();
 
 	uri = p11_kit_uri_new ();
-	ret = p11_kit_uri_parse ("pkcs11:manufacturer=TEST%20MANUFACTURER", P11_KIT_URI_FOR_TOKEN, uri);
+	ret = p11_kit_uri_parse (string, P11_KIT_URI_FOR_TOKEN, uri);
 	assert_num_eq (P11_KIT_URI_OK, ret);
 
-	iter = p11_kit_iter_new (uri, P11_KIT_ITER_WITH_TOKENS | P11_KIT_ITER_WITHOUT_OBJECTS);
+	iter = p11_kit_iter_new (uri,
+				 behavior |
+				 P11_KIT_ITER_WITH_TOKENS |
+				 P11_KIT_ITER_WITHOUT_OBJECTS);
 	p11_kit_uri_free (uri);
 
 	p11_kit_iter_begin (iter, modules);
@@ -1057,8 +1105,7 @@
 
 	assert (rv == CKR_CANCEL);
 
-	/* Three modules, each with 1 slot, and 3 public objects */
-	assert_num_eq (3, count);
+	assert_num_eq (expected_count, count);
 
 	p11_kit_iter_free (iter);
 
@@ -1066,6 +1113,31 @@
 }
 
 static void
+test_token_only (void)
+{
+	/* Three modules, each with 1 slot, and 3 public objects */
+	iter_token_only ("pkcs11:manufacturer=TEST%20MANUFACTURER", 0, 3);
+}
+
+static void
+test_token_only_with_login (void)

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-list-mechanisms.sh Added

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-mechanisms-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_list_mechanisms_multi() {  # pkcs11: matches only the first token
+	cat > list.exp <<EOF
+0x80000001 (unknown): encrypt decrypt key-size=512-4096
+0x80000002 (unknown): sign verify key-size=2048-2048
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-mechanisms pkcs11: > list.out; then
+		assert_fail "unable to run: p11-kit list-mechanisms"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_list_mechanisms_single() {  # specific existing token can be specified
+	cat > list.exp <<EOF
+0x80000001 (unknown): encrypt decrypt key-size=512-4096
+0x80000002 (unknown): sign verify key-size=2048-2048
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-mechanisms pkcs11:token=PUBKEY%20LABEL > list.out; then
+		assert_fail "unable to run: p11-kit list-mechanisms"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_list_mechanisms_nonex() {  # specific nonexisting token leads to a warning
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable list-mechanisms pkcs11:token=nonex 2> list.err; then
+		assert_fail "p11-kit list-mechanisms returned 0 for nonexisting token"
+	fi
+
+	: ${GREP=grep}
+	if ! ${GREP} -Fqx 'p11-kit: no matching token' list.err; then
+		assert_fail "p11-kit list-mechanisms hasn't printed 'no matching token' error"
+	fi
+}
+
+run test_list_mechanisms_multi test_list_mechanisms_single test_list_mechanisms_nonex

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-list-tokens.sh Added

@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Test public key export from mock-twelve.so (mock-module-ep10.c).
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-objects-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_list_tokens_without_uri() {
+	cat > list.exp <<EOF
+usage: p11-kit list-tokens --only-uris pkcs11:token
+
+  -v, --verbose       show verbose debug output
+  -q, --quiet         suppress command output
+  --only-uris         only print token URIs
+  --provider=<...>    specify the module to use
+EOF
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable list-tokens -q 2>&1 > list.out; then
+		assert_fail "p11-kit list-tokens succeeded without token URI"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_list_tokens() {
+	cat > list.exp <<EOF
+token: PUBKEY LABEL
+    uri: pkcs11:model=PUBKEY%20MODEL;manufacturer=PUBKEY%20MANUFACTURER;serial=PUBKEY%20SERIAL;token=PUBKEY%20LABEL
+    manufacturer: PUBKEY MANUFACTURER
+    model: PUBKEY MODEL
+    serial-number: PUBKEY SERIAL
+    hardware-version: 75.175
+    firmware-version: 85.185
+    flags:
+          login-required
+          user-pin-initialized
+          clock-on-token
+          token-initialized
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-tokens -q "pkcs11:model=PUBKEY%20MODEL" > list.out; then
+		assert_fail "unable to run: p11-kit list-tokens"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_list_tokens_only_uris() {
+	cat > list.exp <<EOF
+pkcs11:model=PUBKEY%20MODEL;manufacturer=PUBKEY%20MANUFACTURER;serial=PUBKEY%20SERIAL;token=PUBKEY%20LABEL
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-tokens -q --only-uris "pkcs11:model=PUBKEY%20MODEL" > list.out; then
+		assert_fail "unable to run: p11-kit list-tokens --only-uris"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_list_tokens_provider() {
+	cat > list.exp <<EOF
+token: TEST LABEL
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL
+    manufacturer: TEST MANUFACTURER
+    model: TEST MODEL
+    serial-number: TEST SERIAL
+    hardware-version: 75.175
+    firmware-version: 85.185
+    flags:
+          login-required
+          user-pin-initialized
+          clock-on-token
+          token-initialized
+EOF
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-tokens -q --provider "$P11_MODULE_PATH"/mock-one.so "pkcs11:" > list.out; then
+		assert_fail "unable to run: p11-kit list-tokens --provider"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+run test_list_tokens_without_uri test_list_tokens test_list_tokens_only_uris test_list_tokens_provider

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-lists.sh Added

@@ -0,0 +1,156 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-objects-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_list_modules() {
+	cat > list.exp <<EOF
+module: four
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: TEST LABEL
+        uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL
+        manufacturer: TEST MANUFACTURER
+        model: TEST MODEL
+        serial-number: TEST SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: eleven
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: TEST LABEL
+        uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL
+        manufacturer: TEST MANUFACTURER
+        model: TEST MODEL
+        serial-number: TEST SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: fourteen
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: PERSIST LABEL ONE
+        uri: pkcs11:model=PERSIST%20MODEL;manufacturer=PERSIST%20MANUFACTURER;serial=PERSIST%20SERIAL;token=PERSIST%20LABEL%20ONE
+        manufacturer: PERSIST MANUFACTURER
+        model: PERSIST MODEL
+        serial-number: PERSIST SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: one
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: TEST LABEL
+        uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL
+        manufacturer: TEST MANUFACTURER
+        model: TEST MODEL
+        serial-number: TEST SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: thirteen
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: PROFILE LABEL ONE
+        uri: pkcs11:model=PROFILE%20MODEL;manufacturer=PROFILE%20MANUFACTURER;serial=PROFILE%20SERIAL;token=PROFILE%20LABEL%20ONE
+        manufacturer: PROFILE MANUFACTURER
+        model: PROFILE MODEL
+        serial-number: PROFILE SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: twelve
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: PUBKEY LABEL
+        uri: pkcs11:model=PUBKEY%20MODEL;manufacturer=PUBKEY%20MANUFACTURER;serial=PUBKEY%20SERIAL;token=PUBKEY%20LABEL
+        manufacturer: PUBKEY MANUFACTURER
+        model: PUBKEY MODEL
+        serial-number: PUBKEY SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+module: two-duplicate
+    uri: pkcs11:library-description=MOCK%20LIBRARY;library-manufacturer=MOCK%20MANUFACTURER
+    library-description: MOCK LIBRARY
+    library-manufacturer: MOCK MANUFACTURER
+    library-version: 45.145
+    token: TEST LABEL
+        uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL
+        manufacturer: TEST MANUFACTURER
+        model: TEST MODEL
+        serial-number: TEST SERIAL
+        hardware-version: 75.175
+        firmware-version: 85.185
+        flags:
+              login-required
+              user-pin-initialized
+              clock-on-token
+              token-initialized
+EOF
+
+	# Since the path is absolute, it may contain user's current working
+	# directory; strip it before taking a diff.
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-modules -q | sed '/^ *path: /d' > list.out; then
+		assert_fail "unable to run: p11-kit list-modules"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+run test_list_modules

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-managed.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-managed.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-messages.sh -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-messages.sh Changed

@@ -1,18 +1,24 @@
 #!/bin/sh
 
-set -e
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
 
-testdir=$PWD/test-messages-$$
-test -d "$testdir" || mkdir "$testdir"
+. "$abs_top_builddir/common/test-init.sh"
 
-cleanup () {
-	rm -rf "$testdir"
+setup() {
+	testdir=$PWD/test-messages-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
 }
-trap cleanup 0
 
-cd "$testdir"
+teardown() {
+	rm -rf "$testdir"
+}
 
-cat > messages.exp <<EOF
+test_messages() {
+	cat > messages.exp <<EOF
 CKR_CANCEL: The operation was cancelled
 CKR_FUNCTION_CANCELED: The operation was cancelled
 CKR_HOST_MEMORY: Insufficient memory available
@@ -96,15 +102,16 @@
 CKR_FUNCTION_REJECTED: The request was rejected by the user
 EOF
 
-${WINE} "$abs_top_builddir"/p11-kit/print-messages | tr -d '\r' > messages.out
+	: ${WINE=}
+	if ! ${WINE} "$abs_top_builddir"/p11-kit/print-messages | tr -d '\r' > messages.out; then
+		assert_fail "unable to run print-messages"
+	fi
 
-echo 1..1
+	: ${DIFF=diff}
+	if ! ${DIFF} messages.exp messages.out > messages.diff; then
+		sed 's/^/# /' messages.diff
+		assert_fail "output contains incorrect messages"
+	fi
+}
 
-: ${DIFF=diff}
-if ${DIFF} messages.exp messages.out > messages.diff; then
-	echo "ok 1 /messages/return-code"
-else
-	echo "not ok 1 /messages/return-code"
-	sed 's/^/# /' messages.diff
-	exit 1
-fi
+run test_messages

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-mock.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-mock.c Changed

@@ -509,8 +509,8 @@
 	CK_FUNCTION_LIST_PTR module;
 	CK_SESSION_HANDLE session = 0;
 	CK_ATTRIBUTE attrs8;
-	char label32;
-	CK_OBJECT_CLASS klass;
+	char label32 = { '\0' };
+	CK_OBJECT_CLASS klass = -1ul;
 	CK_RV rv;
 
 	module = setup_mock_module (&session);
@@ -607,6 +607,135 @@
 }
 
 static void
+test_get_wrap_template (void)
+{
+	CK_RV rv;
+	CK_FUNCTION_LIST_PTR module;
+	CK_SESSION_HANDLE session = 0;
+	char labelsizeof ("Wrapped label") - 1 = { 0 };
+	CK_BBOOL verify = CK_FALSE;
+	CK_BBOOL encrypt = CK_FALSE;
+	CK_ATTRIBUTE temp = {
+		{ 0 },
+		{ 0 },
+		{ 0 },
+	};
+	CK_ATTRIBUTE attrs = {
+		{ CKA_WRAP_TEMPLATE, temp, sizeof (temp) },
+	};
+	CK_ULONG n_attrs = sizeof (attrs) / sizeof (attrs0);
+
+	module = setup_mock_module (&session);
+
+	rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+	assert_num_eq (attrs0.type, CKA_WRAP_TEMPLATE);
+	assert_ptr_eq (attrs0.pValue, temp);
+	assert_num_eq (attrs0.ulValueLen, sizeof (temp));
+	assert_num_eq (temp0.type, CKA_LABEL);
+	assert_ptr_eq (temp0.pValue, NULL);
+	assert_num_eq (temp0.ulValueLen, sizeof (label));
+	assert_num_eq (temp1.type, CKA_VERIFY);
+	assert_ptr_eq (temp1.pValue, NULL);
+	assert_num_eq (temp1.ulValueLen, sizeof (verify));
+	assert_num_eq (temp2.type, CKA_ENCRYPT);
+	assert_ptr_eq (temp2.pValue, NULL);
+	assert_num_eq (temp2.ulValueLen, sizeof (encrypt));
+
+	temp0.pValue = label;
+	temp1.pValue = &verify;
+	temp2.pValue = &encrypt;
+
+	rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+	assert_num_eq (attrs0.type, CKA_WRAP_TEMPLATE);
+	assert_ptr_eq (attrs0.pValue, temp);
+	assert_num_eq (attrs0.ulValueLen, sizeof (temp));
+	assert_num_eq (temp0.type, CKA_LABEL);
+	assert_ptr_eq (temp0.pValue, label);
+	assert_num_eq (temp0.ulValueLen, sizeof (label));
+	assert_num_eq (temp1.type, CKA_VERIFY);
+	assert_ptr_eq (temp1.pValue, &verify);
+	assert_num_eq (temp1.ulValueLen, sizeof (verify));
+	assert_num_eq (temp2.type, CKA_ENCRYPT);
+	assert_ptr_eq (temp2.pValue, &encrypt);
+	assert_num_eq (temp2.ulValueLen, sizeof (encrypt));
+	assert (strncmp (label, "Wrapped label", sizeof (label)) == 0);
+	assert (verify == CK_TRUE);
+	assert (encrypt == CK_TRUE);
+
+	teardown_mock_module (module);
+}
+
+static void
+test_set_wrap_template (void)
+{
+	CK_RV rv;
+	CK_FUNCTION_LIST_PTR module;
+	CK_SESSION_HANDLE session = 0;
+	char label = { 'T', 'E', 'S', 'T' };
+	CK_BBOOL local = CK_TRUE;
+	CK_ATTRIBUTE temp = {
+		{ CKA_LABEL, label, sizeof (label) },
+		{ CKA_LOCAL, &local, sizeof (local) },
+	};
+	CK_ATTRIBUTE attrs = {
+		{ CKA_WRAP_TEMPLATE, temp, sizeof (temp) },
+	};
+	CK_ULONG n_attrs = sizeof (attrs) / sizeof (attrs0);
+
+	module = setup_mock_module (&session);
+
+	rv = (module->C_SetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+
+	attrs0.pValue = NULL;
+	attrs0.ulValueLen = 0;
+
+	rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+	assert_num_eq (attrs0.type, CKA_WRAP_TEMPLATE);
+	assert_ptr_eq (attrs0.pValue, NULL);
+	assert_num_eq (attrs0.ulValueLen, sizeof (temp));
+
+	memset (temp, 0, sizeof (temp));
+	attrs0.pValue = temp;
+
+	rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+	assert_num_eq (attrs0.type, CKA_WRAP_TEMPLATE);
+	assert_ptr_eq (attrs0.pValue, temp);
+	assert_num_eq (attrs0.ulValueLen, sizeof (temp));
+	assert_num_eq (temp0.type, CKA_LABEL);
+	assert_ptr_eq (temp0.pValue, NULL);
+	assert_num_eq (temp0.ulValueLen, sizeof (label));
+	assert_num_eq (temp1.type, CKA_LOCAL);
+	assert_ptr_eq (temp1.pValue, NULL);
+	assert_num_eq (temp1.ulValueLen, sizeof (local));
+
+	memset (label, 0, sizeof (label));
+	local = CK_FALSE;
+	temp0.pValue = label;
+	temp1.pValue = &local;
+
+	rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_PREFIX, attrs, n_attrs);
+	assert (rv == CKR_OK);
+	assert_num_eq (attrs0.type, CKA_WRAP_TEMPLATE);
+	assert_ptr_eq (attrs0.pValue, temp);
+	assert_num_eq (attrs0.ulValueLen, sizeof (temp));
+	assert_num_eq (temp0.type, CKA_LABEL);
+	assert_ptr_eq (temp0.pValue, label);
+	assert_num_eq (temp0.ulValueLen, sizeof (label));
+	assert_num_eq (temp1.type, CKA_LOCAL);
+	assert_ptr_eq (temp1.pValue, &local);
+	assert_num_eq (temp1.ulValueLen, sizeof (local));
+	assert (strncmp (label, "TEST", sizeof (label)) == 0);
+	assert (local == CK_TRUE);
+
+	teardown_mock_module (module);
+}
+
+static void
 test_create_object (void)
 {
 	CK_FUNCTION_LIST_PTR module;
@@ -711,7 +840,7 @@
 	CK_SESSION_HANDLE session = 0;
 	CK_OBJECT_HANDLE object;
 	CK_ATTRIBUTE attrs8;
-	char label32;
+	char label32 = { '\0' };
 	CK_ULONG bits;
 	CK_RV rv;
 
@@ -751,7 +880,7 @@
 	CK_SESSION_HANDLE session = 0;
 	CK_OBJECT_HANDLE object;
 	CK_ATTRIBUTE attrs8;
-	char label32;
+	char label32 = { '\0' };
 	CK_ULONG bits;
 	CK_RV rv;
 
@@ -1619,7 +1748,7 @@
 	CK_MECHANISM mech = { CKM_MOCK_GENERATE, NULL, 0 };
 	CK_ATTRIBUTE attrs8;
 	char label32;
-	char value64;
+	char value64 = { '\0' };
 	CK_ULONG bits;
 	CK_RV rv;
 
@@ -1674,9 +1803,9 @@
 	CK_ATTRIBUTE pub_attrs8;
 	CK_ATTRIBUTE priv_attrs8;
 	char pub_label32;
-	char pub_value64;
+	char pub_value64 = { '\0' };
 	char priv_label32;
-	char priv_value64;
+	char priv_value64 = { '\0' };
 	CK_ULONG pub_bits;
 	CK_ULONG priv_bits;
 	CK_RV rv;
@@ -1797,7 +1926,7 @@
 	CK_MECHANISM mech = { CKM_MOCK_WRAP, NULL, 0 };
 	CK_ATTRIBUTE attrs8;
 	char label32;
-	char value64;
+	char value64 = { '\0' };
 	CK_ULONG bits;
 	CK_RV rv;
 
@@ -1852,7 +1981,7 @@
 	CK_MECHANISM mech = { CKM_MOCK_DERIVE, NULL, 0 };
 	CK_ATTRIBUTE attrs8;
 	char label32;
-	char value64;

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-objects.sh Added

@@ -0,0 +1,316 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-objects-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
+	rm -rf "$testdir"
+}
+
+test_list_all() {
+	cat > list.exp <<EOF
+Object: #0
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #1
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20Capitalize%20Key;type=public
+    class: public-key
+    label: Public Capitalize Key
+Object: #2
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20prefix%20key;type=public
+    class: public-key
+    label: Public prefix key
+Object: #3
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #4
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20Capitalize%20Key;type=public
+    class: public-key
+    label: Public Capitalize Key
+Object: #5
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20prefix%20key;type=public
+    class: public-key
+    label: Public prefix key
+Object: #6
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20CERTIFICATE;type=cert
+    class: certificate
+    certificate-type: x-509
+    label: TEST CERTIFICATE
+    flags:
+          trusted
+          copyable
+          destroyable
+Object: #7
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20PUBLIC%20KEY;type=public
+    class: public-key
+    key-type: ec
+    label: TEST PUBLIC KEY
+Object: #8
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #9
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20Capitalize%20Key;type=public
+    class: public-key
+    label: Public Capitalize Key
+Object: #10
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20prefix%20key;type=public
+    class: public-key
+    label: Public prefix key
+Object: #11
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #12
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20Capitalize%20Key;type=public
+    class: public-key
+    label: Public Capitalize Key
+Object: #13
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Public%20prefix%20key;type=public
+    class: public-key
+    label: Public prefix key
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-objects -q "pkcs11:token=TEST%20LABEL" > list.out; then
+		assert_fail "unable to run: p11-kit list-objects"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_list_with_type() {
+	cat > list.exp <<EOF
+Object: #0
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #1
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #2
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+Object: #3
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20LABEL;type=data
+    class: data
+    label: TEST LABEL
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-objects -q "pkcs11:token=TEST%20LABEL;type=data" > list.out; then
+		assert_fail "unable to run: p11-kit list-objects"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong result"
+	fi
+}
+
+test_list_private() {
+	cat > list.exp <<EOF
+Object: #0
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private
+    class: private-key
+    label: Private Capitalize Key
+    flags:
+          private
+Object: #1
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private
+    class: private-key
+    label: Private Capitalize Key
+    flags:
+          private
+Object: #2
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private
+    class: private-key
+    label: Private Capitalize Key
+    flags:
+          private
+Object: #3
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private
+    class: private-key
+    label: Private Capitalize Key
+    flags:
+          private
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-objects --login -q "pkcs11:token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private?pin-value=booo" > list.out; then
+		assert_fail "unable to run: p11-kit list-objects"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong result"
+	fi
+}
+
+test_list_private_without_login() {
+	cat > list.exp <<EOF
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-objects -q "pkcs11:token=TEST%20LABEL;object=Private%20Capitalize%20Key;type=private?pin-value=booo" > list.out; then
+		assert_fail "unable to run: p11-kit list-objects"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong result"
+	fi
+}
+
+test_list_exact() {
+	cat > list.exp <<EOF
+Object: #0
+    uri: pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20CERTIFICATE;type=cert
+    class: certificate
+    certificate-type: x-509
+    label: TEST CERTIFICATE
+    flags:
+          trusted
+          copyable
+          destroyable
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-objects -q "pkcs11:model=TEST%20MODEL;manufacturer=TEST%20MANUFACTURER;serial=TEST%20SERIAL;token=TEST%20LABEL;object=TEST%20CERTIFICATE;type=cert" > list.out; then
+		assert_fail "unable to run: p11-kit list-objects"
+	fi
+
+	: ${DIFF=diff}

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-profiles.sh -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-profiles.sh Changed

@@ -1,30 +1,486 @@
 #!/bin/sh
 
-set -e
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
 
-testdir=$PWD/test-profiles-$$
-test -d "$testdir" || mkdir "$testdir"
+. "$abs_top_builddir/common/test-init.sh"
 
-cleanup () {
+setup() {
+	testdir=$PWD/test-profiles-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+}
+
+teardown() {
 	rm -rf "$testdir"
 }
-trap cleanup 0
 
-cd "$testdir"
+test_list_profiles() {
+	cat > test-profiles.p11-kit <<EOF
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: baseline-provider
+
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: extended-provider
+
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: authentication-token
+
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: public-certificates-token
+
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: vendor-defined
+EOF
 
-cat > list.exp <<EOF
+	cat > list.exp <<EOF
+baseline-provider
+extended-provider
+authentication-token
 public-certificates-token
+vendor-defined
 EOF
 
-"$abs_top_builddir"/p11-kit/p11-kit-testable list-profiles -q pkcs11: > list.out
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-profiles -q "pkcs11:token=PROFILE%20LABEL%20ONE" > list.out; then
+		assert_fail "unable to run: p11-kit list-profiles"
+	fi
 
-echo 1..1
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
 
-: ${DIFF=diff}
-if ${DIFF} list.exp list.out > list.diff; then
-	echo "ok 1 /profiles/list"
-else
-	echo "not ok 1 /profiles/list"
-	sed 's/^/# /' list.diff
-	exit 1
-fi
+test_list_profiles_session() {
+	cat > test-profiles.p11-kit <<EOF
+p11-kit-object-v1
+class: profile
+token: false
+profile-id: baseline-provider
+EOF
+
+	cat > list.exp <<EOF
+baseline-provider
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-profiles -q "pkcs11:token=PROFILE%20LABEL%20ONE" > list.out; then
+		assert_fail "unable to run: p11-kit list-profiles"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_list_profiles_empty() {
+	cat > list.exp <<EOF
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable list-profiles -q "pkcs11:token=PROFILE%20LABEL%20ONE" > list.out; then
+		assert_fail "unable to run: p11-kit list-profiles"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_list_profiles_nonexistent_token() {
+	cat > list.exp <<EOF
+EOF
+
+	if "$abs_top_builddir"/p11-kit/p11-kit-testable list-profiles "pkcs11:token=NONEXISTENT" > list.out 2> err.out; then
+		assert_fail "expected to fail: p11-kit list-profiles"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp list.out > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+	assert_contains err.out "no matching token"
+}
+
+test_add_profile() {
+	cat > test-profiles.p11-kit <<EOF
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: baseline-provider
+EOF
+
+	cat > list.exp <<EOF
+p11-kit-object-v1
+class: profile
+profile-id: baseline-provider
+
+p11-kit-object-v1
+class: profile
+profile-id: public-certificates-token
+
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable add-profile -q --profile="public-certificates-token" "pkcs11:token=PROFILE%20LABEL%20ONE"; then
+		assert_fail "unable to run: p11-kit add-profile"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp test-profiles.out.p11-kit > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_add_profile_empty() {
+	cat > list.exp <<EOF
+p11-kit-object-v1
+class: profile
+profile-id: public-certificates-token
+
+EOF
+
+	if ! "$abs_top_builddir"/p11-kit/p11-kit-testable add-profile -q --profile="public-certificates-token" "pkcs11:token=PROFILE%20LABEL%20ONE"; then
+		assert_fail "unable to run: p11-kit add-profile"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} list.exp test-profiles.out.p11-kit > list.diff; then
+		sed 's/^/# /' list.diff
+		assert_fail "output contains wrong results"
+	fi
+}
+
+test_add_profile_duplicate() {
+	cat > test-profiles.p11-kit <<EOF
+p11-kit-object-v1
+class: profile
+token: true
+profile-id: extended-provider
+EOF
+
+	cat > list.exp <<EOF
+p11-kit-object-v1
+class: profile
+profile-id: extended-provider
+

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-rpc.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-rpc.c Changed

@@ -675,6 +675,31 @@
 	p11_mutex_uninit (&delay_mutex);
 }
 
+static void
+test_mechanism_unsupported (void *module)
+{
+	CK_FUNCTION_LIST_PTR rpc_module;
+	CK_SESSION_HANDLE session;
+	CK_MECHANISM mech;
+	CK_RV rv;
+
+	rpc_module = setup_test_rpc_module (&test_normal_vtable,
+	                                    module, &session);
+
+	memset (&mech, 0, sizeof(mech));
+
+	/*
+	 * This mechanism is not supported by the remote mock module,
+	 * but it should be able to return an error through RPC.
+	 */
+	mech.mechanism = CKM_RSA_PKCS_KEY_PAIR_GEN;
+
+	rv = (rpc_module->C_DigestInit) (session, &mech);
+	assert_num_eq (rv, CKR_MECHANISM_INVALID);
+
+	teardown_mock_module (rpc_module);
+}
+
 #ifdef OS_UNIX
 
 static void
@@ -759,6 +784,7 @@
 	p11_testx (test_get_info_stand_in, &mock_module_no_slots, "/rpc/get-info-stand-in");
 	p11_testx (test_get_slot_list_no_device, &mock_module_no_slots, "/rpc/get-slot-list-no-device");
 	p11_testx (test_simultaneous_functions, &mock_module_no_slots, "/rpc/simultaneous-functions");
+	p11_testx (test_mechanism_unsupported, &mock_module, "/rpc/mechanism-unsupported");
 
 #ifdef OS_UNIX
 	p11_testx (test_fork_and_reinitialize, &mock_module_no_slots, "/rpc/fork-and-reinitialize");
@@ -778,6 +804,7 @@
 	p11_testx (test_get_info_stand_in, &mock_module_v3_no_slots, "/rpc3/get-info-stand-in");
 	p11_testx (test_get_slot_list_no_device, &mock_module_v3_no_slots, "/rpc3/get-slot-list-no-device");
 	p11_testx (test_simultaneous_functions, &mock_module_v3_no_slots, "/rpc3/simultaneous-functions");
+	p11_testx (test_mechanism_unsupported, &mock_module_v3, "/rpc3/mechanism-unsupported");
 
 #ifdef OS_UNIX
 	p11_testx (test_fork_and_reinitialize, &mock_module_v3_no_slots, "/rpc3/fork-and-reinitialize");

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-server.sh -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-server.sh Changed

@@ -1,80 +1,81 @@
 #!/bin/sh
 
-set -e
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
 
 : ${P11_MODULE_PATH="$abs_top_builddir"/.libs}
 
-testdir=`mktemp -d -t test-server.XXXXXX`
-if test $? -ne 0; then
-	echo "cannot create temporary directory" >&2
-	exit 77
-fi
+setup() {
+	testdir=`mktemp -d -t test-server.XXXXXX`
+	if test $? -ne 0; then
+		echo "cannot create temporary directory" >&2
+		exit 77
+	fi
+	cd "$testdir"
+
+	unset P11_KIT_SERVER_ADDRESS
+	unset P11_KIT_SERVER_PID
 
-cleanup () {
+	export XDG_RUNTIME_DIR="$testdir"
+	export P11_KIT_PRIVATEDIR="${abs_top_builddir}/p11-kit"
+	export ASAN_OPTIONS="verify_asan_link_order=0"
+}
+
+teardown() {
 	rm -rf "$testdir"
+	if test "${P11_KIT_SERVER_PID+set}" = "set"; then
+		kill "$P11_KIT_SERVER_PID"
+	fi
 }
-trap cleanup 0
 
-cd "$testdir"
+test_server_access() {
+	"$abs_top_builddir"/p11-kit/p11-kit-server-testable -s --provider "$P11_MODULE_PATH"/mock-one.so pkcs11: > start.env 2> start.err
+	if test $? -ne 0; then
+		sed 's/^/# /' start.err
+		assert_fail "unable to start server"
+	fi
 
-unset P11_KIT_SERVER_ADDRESS
-unset P11_KIT_SERVER_PID
+	. ./start.env
 
-export XDG_RUNTIME_DIR="$testdir"
-export P11_KIT_PRIVATEDIR="${abs_top_builddir}/p11-kit"
-export ASAN_OPTIONS="verify_asan_link_order=0"
+	if test "${P11_KIT_SERVER_ADDRESS-unset}" = "unset"; then
+		assert_fail "P11_KIT_SERVER_ADDRESS is not set"
+	fi
 
-echo 1..5
+	if test "${P11_KIT_SERVER_PID-unset}" = "unset"; then
+		assert_fail "P11_KIT_SERVER_PID is not set"
+	fi
 
-"$abs_top_builddir"/p11-kit/p11-kit-server-testable -s --provider "$P11_MODULE_PATH"/mock-one.so pkcs11: > start.env 2> start.err
-if test $? -eq 0; then
-	echo "ok 1 /server/start"
-else
-	echo "not ok 1 /server/start"
-	sed 's/^/# /' start.err
-	exit 1
-fi
+	: ${P11TOOL=p11tool}
+	if "$P11TOOL" --version > /dev/null; then
+		"$P11TOOL" --provider "$P11_MODULE_PATH"/p11-kit-client.so --list-tokens > /dev/null 2> p11tool.err
+		if test $? -ne 0; then
+			sed 's/^/# /' p11tool.err
+			assert_fail "unable to access server"
+		fi
+	else
+		skip "p11tool not found"
+		return
+	fi
 
-. ./start.env
+	"$abs_top_builddir"/p11-kit/p11-kit-server-testable -s -k > stop.env 2> stop.err
+	if test $? -ne 0; then
+		sed 's/^/# /' stop.err
+		assert_fail "unable to stop server"
+	fi
 
-if test "${P11_KIT_SERVER_ADDRESS+set}" = "set" && test "${P11_KIT_SERVER_PID+set}" = "set"; then
-	echo "ok 2 /server/start-env"
-else
-	pkill -f p11-kit-server
-	echo "not ok 2 /server/start-env"
-	exit 1
-fi
+	. ./stop.env
 
-if p11tool --version > /dev/null; then
-	p11tool --provider "$P11_MODULE_PATH"/p11-kit-client.so --list-tokens > /dev/null 2> p11tool.err
-	if test $? -eq 0; then
-		echo "ok 3 /server/client-access"
-	else
-		pkill -f p11-kit-server
-		echo "not ok 3 /server/client-access"
-		sed 's/^/# /' p11tool.err
-		exit 1
+	if test "${P11_KIT_SERVER_ADDRESS+set}" = "set"; then
+		assert_fail "P11_KIT_SERVER_ADDRESS is still set"
 	fi
-else
-	echo "ok 3 /server/client-access"
-	echo "cannot find p11tool" >&2
-fi
-
-"$abs_top_builddir"/p11-kit/p11-kit-server-testable -s -k > stop.env 2> stop.err
-if test $? -eq 0; then
-	echo "ok 4 /server/stop"
-else
-	pkill -f p11-kit-server
-	echo "not ok 4 /server/stop"
-	sed 's/^/# /' stop.err
-	exit 1
-fi
 
-. ./stop.env
+	if test "${P11_KIT_SERVER_PID+set}" = "set"; then
+		assert_fail "P11_KIT_SERVER_PID is still set"
+	fi
+}
 
-if test "${P11_KIT_SERVER_ADDRESS-unset}" = "unset" && test "${P11_KIT_SERVER_PID-unset}" = "unset"; then
-	echo "ok 5 /server/stop-env"
-else
-	echo "not ok 5 /server/stop-env"
-	exit 1
-fi
+run test_server_access

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-softhsm2.sh Added

@@ -0,0 +1,180 @@
+#!/bin/sh
+
+test "${abs_top_builddir+set}" = set || {
+	echo "set abs_top_builddir" 1>&2
+	exit 1
+}
+
+. "$abs_top_builddir/common/test-init.sh"
+
+setup() {
+	testdir=$PWD/test-objects-$$
+	test -d "$testdir" || mkdir "$testdir"
+	cd "$testdir"
+	mkdir tokens
+	cat > softhsm2.conf <<EOF
+directories.tokendir = $PWD/tokens/
+EOF
+	export SOFTHSM2_CONF=$PWD/softhsm2.conf
+
+	: ${SOFTHSM2_UTIL=softhsm2-util}
+	if ! "$SOFTHSM2_UTIL" --version >/dev/null; then
+		skip "softhsm2-util not found"
+		return
+	fi
+	softhsm2-util --init-token --free --label test-genkey --so-pin 12345 --pin 12345
+	softhsm2-util --init-token --free --label test-import --so-pin 12345 --pin 12345
+}
+
+teardown() {
+	unset SOFTHSM2_CONF
+	rm -rf "$testdir"
+}
+
+test_generate_keypair_rsa() {
+	if ! p11-kit generate-keypair --login --label=rsa --type=rsa --bits=2048 "pkcs11:token=test-genkey?pin-value=12345"; then
+		assert_fail "unable to run: p11-kit generate-keypair"
+	fi
+}
+
+test_generate_keypair_ecdsa() {
+	for curve in secp256r1 secp384r1 secp521r1; do
+		if ! p11-kit generate-keypair --login --label="ecdsa-$curve" --type=ecdsa --curve="$curve" "pkcs11:token=test-genkey?pin-value=12345"; then
+			assert_fail "unable to run: p11-kit generate-keypair"
+		fi
+	done
+
+	if p11-kit generate-keypair --login --label="ecdsa-unknown" --type=ecdsa --curve=unknown "pkcs11:token=test-genkey?pin-value=12345"; then
+		assert_fail "p11-kit generate-keypair succeeded for unknown ecdsa curve"
+	fi
+}
+
+test_generate_keypair_eddsa() {
+	curves=
+	mech=$(p11-kit list-mechanisms "pkcs11:token=test-genkey" | sed -n '/CKM_EDDSA/p')
+	if test -z "$mech"; then
+		skip "no support for EdDSA"
+		return
+	fi
+	if expr "$mech" : ".*key-size=256-" > /dev/null; then
+		curve="$curve ed25519"
+	fi
+	if expr "$mech" : ".*key-size=.*-456" > /dev/null; then
+		curve="$curve ed448"
+	fi
+	for curve in $curves; do
+		if ! p11-kit generate-keypair --login --label="eddsa-$curve" --type=eddsa --curve="$curve" "pkcs11:token=test-genkey?pin-value=12345"; then
+			assert_fail "unable to run: p11-kit generate-keypair"
+		fi
+	done
+
+	if p11-kit generate-keypair --login --label="eddsa-unknown" --type=eddsa --curve=unknown "pkcs11:token=test-genkey?pin-value=12345"; then
+		assert_fail "p11-kit generate-keypair succeeded for unknown eddsa curve"
+	fi
+}
+
+test_import_cert() {
+	# Taken from: trust/fixtures/thawte.pem
+	cat > export.exp <<EOF
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+EOF
+
+	if ! p11-kit import-object -q --login --file="export.exp" --label=cert "pkcs11:token=test-import?pin-value=12345"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! p11-kit export-object -q --login "pkcs11:token=test-import;object=cert?pin-value=12345" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_import_pubkey_rsa() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=rsa --bits=2048 --label=RSA 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=RSA;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK4hLgsRxltV0MudYWt2
+yZYWgjHh1B2G5EuJDRvjkYIGiFl6nDk9akWxawgJoVmnZg3Y0a4ogk0H8++WXOZj
+bVL1vYq9fxQm2KMNZPX0TM/efh0P8YM8lAyxiiCnCwGkffbUFqOa++4T/30FRfeX
+D1YaNYH1ZPf2CKSlm6uUIyqFOakxLcaTVj6oXif4NWtg6Edu6I1rES1sBMnsKQQE
+lLXoKLJovpzZgIeJfaxXhnQxfWFH4Ye0BAF4YtzoDXXnSfKVioiwNS06i6ZH9Ztd
+P20Te0/BDjxPMmTwml/j5NW/nM0N4tldl2HxbwgEkq+m4aVFYGrp0KOihgC5kDGO
+fQIDAQAB
+-----END PUBLIC KEY-----
+EOF
+
+	if ! p11-kit import-object -q --login --file="export.exp" --label=rsa "pkcs11:token=test-import?pin-value=12345"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! p11-kit export-object -q --login "pkcs11:token=test-import;object=rsa?pin-value=12345" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+test_import_pubkey_ec() {
+	# Generated and extracted with:
+	# p11-kit generate-keypair --type=ecdsa --curve=secp256r1 --label=EC 'pkcs11:model=SoftHSM%20v2'
+	# p11tool --export 'pkcs11:model=SoftHSM%20v2;object=EC;type=public'
+	cat > export.exp <<EOF
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaTJt0debXaW7Hpcrpn7X07SsTk9
+6OKFal97R2f9wetmK/EVyZIjCsth4tvkVtvyVsawBF0A2iI7N+uZdiPshw==
+-----END PUBLIC KEY-----
+EOF
+
+	if ! p11-kit import-object -q --login --file="export.exp" --label=ec "pkcs11:token=test-import?pin-value=12345"; then
+		assert_fail "unable to run: p11-kit import-object"
+	fi
+
+	if ! p11-kit export-object -q --login "pkcs11:token=test-import;object=ec?pin-value=12345" > export.out; then
+		assert_fail "unable to run: p11-kit export-object"
+	fi
+
+	: ${DIFF=diff}
+	if ! ${DIFF} export.exp export.out > export.diff; then
+		sed 's/^/# /' export.diff
+		assert_fail "output contains incorrect result"
+	fi
+}
+
+run test_generate_keypair_rsa test_generate_keypair_ecdsa \
+    test_generate_keypair_ecdsa \
+    test_import_cert test_import_pubkey_rsa test_import_pubkey_ec

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/test-uri.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-uri.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/test-version.c Added

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2024 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#include "config.h"
+
+#include "p11-kit/version.h"
+#include "library.h"
+#include "test.h"
+
+static void
+test_check_compile_time (void)
+{
+#if !P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO)
+	assert_not_reached ();
+#endif
+
+#if !P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, 0)
+	assert_not_reached ();
+#endif
+
+#if !P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR, 0, 0)
+	assert_not_reached ();
+#endif
+
+#if P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR + 1, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO)
+	assert_not_reached ();
+#endif
+
+#if P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR + 1, P11_KIT_VERSION_MICRO)
+	assert_not_reached ();
+#endif
+
+#if P11_KIT_CHECK_VERSION (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO + 1)
+	assert_not_reached ();
+#endif
+}
+
+static void
+test_check_run_time (void)
+{
+	assert_num_eq (1, p11_kit_check_version (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO));
+	assert_num_eq (1, p11_kit_check_version (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, 0));
+	assert_num_eq (1, p11_kit_check_version (P11_KIT_VERSION_MAJOR, 0, 0));
+	assert_num_eq (0, p11_kit_check_version (P11_KIT_VERSION_MAJOR + 1, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO));
+	assert_num_eq (0, p11_kit_check_version (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR + 1, P11_KIT_VERSION_MICRO));
+	assert_num_eq (0, p11_kit_check_version (P11_KIT_VERSION_MAJOR, P11_KIT_VERSION_MINOR, P11_KIT_VERSION_MICRO + 1));
+}
+
+int
+main (int argc,
+      char *argv)
+{
+	p11_library_init ();
+
+	p11_test (test_check_compile_time, "/version/test_check_compile_time");
+	p11_test (test_check_run_time, "/version/test_check_run_time");
+
+	return p11_test_run (argc, argv);
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/tool.c Added

@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#include "config.h"
+
+#include "tool.h"
+
+#include "debug.h"
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef OS_UNIX
+#include "tty.h"
+#endif
+
+struct p11_tool {
+	P11KitUri *uri;
+	bool login;
+	char *provider;
+	CK_FUNCTION_LIST **modules;
+};
+
+p11_tool *
+p11_tool_new (void)
+{
+	return calloc (1, sizeof (p11_tool));
+}
+
+void
+p11_tool_free (p11_tool *tool)
+{
+	if (!tool)
+		return;
+	p11_kit_uri_free (tool->uri);
+	if (tool->modules)
+		p11_kit_modules_finalize_and_release (tool->modules);
+
+#ifdef OS_UNIX
+	if (tool->login)
+		p11_kit_pin_unregister_callback ("tty", p11_pin_tty_callback, NULL);
+#endif
+
+	free (tool->provider);
+	free (tool);
+}
+
+P11KitUriResult
+p11_tool_set_uri (p11_tool *tool,
+		  const char *string,
+		  P11KitUriType type)
+{
+	P11KitUri *uri;
+	P11KitUriResult res;
+
+	uri = p11_kit_uri_new ();
+	if (!uri)
+		return P11_KIT_URI_NO_MEMORY;
+
+	res = p11_kit_uri_parse (string, type, uri);
+	if (res == P11_KIT_URI_OK) {
+		tool->uri = uri;
+		uri = NULL;
+	}
+
+	p11_kit_uri_free (uri);
+	return res;
+}
+
+void
+p11_tool_set_login (p11_tool *tool,
+		    bool login)
+{
+	tool->login = login;
+
+#ifdef OS_UNIX
+	/* Register a fallback PIN callback that reads from terminal.
+	 * We don't care whether the registration succeeds as it is a fallback.
+	 */
+	if (tool->login)
+		(void)p11_kit_pin_register_callback ("tty", p11_pin_tty_callback, NULL, NULL);
+	else
+		p11_kit_pin_unregister_callback ("tty", p11_pin_tty_callback, NULL);
+#endif
+}
+
+bool
+p11_tool_set_provider (p11_tool *tool,
+		       const char *provider)
+{
+	free (tool->provider);
+
+	if (provider) {
+		tool->provider = strdup (provider);
+		return tool->provider != NULL;
+	} else {
+		tool->provider = NULL;
+		return true;
+	}
+}
+
+P11KitIter *
+p11_tool_begin_iter (p11_tool *tool,
+		     P11KitIterBehavior behavior)
+{
+	P11KitIter *iter = NULL;
+
+	return_val_if_fail (tool, NULL);
+
+	/* Iteration is already in progress */
+	return_val_if_fail (!tool->modules, NULL);
+
+	if (tool->provider) {
+		CK_FUNCTION_LIST **modules;
+
+		modules = calloc (2, sizeof (CK_FUNCTION_LIST *));
+		return_val_if_fail (modules, NULL);
+
+		modules0 = p11_kit_module_load (tool->provider, 0);
+		if (!modules0) {
+			free (modules);
+			return NULL;
+		}
+
+		if (p11_kit_module_initialize (modules0) != CKR_OK) {
+			p11_kit_module_release (modules0);
+			free (modules);
+			return NULL;
+		}
+
+		tool->modules = modules;
+	} else {
+		tool->modules = p11_kit_modules_load_and_initialize (0);
+	}
+
+	if (!tool->modules)
+		return NULL;
+
+	if (tool->login) {
+		behavior |= P11_KIT_ITER_WITH_LOGIN;
+#ifdef OS_UNIX
+		p11_kit_uri_set_pin_source (tool->uri, "tty");
+#endif
+	}
+
+	iter = p11_kit_iter_new (tool->uri, behavior);
+	if (!iter)
+		return NULL;
+
+	p11_kit_iter_begin (iter, tool->modules);
+
+	return iter;
+}
+
+void
+p11_tool_end_iter (p11_tool *tool,
+		   P11KitIter *iter)
+{
+	/* No iteration has started yet */
+	p11_kit_iter_free (iter);
+
+	return_if_fail (tool->modules);
+	p11_kit_modules_finalize_and_release (tool->modules);
+	tool->modules = NULL;
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/tool.h Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#ifndef P11_KIT_TOOL_H
+#define P11_KIT_TOOL_H
+
+#include "compat.h"
+#include "iter.h"
+#include "pkcs11.h"
+#include "uri.h"
+
+typedef struct p11_tool p11_tool;
+
+p11_tool       *p11_tool_new        (void);
+void            p11_tool_free       (p11_tool *tool);
+P11KitUriResult p11_tool_set_uri    (p11_tool *tool,
+				     const char *string,
+				     P11KitUriType type);
+void            p11_tool_set_login  (p11_tool *tool,
+				     bool login);
+bool            p11_tool_set_provider
+                                    (p11_tool *tool,
+				     const char *provider);
+P11KitIter     *p11_tool_begin_iter (p11_tool *tool,
+				     P11KitIterBehavior behavior);
+void            p11_tool_end_iter   (p11_tool *tool,
+				     P11KitIter *iter);
+
+#endif /* P11_KIT_TOOL_H */

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/tty.c Added

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#include "config.h"
+
+#include "tty.h"
+#include "compat.h"
+#include "debug.h"
+#include "message.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MAX_PIN_LEN 256
+
+P11KitPin *
+p11_pin_tty_callback (const char *pin_source,
+		      P11KitUri *pin_uri,
+		      const char *pin_description,
+		      P11KitPinFlags pin_flags,
+		      void *callback_data)
+{
+	char bufMAX_PIN_LEN, *prompt = NULL;
+	P11KitPin *pin = NULL;
+
+	return_val_if_fail (pin_description != NULL, NULL);
+
+	/* We don't support retries */
+	if (pin_flags & P11_KIT_PIN_FLAGS_RETRY)
+		return NULL;
+
+	if (asprintf (&prompt, "%s: ", pin_description) < 0)
+		return NULL;
+
+	if (readpassphrase (prompt, buf, sizeof(buf), 0) == NULL)
+		goto cleanup;
+
+	pin = p11_kit_pin_new_for_string (buf);
+
+ cleanup:
+	free (prompt);
+	memset (buf, 0, sizeof(buf));
+	return pin;
+}

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/tty.h Added

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023, Red Hat Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#ifndef P11_KIT_TTY_H
+#define P11_KIT_TTY_H
+
+#include "pin.h"
+
+P11KitPin *p11_pin_tty_callback (const char *pin_source,
+                                 P11KitUri *pin_uri,
+                                 const char *pin_description,
+                                 P11KitPinFlags pin_flags,
+                                 void *callback_data);
+
+#endif /* P11_KIT_TTY_H */

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/util.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/util.c Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/version.h.in Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2024 Red Hat, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Daiki Ueno
+ */
+
+#ifndef P11_KIT_VERSION_H
+#define P11_KIT_VERSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define P11_KIT_VERSION_MAJOR (@PACKAGE_MAJOR@)
+#define P11_KIT_VERSION_MINOR (@PACKAGE_MINOR@)
+#define P11_KIT_VERSION_MICRO (@PACKAGE_MICRO@)
+
+#define P11_KIT_CHECK_VERSION(major, minor, micro)	\
+	(P11_KIT_VERSION_MAJOR > (major) ||		\
+	 (P11_KIT_VERSION_MAJOR == (major) &&		\
+	  P11_KIT_VERSION_MINOR > (minor)) ||		\
+	 (P11_KIT_VERSION_MAJOR == (major) &&		\
+	  P11_KIT_VERSION_MINOR == (minor) &&		\
+	  P11_KIT_VERSION_MICRO >= (micro)))
+
+int p11_kit_check_version (int major, int minor, int micro);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* P11_KIT_VERSION_H */

_service:tar_scm:p11-kit-0.25.0.tar.xz/p11-kit/virtual.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/p11-kit/virtual.c Changed

@@ -41,7 +41,6 @@
 #include "debug.h"
 #include "library.h"
 #include "virtual.h"
-#include "virtual-fixed.h"
 
 #include <assert.h>
 #include <stdarg.h>
@@ -147,824 +146,6 @@
 	}
 }
 
-static void
-binding_C_Initialize (ffi_cif *cif,
-                      CK_RV *ret,
-                      void* args,
-                      CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_Initialize (funcs,
-	                            *(CK_VOID_PTR *)args0);
-}
-
-static void
-binding_C_Finalize (ffi_cif *cif,
-                    CK_RV *ret,
-                    void* args,
-                    CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_Finalize (funcs,
-	                          *(CK_VOID_PTR *)args0);
-}
-
-static void
-binding_C_GetInfo (ffi_cif *cif,
-                   CK_RV *ret,
-                   void* args,
-                   CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetInfo (funcs,
-	                         *(CK_INFO_PTR *)args0);
-}
-
-static void
-binding_C_GetSlotList (ffi_cif *cif,
-                       CK_RV *ret,
-                       void* args,
-                       CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetSlotList (funcs,
-	                             *(CK_BBOOL *)args0,
-	                             *(CK_SLOT_ID_PTR *)args1,
-	                             *(CK_ULONG_PTR *)args2);
-}
-
-static void
-binding_C_GetSlotInfo (ffi_cif *cif,
-                       CK_RV *ret,
-                       void* args,
-                       CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetSlotInfo (funcs,
-	                             *(CK_SLOT_ID *)args0,
-	                             *(CK_SLOT_INFO_PTR *)args1);
-}
-
-static void
-binding_C_GetTokenInfo (ffi_cif *cif,
-                        CK_RV *ret,
-                        void* args,
-                        CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetTokenInfo (funcs,
-	                              *(CK_SLOT_ID *)args0,
-	                              *(CK_TOKEN_INFO_PTR *)args1);
-}
-
-static void
-binding_C_WaitForSlotEvent (ffi_cif *cif,
-                            CK_RV *ret,
-                            void* args,
-                            CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_WaitForSlotEvent (funcs,
-	                                  *(CK_FLAGS *)args0,
-	                                  *(CK_SLOT_ID_PTR *)args1,
-	                                  *(CK_VOID_PTR *)args2);
-}
-
-static void
-binding_C_GetMechanismList (ffi_cif *cif,
-                            CK_RV *ret,
-                            void* args,
-                            CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetMechanismList (funcs,
-	                                  *(CK_SLOT_ID *)args0,
-	                                  *(CK_MECHANISM_TYPE_PTR *)args1,
-	                                  *(CK_ULONG_PTR *)args2);
-}
-
-static void
-binding_C_GetMechanismInfo (ffi_cif *cif,
-                            CK_RV *ret,
-                            void* args,
-                            CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetMechanismInfo (funcs,
-	                                  *(CK_SLOT_ID *)args0,
-	                                  *(CK_MECHANISM_TYPE *)args1,
-	                                  *(CK_MECHANISM_INFO_PTR *)args2);
-}
-
-static void
-binding_C_InitToken (ffi_cif *cif,
-                     CK_RV *ret,
-                     void* args,
-                     CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_InitToken (funcs,
-	                           *(CK_SLOT_ID *)args0,
-	                           *(CK_BYTE_PTR *)args1,
-	                           *(CK_ULONG *)args2,
-	                           *(CK_BYTE_PTR *)args3);
-}
-
-static void
-binding_C_InitPIN (ffi_cif *cif,
-                   CK_RV *ret,
-                   void* args,
-                   CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_InitPIN (funcs,
-	                         *(CK_SESSION_HANDLE *)args0,
-	                         *(CK_BYTE_PTR *)args1,
-	                         *(CK_ULONG *)args2);
-}
-
-static void
-binding_C_SetPIN (ffi_cif *cif,
-                  CK_RV *ret,
-                  void* args,
-                  CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_SetPIN (funcs,
-	                        *(CK_SESSION_HANDLE *)args0,
-	                        *(CK_BYTE_PTR *)args1,
-	                        *(CK_ULONG *)args2,
-	                        *(CK_BYTE_PTR *)args3,
-	                        *(CK_ULONG *)args4);
-}
-
-static void
-binding_C_OpenSession (ffi_cif *cif,
-                       CK_RV *ret,
-                       void* args,
-                       CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_OpenSession (funcs,
-	                             *(CK_SLOT_ID *)args0,
-	                             *(CK_FLAGS *)args1,
-	                             *(CK_VOID_PTR *)args2,
-	                             *(CK_NOTIFY *)args3,
-	                             *(CK_SESSION_HANDLE_PTR *)args4);
-}
-
-static void
-binding_C_CloseSession (ffi_cif *cif,
-                        CK_RV *ret,
-                        void* args,
-                        CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_CloseSession (funcs,
-	                              *(CK_SESSION_HANDLE *)args0);
-}
-
-static void
-binding_C_CloseAllSessions (ffi_cif *cif,
-                            CK_RV *ret,
-                            void* args,
-                            CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_CloseAllSessions (funcs,
-	                                  *(CK_SLOT_ID *)args0);
-}
-
-static void
-binding_C_GetSessionInfo (ffi_cif *cif,
-                       CK_RV *ret,
-                       void* args,
-                       CK_X_FUNCTION_LIST *funcs)
-{
-	*ret = funcs->C_GetSessionInfo (funcs,
-	                                *(CK_SESSION_HANDLE *)args0,
-	                                *(CK_SESSION_INFO_PTR *)args1);
-}
-
-static void
-binding_C_GetOperationState (ffi_cif *cif,
-                       CK_RV *ret,
-                       void* args,

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/Makefile.in.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/Makefile.in.in Changed

@@ -1,13 +1,13 @@
 # Makefile for PO directory in any package using GNU gettext.
 # Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2023 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.21
+# Origin: gettext-0.22
 GETTEXT_MACRO_VERSION = 0.20
 
 PACKAGE = @PACKAGE@
@@ -248,15 +248,17 @@
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
 	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
-	           '' | 0.0-9 | 0.0-9.* | 0.10-5 | 0.10-5.*) \
+	           '' | 0.0-9 | 0.0-9.* | 0.10 | 0.10.*) \
 	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           0.11-5 | 0.11-5.*) \
+	             $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
 	           0.16-7 | 0.16-7.*) \
-	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
+	             $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
 	           *) \
-	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
+	             $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
 	         esac; \
 	       }; \
 	else \
@@ -464,15 +466,17 @@
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
 	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
-	       '' | 0.0-9 | 0.0-9.* | 0.10-5 | 0.10-5.*) \
+	       '' | 0.0-9 | 0.0-9.* | 0.10 | 0.10.*) \
 	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       0.11-5 | 0.11-5.*) \
+	         $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
 	       0.16-7 | 0.16-7.*) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	         $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
 	       *) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	         $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
 	     esac; \
 	   }; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/POTFILES.in -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/POTFILES.in Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/da.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/da.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/es.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/es.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/fi.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/fi.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/hu.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/hu.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/id.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/id.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/p11-kit.pot -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/p11-kit.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: p11-kit 0.25.0\n"
+"Project-Id-Version: p11-kit 0.25.5\n"
 "Report-Msgid-Bugs-To: https://github.com/p11-glue/p11-kit/issues\n"
-"POT-Creation-Date: 2023-06-29 11:36+0200\n"
+"POT-Creation-Date: 2024-07-04 12:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,91 +18,144 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: common/tool.c:184
+#: common/options.c:184
 #, c-format
 msgid "usage: %s command <args>...\n"
 msgstr ""
 
-#: common/tool.c:185
+#: common/options.c:185
 #, c-format
 msgid ""
 "\n"
 "Common %s commands are:\n"
 msgstr ""
 
-#: common/tool.c:198
+#: common/options.c:198
 #, c-format
 msgid ""
 "\n"
 "See '%s <command> --help' for more information\n"
 msgstr ""
 
-#: common/tool.c:261 common/tool.c:333
+#: common/options.c:261 common/options.c:333
 msgid "no command specified"
 msgstr ""
 
-#: common/tool.c:277
+#: common/options.c:277
 #, c-format
 msgid "unknown global option: %s"
 msgstr ""
 
-#: common/tool.c:306
+#: common/options.c:306
 #, c-format
 msgid "unknown global option: -%c"
 msgstr ""
 
-#: common/tool.c:358
+#: common/options.c:358
 #, c-format
 msgid "'%s' is not a valid command. See '%s --help'"
 msgstr ""
 
-#: p11-kit/add-profile.c:75 p11-kit/add-profile.c:138
-#: p11-kit/delete-profile.c:93 p11-kit/list-profiles.c:93
+#: common/persist.c:496
+#, c-format
+msgid "invalid oid value: %s"
+msgstr ""
+
+#: p11-kit/add-profile.c:85 p11-kit/delete-object.c:69
+#: p11-kit/delete-profile.c:85 p11-kit/export-object.c:442
+#: p11-kit/generate-keypair.c:310 p11-kit/import-object.c:490
+#: p11-kit/list-objects.c:361 p11-kit/list-profiles.c:83
 msgid "failed to initialize iterator"
 msgstr ""
 
-#: p11-kit/add-profile.c:84 p11-kit/delete-profile.c:102
-#: p11-kit/list-profiles.c:102
-msgid "failed to retrieve attribute of an object"
+#: p11-kit/add-profile.c:92 p11-kit/delete-profile.c:92
+#: p11-kit/generate-keypair.c:317 p11-kit/import-object.c:497
+#: p11-kit/list-profiles.c:90 p11-kit/list-mechanisms.c:152
+msgid "no matching token"
 msgstr ""
 
-#: p11-kit/add-profile.c:121 p11-kit/delete-profile.c:76
-#: p11-kit/list-profiles.c:76
-msgid "failed to allocate memory for URI"
+#: p11-kit/add-profile.c:94 p11-kit/delete-profile.c:94
+#: p11-kit/generate-keypair.c:319 p11-kit/import-object.c:499
+#: p11-kit/list-profiles.c:92 p11-kit/list-mechanisms.c:154
+#, c-format
+msgid "failed to find token: %s"
 msgstr ""
 
-#: p11-kit/add-profile.c:126 p11-kit/delete-profile.c:81
-#: p11-kit/list-profiles.c:81
-msgid "failed to parse the token URI"
+#: p11-kit/add-profile.c:106 p11-kit/delete-profile.c:106
+#: p11-kit/list-profiles.c:104
+#, c-format
+msgid "failed to initialize search for objects: %s"
 msgstr ""
 
-#: p11-kit/add-profile.c:132 p11-kit/delete-profile.c:87
-#: p11-kit/list-profiles.c:87
-msgid "failed to load and initialize modules"
+#: p11-kit/add-profile.c:113 p11-kit/delete-profile.c:114
+#: p11-kit/list-profiles.c:112
+#, c-format
+msgid "failed to search for objects: %s"
 msgstr ""
 
-#: p11-kit/add-profile.c:153
+#: p11-kit/add-profile.c:119 p11-kit/delete-profile.c:130
+#: p11-kit/list-profiles.c:135
 #, c-format
-msgid "failed to create the profile object: %s"
+msgid "failed to finalize search for objects: %s"
 msgstr ""
 
-#: p11-kit/add-profile.c:202 p11-kit/delete-profile.c:155
+#: p11-kit/add-profile.c:124
+msgid "profile already exists"
+msgstr ""
+
+#: p11-kit/add-profile.c:130
+#, c-format
+msgid "failed to create profile object: %s"
+msgstr ""
+
+#: p11-kit/add-profile.c:182 p11-kit/add-profile.c:241
+#: p11-kit/add-profile.c:251 p11-kit/delete-object.c:164
+#: p11-kit/delete-object.c:174 p11-kit/delete-profile.c:182
+#: p11-kit/delete-profile.c:241 p11-kit/delete-profile.c:251
+#: p11-kit/export-object.c:557 p11-kit/export-object.c:567
+#: p11-kit/generate-keypair.c:185 p11-kit/generate-keypair.c:190
+#: p11-kit/generate-keypair.c:199 p11-kit/generate-keypair.c:205
+#: p11-kit/generate-keypair.c:228 p11-kit/generate-keypair.c:235
+#: p11-kit/generate-keypair.c:249 p11-kit/generate-keypair.c:255
+#: p11-kit/generate-keypair.c:264 p11-kit/generate-keypair.c:468
+#: p11-kit/generate-keypair.c:478 p11-kit/import-object.c:124
+#: p11-kit/import-object.c:133 p11-kit/import-object.c:156
+#: p11-kit/import-object.c:196 p11-kit/import-object.c:205
+#: p11-kit/import-object.c:230 p11-kit/import-object.c:303
+#: p11-kit/import-object.c:371 p11-kit/import-object.c:379
+#: p11-kit/import-object.c:634 p11-kit/import-object.c:644
+#: p11-kit/list-objects.c:187 p11-kit/list-objects.c:274
+#: p11-kit/list-objects.c:288 p11-kit/list-objects.c:295
+#: p11-kit/list-objects.c:330 p11-kit/list-objects.c:441
+#: p11-kit/list-objects.c:451 p11-kit/list-profiles.c:215
+#: p11-kit/list-profiles.c:225 p11-kit/list-mechanisms.c:180
+#: p11-kit/list-mechanisms.c:273 p11-kit/list-mechanisms.c:283
+#: p11-kit/list-tokens.c:180 p11-kit/list-tokens.c:190 p11-kit/lists.c:97
+#: p11-kit/lists.c:185 p11-kit/lists.c:239
 msgid "failed to allocate memory"
 msgstr ""
 
-#: p11-kit/add-profile.c:220 p11-kit/delete-profile.c:173
+#: p11-kit/add-profile.c:200 p11-kit/delete-profile.c:200
 msgid "multiple profiles specified"
 msgstr ""
 
-#: p11-kit/add-profile.c:228 p11-kit/delete-profile.c:181
+#: p11-kit/add-profile.c:208 p11-kit/delete-profile.c:208
 #, c-format
 msgid "failed to convert profile argument: %s"
 msgstr ""
 
-#: p11-kit/add-profile.c:249 p11-kit/delete-profile.c:202
+#: p11-kit/add-profile.c:235 p11-kit/delete-profile.c:235
 msgid "no profile specified"
 msgstr ""
 
+#: p11-kit/add-profile.c:246 p11-kit/delete-object.c:169
+#: p11-kit/delete-profile.c:246 p11-kit/export-object.c:562
+#: p11-kit/generate-keypair.c:473 p11-kit/import-object.c:639
+#: p11-kit/list-objects.c:446 p11-kit/list-profiles.c:220
+#: p11-kit/list-mechanisms.c:278 p11-kit/list-tokens.c:185
+msgid "failed to parse URI"
+msgstr ""
+
 #: p11-kit/conf.c:161
 #, c-format
 msgid "%s: unexpected pem block"
@@ -138,20 +191,251 @@
 msgid "invalid setting '%s' defaulting to '%s'"
 msgstr ""
 
-#: p11-kit/delete-profile.c:109
-msgid "failed to delete the profile"
+#: p11-kit/delete-object.c:76 p11-kit/export-object.c:449
+msgid "no matching object"
+msgstr ""
+
+#: p11-kit/delete-object.c:78 p11-kit/export-object.c:451
+#, c-format
+msgid "failed to find object: %s"
+msgstr ""
+
+#: p11-kit/delete-object.c:84 p11-kit/delete-profile.c:122

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/pt_BR.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/pt_BR.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/si.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/si.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/sv.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/sv.gmo Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/po/uk.gmo -> _service:tar_scm:p11-kit-0.25.5.tar.xz/po/uk.gmo Changed

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/Makefile.am Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/README.md Added

@@ -0,0 +1,57 @@
+# pkcs11-json
+
+pkcs11-json is a project to provide a JSON based, machine readable
+representation of PKCS #11 interface for further code generation.
+
+## Generating the JSON file
+
+```console
+$ sudo dnf install castxml
+$ git clone --depth=1 https://github.com/p11-glue/p11-kit.git
+$ python gen.py p11-kit/common/pkcs11.h > pkcs11.json
+```
+
+## Integrating with build systems
+
+### Meson
+
+In the top-level `meson.build`, check for Python:
+
+```meson
+python = import('python').find_installation()
+python_version = python.language_version()
+python_version_req = '>=3.6'
+if not python_version.version_compare(python_version_req)
+  error('Requires Python @0@, @1@ found.'.format(python_version_req, python_version))
+endif
+```
+
+Then import `pkcs11-json` as a subproject, generate JSON file through
+the `pkcs11_json_gen` generator:
+
+```meson
+pkcs11_json_project = subproject('pkcs11-json')
+pkcs11_json_gen = pkcs11_json_project.get_variable('pkcs11_json_gen')
+pkcs11_json = pkcs11_json_gen.process('common/pkcs11.h')
+```
+
+### Autotools
+
+In `configure.ac`, check for Python and the `castxml` program:
+
+```autoconf
+AM_PATH_PYTHON(3.6,, :)
+AM_MISSING_PROG(CASTXML, castxml)
+```
+
+In `Makefile.am`, set `PKCS11_JSON_INPUT` to a path to "pkcs11.h", and include `pkcs11-json/Makefile.am`:
+
+```makefile
+PKCS11_JSON_INPUT = $(srcdir)/common/pkcs11.h
+
+include pkcs11-json/Makefile.am
+```
+
+## License
+
+BSD-3-Clause

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/gen.py Added

@@ -0,0 +1,259 @@
+#!/usr/bin/python
+
+"""
+SPDX-License-Identifier: BSD-3-Clause
+"""
+
+from typing import Any, Mapping
+import json
+import subprocess
+import sys
+import xml.etree.ElementTree as ET
+
+
+class Type:
+    def __init__(self,
+                 el,
+                 types: Mappingstr, Any,
+                 aliases: Mappingstr, str):
+        self.el = el
+        self.types = types
+        self.aliases = aliases
+
+    def resolve(self) -> str:
+        raise NotImplementedError
+
+    def resolve_ffi_type(self) -> str:
+        raise NotImplementedError
+
+
+class Typedef(Type):
+    def resolve(self) -> str:
+        return self.el.get("name")
+
+    def resolve_ffi_type(self) -> str:
+        return self.typesself.el.get("type").resolve_ffi_type()
+
+
+class PointerType(Type):
+    def resolve(self) -> str:
+        alias = self.aliases.get(self.el.get('id'))
+        if alias is not None:
+            return alias
+        else:
+            return f"{self.typesself.el.get('type').resolve()} *"
+
+    def resolve_ffi_type(self) -> str:
+        return "pointer"
+
+
+class FundamentalType(Type):
+    def resolve(self) -> str:
+        return self.el.get("name")
+
+    def resolve_ffi_type(self) -> str:
+        if self.el.get("size") == "8":
+            return "uchar"
+        elif self.el.get("size") == "64":
+            return "ulong"
+        else:
+            raise NotImplementedError
+
+
+class CvQualifiedType(Type):
+    def resolve(self) -> str:
+        return f"const {self.typesself.el.get('type').resolve()}"
+
+
+class ElaboratedType(Type):
+    def resolve(self) -> str:
+        keyword = self.el.get("keyword")
+        if keyword == "struct":
+            return self.typesself.el.get('type').resolve()
+        else:
+            raise NotImplementedError
+
+
+class ArrayType(Type):
+    def resolve(self) -> str:
+        return (f"{self.typesself.el.get('type').resolve()}"
+                f"{int(self.el.get('max')) + 1}")
+
+
+class Field(Type):
+    def to_json(self) -> Mappingstr, Any:
+        obj = {}
+        obj"name" = self.el.get("name")
+        obj"type" = self.typesself.el.get("type").resolve()
+        return obj
+    
+
+class Struct(Type):
+    def __init__(self,
+                 el,
+                 types: Mappingstr, Type,
+                 aliases: Mappingstr, str):
+        super().__init__(el, types, aliases)
+        self.members = 
+
+    def resolve(self) -> str:
+        alias = self.aliases.get(self.el.get('id'))
+        if alias is not None:
+            return alias
+        else:
+            return f"struct {self.el.get('name')}"
+
+    def to_json(self) -> Mappingstr, Any:
+        obj = {}
+        alias = self.aliases.get(self.el.get('id'))
+        if alias is not None:
+            obj"name" = alias
+        else:
+            obj"name" = self.el.get("name")
+        obj"members" = self.members
+        return obj
+
+
+class FunctionType(Type):
+    pass
+
+
+TYPES = 
+    "Typedef",
+    "PointerType",
+    "FundamentalType",
+    "ElaboratedType",
+    "CvQualifiedType",
+    "ArrayType",
+    "FunctionType",
+    "Struct",
+
+
+
+class Function(Type):
+    def __init__(self,
+                 el,
+                 types: Mappingstr, Type,
+                 aliases: Mappingstr, str):
+        super().__init__(el, types, aliases)
+        self.version = 2
+
+    def to_json(self) -> Mappingstr, Any:
+        obj = {}
+        obj"name" = self.el.get("name")
+        obj"version" = self.version
+        returns = self.el.get("returns")
+        obj"returns" = self.typesreturns.resolve()
+        obj"arguments" = 
+        for arg in self.el.iter("Argument"):
+            obj"arguments".append({
+                "type": self.typesarg.get("type").resolve(),
+                "name": arg.get("name"),
+                "ffi-type": self.typesarg.get("type").resolve_ffi_type(),
+            })
+        return obj
+
+
+class Encoder(json.JSONEncoder):
+    def default(self, obj):
+        if hasattr(obj, "to_json"):
+            return obj.to_json()
+        else:
+            return super().default(obj)
+
+
+class AST:
+    def __init__(self, root):
+        self.root = root
+        types = {}
+        aliases = {}
+        functions = {}
+        self.structs = 
+
+        gil = self.root.find("./Function@name='C_GetInterfaceList'")
+        self.origin = self.root.find(f'''./File@id="{gil.get('file')}"''')\
+                               .get("name")
+
+        for el in self.root.iter():
+            if el.tag not in TYPES:
+                continue
+            cls = getattr(sys.modules__name__, el.tag)
+            if cls is None:
+                continue
+            typesel.get("id") = cls(el, types, aliases)
+
+        for el in self.root.iter("Typedef"):
+            aliasesel.get("type") = el.get("name")
+
+        for el in self.root.iter("ElaboratedType"):
+            alias = aliases.get(el.get("id"))
+            if alias is not None:
+                aliasesel.get("type") = alias
+
+        for el in self.root.iter("Struct"):
+            if el.get("incomplete") == "1":
+                continue
+
+            name = aliases.get(el.get("id"), el.get("name"))
+            if not name.startswith("CK_"):
+                continue

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/generated Added

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/generated/pkcs11.json Added

@@ -0,0 +1,3580 @@
+{
+  "comment": "This file is automatically generated from common/pkcs11.h",
+  "license": "BSD-3-Clause",
+  "functions": 
+    {
+      "name": "C_Initialize",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_VOID_PTR",
+          "name": "init_args",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_Finalize",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_VOID_PTR",
+          "name": "pReserved",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetInfo",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_INFO_PTR",
+          "name": "info",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetFunctionList",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_FUNCTION_LIST_PTR_PTR",
+          "name": "function_list",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetSlotList",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "unsigned char",
+          "name": "token_present",
+          "ffi-type": "uchar"
+        },
+        {
+          "type": "CK_SLOT_ID_PTR",
+          "name": "slot_list",
+          "ffi-type": "pointer"
+        },
+        {
+          "type": "long unsigned int *",
+          "name": "ulCount",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetSlotInfo",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SLOT_ID",
+          "name": "slotID",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "CK_SLOT_INFO_PTR",
+          "name": "info",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetTokenInfo",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SLOT_ID",
+          "name": "slotID",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "CK_TOKEN_INFO_PTR",
+          "name": "info",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetMechanismList",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SLOT_ID",
+          "name": "slotID",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "CK_MECHANISM_TYPE_PTR",
+          "name": "mechanism_list",
+          "ffi-type": "pointer"
+        },
+        {
+          "type": "long unsigned int *",
+          "name": "ulCount",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_GetMechanismInfo",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SLOT_ID",
+          "name": "slotID",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "CK_MECHANISM_TYPE",
+          "name": "type",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "CK_MECHANISM_INFO_PTR",
+          "name": "info",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_InitToken",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SLOT_ID",
+          "name": "slotID",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "unsigned char *",
+          "name": "pin",
+          "ffi-type": "pointer"
+        },
+        {
+          "type": "long unsigned int",
+          "name": "pin_len",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "unsigned char *",
+          "name": "label",
+          "ffi-type": "pointer"
+        }
+      
+    },
+    {
+      "name": "C_InitPIN",
+      "version": 2,
+      "returns": "CK_RV",
+      "arguments": 
+        {
+          "type": "CK_SESSION_HANDLE",
+          "name": "session",
+          "ffi-type": "ulong"
+        },
+        {
+          "type": "unsigned char *",
+          "name": "pin",
+          "ffi-type": "pointer"
+        },
+        {
+          "type": "long unsigned int",
+          "name": "pin_len",
+          "ffi-type": "ulong"
+        }

_service:tar_scm:p11-kit-0.25.5.tar.xz/subprojects/pkcs11-json/meson.build Added

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/Makefile.am -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/Makefile.am Changed

@@ -8,13 +8,8 @@
 	$(NULL)
 
 libtrust_data_la_SOURCES = \
-	trust/asn1.c trust/asn1.h \
-	trust/base64.c trust/base64.h \
-	trust/pem.c trust/pem.h \
-	trust/oid.c trust/oid.h \
 	trust/utf8.c trust/utf8.h \
 	trust/x509.c trust/x509.h \
-	$(asn_h) \
 	$(NULL)
 
 libtrust_data_la_CFLAGS = \
@@ -30,12 +25,10 @@
 	trust/digest.c trust/digest.h \
 	trust/index.c trust/index.h \
 	trust/parser.c trust/parser.h \
-	trust/persist.c trust/persist.h \
 	trust/module.c trust/module.h \
 	trust/save.c trust/save.h \
 	trust/session.c trust/session.h \
 	trust/token.c trust/token.h \
-	trust/types.h \
 	$(NULL)
 
 configdir = $(p11_package_config_modules)
@@ -53,6 +46,7 @@
 p11_kit_trust_la_LIBADD = \
 	libtrust-data.la \
 	libp11-library.la \
+	libp11-asn1.la \
 	libp11-common.la \
 	$(LIBTASN1_LIBS) \
 	$(HASH_LIBS) \
@@ -85,6 +79,7 @@
 trust_trust_LDADD = \
 	libtrust-data.la \
 	libp11-kit.la \
+	libp11-asn1.la \
 	libp11-common.la \
 	libp11-tool.la \
 	$(LTLIBINTL) \
@@ -101,7 +96,6 @@
 trust_trust_SOURCES = \
 	trust/anchor.c trust/anchor.h \
 	trust/parser.c trust/parser.h \
-	trust/persist.c trust/persist.h \
 	trust/digest.c trust/digest.h \
 	trust/dump.c trust/dump.h \
 	trust/enumerate.c trust/enumerate.h \
@@ -115,7 +109,6 @@
 	trust/save.c trust/save.h \
 	trust/check-format.c trust/check-format.h \
 	trust/trust.c \
-	$(asn_h) \
 	$(NULL)
 
 externaldir = $(privatedir)
@@ -131,22 +124,6 @@
 	trust/p11-kit-trust.module \
 	trust/meson.build
 
-SUFFIXES += .asn .asn.h
-.asn.asn.h:
-	$(AM_V_GEN)$(ASN1PARSER) -o $@ $<
-
-asn_h = \
-	trust/basic.asn.h \
-	trust/openssl.asn.h \
-	trust/pkix.asn.h
-
-BUILT_SOURCES += $(asn_h)
-
-EXTRA_DIST += \
-	trust/basic.asn \
-	trust/openssl.asn \
-	trust/pkix.asn
-
 # Tests ----------------------------------------------------------------
 
 trust_CFLAGS = \
@@ -160,6 +137,7 @@
 	libp11-kit.la \
 	libp11-library.la \
 	libp11-test.la \
+	libp11-asn1.la \
 	libp11-common.la \
 	$(LIBTASN1_LIBS) \
 	$(HASH_LIBS) \
@@ -175,7 +153,6 @@
 
 c_tests += \
 	test-digest \
-	test-asn1 \
 	test-base64 \
 	test-pem \
 	test-oid \
@@ -196,10 +173,6 @@
 	test-jks \
 	$(NULL)
 
-test_asn1_SOURCES = trust/test-asn1.c
-test_asn1_LDADD = $(trust_LIBS)
-test_asn1_CFLAGS = $(trust_CFLAGS)
-
 test_base64_SOURCES = trust/test-base64.c
 test_base64_LDADD = $(trust_LIBS)
 test_base64_CFLAGS = $(trust_CFLAGS)
@@ -232,10 +205,6 @@
 test_module_LDADD = $(trust_LIBS)
 test_module_CFLAGS = $(trust_CFLAGS)
 
-test_oid_SOURCES = trust/test-oid.c
-test_oid_LDADD = $(trust_LIBS)
-test_oid_CFLAGS = $(trust_CFLAGS)
-
 test_openssl_SOURCES = trust/test-openssl.c
 test_openssl_LDADD = $(trust_LIBS)
 test_openssl_CFLAGS = $(trust_CFLAGS)
@@ -323,13 +292,7 @@
 frob_token_LDADD = $(trust_LIBS)
 frob_token_CFLAGS = $(trust_CFLAGS)
 
-noinst_SCRIPTS += trust/test-extract.sh trust/test-trust.sh
-
-if !OS_WIN32
-installcheck-local:
-	builddir="$(abs_top_builddir)/trust" $(SHELL) $(srcdir)/trust/test-extract.sh
-	builddir="$(abs_top_builddir)/trust" $(SHELL) $(srcdir)/trust/test-trust.sh
-endif
+post_install_tests += trust/test-extract.sh trust/test-trust.sh
 
 EXTRA_DIST += \
 	trust/input \

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/anchor.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/anchor.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/check-format.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/check-format.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/dump.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/dump.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/extract.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/extract.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/list.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/list.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/meson.build -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/meson.build Changed

@@ -1,42 +1,18 @@
 libtrust_data_sources = 
-  'asn1.c',
-  'base64.c',
-  'pem.c',
-  'oid.c',
   'utf8.c',
   'x509.c'
 
 
-basic_asn_h = custom_target('basic.asn.h',
-                            output: 'basic.asn.h',
-                            input: 'basic.asn',
-                            command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@')
-
-pkix_asn_h = custom_target('pkix.asn.h',
-                           output: 'pkix.asn.h',
-                           input: 'pkix.asn',
-                           command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@')
-
-openssl_asn_h = custom_target('openssl.asn.h',
-                            output: 'openssl.asn.h',
-                            input: 'openssl.asn',
-                            command: asn1Parser, '-o', '@OUTPUT@', '@INPUT@')
-
-asn_h_dep = declare_dependency(
-  sources: basic_asn_h, pkix_asn_h, openssl_asn_h
-)
-
 libtrust_data = static_library('libtrust-data',
                                libtrust_data_sources,
                                include_directories: configinc, commoninc,
-                               dependencies: asn_h_dep + libtasn1_deps)
+                               dependencies: libp11_asn1_deps)
 
 libtrust_sources = 
   'builder.c',
   'digest.c',
   'index.c',
   'parser.c',
-  'persist.c',
   'module.c',
   'save.c',
   'session.c',
@@ -56,7 +32,7 @@
               'module-init.c',
               name_prefix: '',
               c_args: p11_kit_trust_c_args,
-              dependencies: asn_h_dep, libp11_library_dep + dlopen_deps + libtasn1_deps,
+              dependencies: libp11_library_dep + libp11_asn1_deps + dlopen_deps,
               link_args: p11_module_ldflags,
               link_depends: p11_module_symbol_map,
               link_with: libtrust_data,
@@ -80,7 +56,6 @@
   'anchor.c',
   'check-format.c',
   'parser.c',
-  'persist.c',
   'digest.c',
   'dump.c',
   'enumerate.c',
@@ -121,10 +96,8 @@
 
   trust_tests = 
     'test-digest',
-    'test-asn1',
     'test-base64',
     'test-pem',
-    'test-oid',
     'test-utf8',
     'test-x509',
     'test-persist',
@@ -194,4 +167,23 @@
                                   libp11_test_dep + libtasn1_deps + libffi_deps + dlopen_deps,
                    link_with: libtrust_testable, libtrust_data, libtrust_test)
   endforeach
+
+  if get_option('post_install_test') and host_system != 'windows'
+    # TODO: this cannot run under meson, as it installs a placeholder
+    # extract-compat script and there is no way to replace it.
+    #
+    # meson.add_install_script(
+    #   top_source_dir / 'meson_post_install_test.sh',
+    #   bindir,
+    #   libdir,
+    #   find_program('test-extract.sh'),
+    # )
+
+    meson.add_install_script(
+      top_source_dir / 'meson_post_install_test.sh',
+      bindir,
+      libdir,
+      find_program('test-trust.sh'),
+    )
+  endif
 endif

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/test-extract.sh -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/test-extract.sh Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/test-trust.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/test-trust.c Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/test-trust.sh -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/test-trust.sh Changed

_service:tar_scm:p11-kit-0.25.0.tar.xz/trust/trust.c -> _service:tar_scm:p11-kit-0.25.5.tar.xz/trust/trust.c Changed