Hello community,
here is the log from the commit of package p11-kit for openSUSE:Factory
checked in at Sun Oct 2 10:22:45 CEST 2011.
--------
--- openSUSE:Factory/p11-kit/p11-kit.changes 2011-09-23 12:21:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/p11-kit/p11-kit.changes 2011-09-27 21:25:46.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Sep 27 19:24:59 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.7:
+ + Expand p11-kit config variables correctly in various build
+ scenarios
+ + Add test tool to print out error messages
+ + Build fix on FreeBSD
+
+-------------------------------------------------------------------
+Thu Sep 15 05:02:07 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.6:
+ + Add concept of a default module directory from which modules
+ with relative paths are loaded.
+ + Renamed pkg-config variables to make it clearer what's what.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
p11-kit-0.5.tar.gz
New:
----
p11-kit-0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ p11-kit.spec ++++++
--- /var/tmp/diff_new_pack.XQKSjB/_old 2011-10-02 10:22:42.000000000 +0200
+++ /var/tmp/diff_new_pack.XQKSjB/_new 2011-10-02 10:22:42.000000000 +0200
@@ -18,7 +18,7 @@
Name: p11-kit
-Version: 0.5
+Version: 0.7
Release: 1
Summary: Library to work with PKCS#11 modules
License: BSD3c
++++++ p11-kit-0.5.tar.gz -> p11-kit-0.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/ChangeLog new/p11-kit-0.7/ChangeLog
--- old/p11-kit-0.5/ChangeLog 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/ChangeLog 2011-09-27 10:14:38.000000000 +0200
@@ -1,5 +1,140 @@
# Generate automatically. Do not edit.
+commit 67b52ed7d7f298f64be5ead41deeeebab1238d47
+Author: Stef Walter
+Date: 2011-09-27
+
+ Release 0.7
+
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ po/p11-kit.pot | 4 ++--
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+commit d3e245f579d917d1393624b6ecf3ae0c3748bbb3
+Author: Stef Walter
+Date: 2011-09-27
+
+ Don't expand p11-kit config variables in configure.
+
+ * Expand them later in Makefile and pkg-config file
+
+ configure.ac | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit fcb71c3962314b48e9f8bd7f82673fa4e065607d
+Author: Stef Walter
+Date: 2011-09-26
+
+ Add test tool to print out error messages
+
+ * Allows checking of translations
+
+ .gitignore | 1 +
+ tests/Makefile.am | 3 +-
+ tests/print-messages.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 140 insertions(+), 1 deletions(-)
+
+commit a1cc80045864777db8c77e711f0a8efaad949c3e
+Author: Andreas Metzler
+Date: 2011-09-26
+
+ Fix quoting of build variables
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=40985
+
+ p11-kit/Makefile.am | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a081b6652acc9d9a9af22a266f9175f689b8c5d1
+Author: Stef Walter
+Date: 2011-09-19
+
+ Expand the libdir path correctly
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=40985
+
+ configure.ac | 6 ------
+ p11-kit/Makefile.am | 9 ++++++++-
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 8054865325fdb2221f3e425d04d9e03f6475553e
+Author: Roman Bogorodskiy
+Date: 2011-09-15
+
+ Add #include for PATH_MAX to fix compilation on FreeBSD.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=40923
+
+ p11-kit/modules.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 67dc760cec1653e9571b7c4e2bada3992c2b8361
+Author: Stef Walter
+Date: 2011-09-14
+
+ Release version 0.6
+
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ po/p11-kit.pot | 4 ++--
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 11f3f0effb14be788e320d2f75b0d2d769058966
+Author: Stef Walter
+Date: 2011-09-14
+
+ Add documentation about the configuration paths
+
+ * Default module path
+ * How to lookup paths using pkg-config
+
+ doc/p11-kit-config.xml | 37 ++++++++++++++++++++++---------------
+ doc/p11-kit-docs.sgml | 1 +
+ doc/p11-kit-notes.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/p11-kit.xml | 3 +++
+ doc/style.css | 2 ++
+ 5 files changed, 76 insertions(+), 15 deletions(-)
+
+commit 927d2e5927ddad1eafe94c0bcadd76cd73d6297a
+Author: Kalev Lember
+Date: 2011-09-14
+
+ When a module has a relative path, load it from $libdir/pkcs11
+
+ So far we have only supported full paths to the pkcs11 modules in config
+ files. This change adds relative path support, so that for modules
+ installed under the standard $libdir/pkcs11, the config file won't have
+ to spell out the full path.
+
+ configure.ac | 9 +++++++
+ p11-kit/modules.c | 61 ++++++++++++++++++++++++++++++++++++++++++++--
+ p11-kit/p11-kit-1.pc.in | 1 +
+ 3 files changed, 68 insertions(+), 3 deletions(-)
+
+commit 138c1efa9af4893536fb7c3a90d3cb1ac24cea89
+Author: Kalev Lember
+Date: 2011-09-14
+
+ Rename pkgconfig configuration directory variables
+
+ Renamed them to reduce ambiguity and to pave the way for exposing
+ some additional parameters.
+
+ p11_system_modules -> p11_system_config_modules
+ p11_user_modules -> p11_user_config_modules
+
+ configure --with-pkcs11-dir
+ =>
+ configure --with-system-config
+
+ configure.ac | 50 ++++++++++++++++++++-------------------
+ p11-kit/Makefile.am | 2 +-
+ p11-kit/modules.c | 5 ++-
+ p11-kit/p11-kit-1.pc.in | 10 ++++---
+ p11-kit/pkcs11.conf.example.in | 2 +-
+ 5 files changed, 37 insertions(+), 32 deletions(-)
+
commit 1cecad87a968ab6441b020fafb95f991b97e84b3
Author: Stef Walter
Date: 2011-08-31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/Makefile.in new/p11-kit-0.7/Makefile.in
--- old/p11-kit-0.5/Makefile.in 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/Makefile.in 2011-09-27 10:13:49.000000000 +0200
@@ -246,11 +246,13 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-p11_system_conf = @p11_system_conf@
-p11_system_dir = @p11_system_dir@
-p11_system_modules = @p11_system_modules@
-p11_user_conf = @p11_user_conf@
-p11_user_modules = @p11_user_modules@
+p11_module_path = @p11_module_path@
+p11_system_config = @p11_system_config@
+p11_system_config_file = @p11_system_config_file@
+p11_system_config_modules = @p11_system_config_modules@
+p11_user_config = @p11_user_config@
+p11_user_config_file = @p11_user_config_file@
+p11_user_config_modules = @p11_user_config_modules@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/NEWS new/p11-kit-0.7/NEWS
--- old/p11-kit-0.5/NEWS 2011-08-31 10:00:11.000000000 +0200
+++ new/p11-kit-0.7/NEWS 2011-09-27 10:12:50.000000000 +0200
@@ -1,3 +1,13 @@
+0.7
+ * Expand p11-kit config variables correctly invarious build scenarios
+ * Add test tool to print out error messages
+ * Build fix on FreeBSD
+
+0.6
+ * Add concept of a default module directory from which modules with
+ relative paths are loaded.
+ * Renamed pkg-config variables to make it clearer what's what.
+
0.5
* Fix crasher in p11_kit_registered_modules()
* Add 'critical' setting for modules, which defaults to 'no'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/config.h.in new/p11-kit-0.7/config.h.in
--- old/p11-kit-0.5/config.h.in 2011-08-31 10:00:22.000000000 +0200
+++ new/p11-kit-0.7/config.h.in 2011-09-27 10:13:48.000000000 +0200
@@ -68,18 +68,6 @@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
-/* System configuration file */
-#undef P11_SYSTEM_CONF
-
-/* System modules dir */
-#undef P11_SYSTEM_MODULES
-
-/* User configuration file */
-#undef P11_USER_CONF
-
-/* User modules dir */
-#undef P11_USER_MODULES
-
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/configure new/p11-kit-0.7/configure
--- old/p11-kit-0.5/configure 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/configure 2011-09-27 10:13:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for p11-kit 0.5.
+# Generated by GNU Autoconf 2.68 for p11-kit 0.7.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue.
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='p11-kit'
PACKAGE_TARNAME='p11-kit'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='p11-kit 0.5'
+PACKAGE_VERSION='0.7'
+PACKAGE_STRING='p11-kit 0.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue'
PACKAGE_URL='http://p11-glue.freedesktop.org/p11-kit.html'
@@ -624,11 +624,13 @@
GENHTML
LCOV
GCOV
-p11_user_modules
-p11_user_conf
-p11_system_modules
-p11_system_conf
-p11_system_dir
+p11_module_path
+p11_user_config_modules
+p11_user_config_file
+p11_user_config
+p11_system_config_modules
+p11_system_config_file
+p11_system_config
GTK_DOC_USE_REBASE_FALSE
GTK_DOC_USE_REBASE_TRUE
GTK_DOC_USE_LIBTOOL_FALSE
@@ -796,7 +798,8 @@
enable_gtk_doc
enable_gtk_doc_html
enable_gtk_doc_pdf
-with_pkcs11_dir
+with_system_config
+with_module_path
enable_more_warnings
enable_coverage
enable_debug
@@ -1355,7 +1358,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.5 to adapt to many kinds of systems.
+\`configure' configures p11-kit 0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1425,7 +1428,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of p11-kit 0.5:";;
+ short | recursive ) echo "Configuration of p11-kit 0.7:";;
esac
cat <<\_ACEOF
@@ -1468,7 +1471,8 @@
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
--with-html-dir=PATH path to installed docs
- --with-pkcs11-dir Change PKCS#11 system config directory
+ --with-system-config Change PKCS#11 system config directory
+ --with-module-path Load modules with relative path names from here
Some influential environment variables:
CC C compiler command
@@ -1552,7 +1556,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-p11-kit configure 0.5
+p11-kit configure 0.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1887,7 +1891,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.5, which was
+It was created by p11-kit $as_me 0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2714,7 +2718,7 @@
# Define the identity of the package.
PACKAGE='p11-kit'
- VERSION='0.5'
+ VERSION='0.7'
cat >>confdefs.h <<_ACEOF
@@ -14774,40 +14778,32 @@
# PKCS#11 Directories
-# Check whether --with-pkcs11-dir was given.
-if test "${with_pkcs11_dir+set}" = set; then :
- withval=$with_pkcs11_dir; pkcs11_dir=$withval
+# Check whether --with-system-config was given.
+if test "${with_system_config+set}" = set; then :
+ withval=$with_system_config; system_config_dir=$withval
else
- pkcs11_dir=$sysconfdir/pkcs11
+ system_config_dir=$sysconfdir/pkcs11
fi
-# We expand these so we have concrete paths
-p11_system_dir=$(eval echo $pkcs11_dir)
-p11_system_conf=$(eval echo $p11_system_dir/pkcs11.conf)
-p11_system_modules=$(eval echo $p11_system_dir/modules)
-p11_user_conf="~/.pkcs11/pkcs11.conf"
-p11_user_modules="~/.pkcs11/modules"
-
-
-cat >>confdefs.h <<_ACEOF
-#define P11_SYSTEM_CONF "$p11_system_conf"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define P11_SYSTEM_MODULES "$p11_system_modules"
-_ACEOF
+# Check whether --with-module-path was given.
+if test "${with_module_path+set}" = set; then :
+ withval=$with_module_path; module_path=$withval
+else
+ module_path=$libdir/pkcs11
+fi
-cat >>confdefs.h <<_ACEOF
-#define P11_USER_CONF "$p11_user_conf"
-_ACEOF
+# We expand these so we have concrete paths
+p11_system_config=$system_config_dir
+p11_system_config_file=$p11_system_config/pkcs11.conf
+p11_system_config_modules=$p11_system_config/modules
+p11_user_config="~/.pkcs11"
+p11_user_config_file="$p11_user_config/pkcs11.conf"
+p11_user_config_modules="$p11_user_config/modules"
+p11_module_path="$module_path"
-cat >>confdefs.h <<_ACEOF
-#define P11_USER_MODULES "$p11_user_modules"
-_ACEOF
@@ -15641,7 +15637,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by p11-kit $as_me 0.5, which was
+This file was extended by p11-kit $as_me 0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15708,7 +15704,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-p11-kit config.status 0.5
+p11-kit config.status 0.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -17609,15 +17605,17 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: build options:
- System Global Config: $p11_system_conf
- User Global Config: $p11_user_conf
- System Module Directory: $p11_system_modules
- User Module Directory: $p11_user_modules
+ System Global Config: $p11_system_config_file
+ System Module Config Directory: $p11_system_config_modules
+ User Global Config: $p11_user_config_file
+ User Module Config Directory: $p11_user_config_modules
+ Load relative module paths from: $p11_module_path
" >&5
$as_echo "$as_me: build options:
- System Global Config: $p11_system_conf
- User Global Config: $p11_user_conf
- System Module Directory: $p11_system_modules
- User Module Directory: $p11_user_modules
+ System Global Config: $p11_system_config_file
+ System Module Config Directory: $p11_system_config_modules
+ User Global Config: $p11_user_config_file
+ User Module Config Directory: $p11_user_config_modules
+ Load relative module paths from: $p11_module_path
" >&6;}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/configure.ac new/p11-kit-0.7/configure.ac
--- old/p11-kit-0.5/configure.ac 2011-08-31 09:59:20.000000000 +0200
+++ new/p11-kit-0.7/configure.ac 2011-09-27 10:11:48.000000000 +0200
@@ -2,7 +2,7 @@
AC_CONFIG_MACRO_DIR([m4])
AC_INIT([p11-kit],
- [0.5],
+ [0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],
[p11-kit],
[http://p11-glue.freedesktop.org/p11-kit.html])
@@ -54,28 +54,32 @@
# --------------------------------------------------------------------
# PKCS#11 Directories
-AC_ARG_WITH([pkcs11-dir],
- [AS_HELP_STRING([--with-pkcs11-dir], [Change PKCS#11 system config directory])],
- [pkcs11_dir=$withval],
- [pkcs11_dir=$sysconfdir/pkcs11])
+AC_ARG_WITH([system-config],
+ [AS_HELP_STRING([--with-system-config], [Change PKCS#11 system config directory])],
+ [system_config_dir=$withval],
+ [system_config_dir=$sysconfdir/pkcs11])
+
+AC_ARG_WITH([module-path],
+ [AS_HELP_STRING([--with-module-path], [Load modules with relative path names from here])],
+ [module_path=$withval],
+ [module_path=$libdir/pkcs11])
# We expand these so we have concrete paths
-p11_system_dir=$(eval echo $pkcs11_dir)
-p11_system_conf=$(eval echo $p11_system_dir/pkcs11.conf)
-p11_system_modules=$(eval echo $p11_system_dir/modules)
-p11_user_conf="~/.pkcs11/pkcs11.conf"
-p11_user_modules="~/.pkcs11/modules"
-
-AC_DEFINE_UNQUOTED(P11_SYSTEM_CONF, "$p11_system_conf", [System configuration file])
-AC_DEFINE_UNQUOTED(P11_SYSTEM_MODULES, "$p11_system_modules", [System modules dir])
-AC_DEFINE_UNQUOTED(P11_USER_CONF, "$p11_user_conf", [User configuration file])
-AC_DEFINE_UNQUOTED(P11_USER_MODULES, "$p11_user_modules", [User modules dir])
-
-AC_SUBST(p11_system_dir)
-AC_SUBST(p11_system_conf)
-AC_SUBST(p11_system_modules)
-AC_SUBST(p11_user_conf)
-AC_SUBST(p11_user_modules)
+p11_system_config=$system_config_dir
+p11_system_config_file=$p11_system_config/pkcs11.conf
+p11_system_config_modules=$p11_system_config/modules
+p11_user_config="~/.pkcs11"
+p11_user_config_file="$p11_user_config/pkcs11.conf"
+p11_user_config_modules="$p11_user_config/modules"
+p11_module_path="$module_path"
+
+AC_SUBST(p11_system_config)
+AC_SUBST(p11_system_config_file)
+AC_SUBST(p11_system_config_modules)
+AC_SUBST(p11_user_config)
+AC_SUBST(p11_user_config_file)
+AC_SUBST(p11_user_config_modules)
+AC_SUBST(p11_module_path)
# --------------------------------------------------------------------
# Warnings to show if using GCC
@@ -188,8 +192,9 @@
AC_MSG_NOTICE([build options:
- System Global Config: $p11_system_conf
- User Global Config: $p11_user_conf
- System Module Directory: $p11_system_modules
- User Module Directory: $p11_user_modules
+ System Global Config: $p11_system_config_file
+ System Module Config Directory: $p11_system_config_modules
+ User Global Config: $p11_user_config_file
+ User Module Config Directory: $p11_user_config_modules
+ Load relative module paths from: $p11_module_path
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/Makefile.in new/p11-kit-0.7/doc/Makefile.in
--- old/p11-kit-0.5/doc/Makefile.in 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/doc/Makefile.in 2011-09-27 10:13:48.000000000 +0200
@@ -197,11 +197,13 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-p11_system_conf = @p11_system_conf@
-p11_system_dir = @p11_system_dir@
-p11_system_modules = @p11_system_modules@
-p11_user_conf = @p11_user_conf@
-p11_user_modules = @p11_user_modules@
+p11_module_path = @p11_module_path@
+p11_system_config = @p11_system_config@
+p11_system_config_file = @p11_system_config_file@
+p11_system_config_modules = @p11_system_config_modules@
+p11_user_config = @p11_user_config@
+p11_user_config_file = @p11_user_config_file@
+p11_user_config_modules = @p11_user_config_modules@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/config-example.html new/p11-kit-0.7/doc/html/config-example.html
--- old/p11-kit-0.5/doc/html/config-example.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/config-example.html 2011-09-27 10:14:38.000000000 +0200
@@ -37,9 +37,11 @@
</pre>
<p>One module configuration file per module: <code class="literal">/etc/pkcs11/modules/my-module</code></p>
<pre class="programlisting">
-# This setting controls the actual module library to load. This config file might
-# be installed by the package that installs this module library.
-module: /usr/lib/my-pkcs11-module.so
+# This setting controls the actual module library to load. This config file
+# might be installed by the package that installs this module library. This
+# is not an absolute path name. Relative path names are loaded from the
+# $(libdir)/pkcs11 directory by default.
+module: my-pkcs11-module.so
# This controls whether the module is required to successfully initialize. If 'yes', then
# a failure to load or initialize this module will result in a p11-kit system failure.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/config-locations.html new/p11-kit-0.7/doc/html/config-locations.html
--- old/p11-kit-0.5/doc/html/config-locations.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/config-locations.html 2011-09-27 10:14:38.000000000 +0200
@@ -27,16 +27,18 @@
There is a system configuration consisting of the various module config
files and a file for global configuration. Optionally each user can provide
additional configuration or override the system configuration.</p>
-<p>The system global configuration file is in
+<p>The system global configuration file is usually in
<code class="literal">/etc/pkcs11/pkcs11.conf</code> and the user global
configuration file is in <code class="literal">~/.pkcs11/pkcs11.conf</code> in the
user's home directory.</p>
-<p>
- The module config files are located in the
- <code class="literal">/etc/pkcs11/modules</code> directory, with one configuration
- file per module. In addition the <code class="literal">~/.pkcs11/modules</code>
- directory can be used for modules installed by the user.
- </p>
+<p>The module config files are usually located in the
+ <code class="literal">/etc/pkcs11/modules</code> directory, with one configuration
+ file per module. In addition the <code class="literal">~/.pkcs11/modules</code> directory
+ can be used for modules installed by the user.</p>
+<p>The default system config file and module directory can be changed
+ when building p11-kit. Always
+ <a class="link" href="config.html#notes-paths" title="Using pkg-config to determine paths">lookup these paths</a> using
+ <code class="literal">pkg-config</code>.</p>
</div>
<div class="footer">
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/config-module.html new/p11-kit-0.7/doc/html/config-module.html
--- old/p11-kit-0.5/doc/html/config-module.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/config-module.html 2011-09-27 10:14:38.000000000 +0200
@@ -22,21 +22,23 @@
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="config-module"></a>Module Configuration</h2></div></div></div>
-<p>Each configured PKCS#11 module has its own config file. The
- location(s) of these files are described below. Most importantly each
- config file specifies the location of the PKCS#11 module to load. Each
- module config file has the following fields:</p>
+<p>Each configured PKCS#11 module has its own config file. These files
+ can be <a class="link" href="config-locations.html" title="Configuration Files">placed in various locations</a>.
+ Most importantly each config file specifies the path of the PKCS#11 module to
+ load. A module config file has the following fields:</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term">module:</span></p></td>
<td>
-<p>The absolute path to the PKCS#11 module to load.
+<p>The filename of the PKCS#11 module to load.
This should include an extension like <code class="literal">.so</code></p>
<p>If this value is blank, then the module will be ignored.
This can be used in the user configs to override loading of a module
specified in the system configuration.</p>
+<p>If this is a relative path, then the module will be loaded
+ from the <a class="link" href="config.html#notes-paths-modules" title="Default path for modules with relative paths">default module directory</a>.</p>
</td>
</tr>
<tr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/config.html new/p11-kit-0.7/doc/html/config.html
--- old/p11-kit-0.5/doc/html/config.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/config.html 2011-09-27 10:14:38.000000000 +0200
@@ -2,47 +2,66 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PKCS#11 Configuration</title>
+<title>Developer and Packager Notes</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="p11-kit">
<link rel="up" href="index.html" title="p11-kit">
-<link rel="prev" href="index.html" title="p11-kit">
-<link rel="next" href="config-example.html" title="Example">
+<link rel="prev" href="sharing-module.html" title="Solution: proxy module">
+<link rel="next" href="reference.html" title="Reference">
<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="sharing-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td> </td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">p11-kit</th>
-<td><a accesskey="n" href="config-example.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="reference.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="config"></a>PKCS#11 Configuration</h2></div></div></div>
+<a name="config"></a>Developer and Packager Notes</h2></div></div></div>
<div class="toc"><dl>
-<dt><span class="section"><a href="config.html#config-introduction">Consistent configuration</a></span></dt>
-<dt><span class="section"><a href="config-example.html">Example</a></span></dt>
-<dt><span class="section"><a href="config-format.html">File format</a></span></dt>
-<dt><span class="section"><a href="config-module.html">Module Configuration</a></span></dt>
-<dt><span class="section"><a href="config-global.html">Global Configuration</a></span></dt>
-<dt><span class="section"><a href="config-locations.html">Configuration Files</a></span></dt>
+<dt><span class="section"><a href="config.html#notes-paths">Using pkg-config to determine paths</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="config.html#notes-paths-config">Path to place module configuration</a></span></dt>
+<dt><span class="section"><a href="config.html#notes-paths-modules">Default path for modules with relative paths</a></span></dt>
+</dl></dd>
</dl></div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="config-introduction"></a>Consistent configuration</h2></div></div></div>
-<p>In order for multiple applications on the user's desktop to use
- PKCS#11 modules in a consistent manner, there must be a configuration
- or registry to specify which modules to load and how to use them. The
- PKCS#11 specification does not specify such a configuration standard.
- </p>
-<p>Because of the multi-library module initialization problem, use of
- PKCS#11 modules must be coordinated within an application. p11-kit
- provides that coordination. Since coordination is required, it follows
- that p11-kit can also implement a consistent module configuration.
- </p>
+<a name="notes-paths"></a>Using pkg-config to determine paths</h2></div></div></div>
+<p>Developers or packagers of PKCS#11 modules need to install various
+ files into specific locations so that p11-kit will recognize and load the
+ module correctly.</p>
+<p>You should use <code class="literal">pkg-config</code> as described below
+ to determine configuration paths. p11-kit installs a
+ <code class="literal">pkg-config</code> file called <code class="literal">p11-kit-1.pc</code>.
+ This file contains all the information about the various paths that p11-kit
+ looks for files at.</p>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="notes-paths-config"></a>Path to place module configuration</h3></div></div></div>
+<p>As described in the <a class="link" href="config-module.html" title="Module Configuration">module configuration</a>
+ documentation, each PKCS#11 module should install a config file describing
+ that module. These config files should be installed to a specific directory which
+ can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_system_config_modules</strong></span>
+/etc/pkcs11/modules</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="notes-paths-modules"></a>Default path for modules with relative paths</h3></div></div></div>
+<p>If a <a class="link" href="config-module.html" title="Module Configuration">module configuration</a>
+ contains a relative path in its <code class="literal">module:</code> setting,
+ then that module will be 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>
+</div>
</div>
</div>
<div class="footer">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/index.html new/p11-kit-0.7/doc/html/index.html
--- old/p11-kit-0.5/doc/html/index.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/index.html 2011-09-27 10:14:38.000000000 +0200
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">p11-kit</p></th></tr></table></div>
-<div><p class="releaseinfo">for p11-kit 0.4
+<div><p class="releaseinfo">for p11-kit 0.6
</p></div>
</div>
<hr>
@@ -35,6 +35,14 @@
<dt><span class="section"><a href="sharing-initialize.html">Solution: p11-kit</a></span></dt>
<dt><span class="section"><a href="sharing-module.html">Solution: proxy module</a></span></dt>
</dl></dd>
+<dt><span class="chapter"><a href="config.html">Developer and Packager Notes</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="config.html#notes-paths">Using pkg-config to determine paths</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="config.html#notes-paths-config">Path to place module configuration</a></span></dt>
+<dt><span class="section"><a href="config.html#notes-paths-modules">Default path for modules with relative paths</a></span></dt>
+</dl></dd>
+</dl></dd>
<dt><span class="chapter"><a href="reference.html">Reference</a></span></dt>
<dd><dl>
<dt>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/p11-kit-Modules.html new/p11-kit-0.7/doc/html/p11-kit-Modules.html
--- old/p11-kit-0.5/doc/html/p11-kit-Modules.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/p11-kit-Modules.html 2011-09-27 10:14:38.000000000 +0200
@@ -37,18 +37,18 @@
</tr></table></div>
<div class="refsynopsisdiv">
<a name="p11-kit-Modules.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()">p11_kit_initialize_registered</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()">p11_kit_finalize_registered</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> * <a class="link" href="p11-kit-Modules.html#p11-kit-registered-modules" title="p11_kit_registered_modules ()">p11_kit_registered_modules</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<pre class="synopsis"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()">p11_kit_initialize_registered</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()">p11_kit_finalize_registered</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> * <a class="link" href="p11-kit-Modules.html#p11-kit-registered-modules" title="p11_kit_registered_modules ()">p11_kit_registered_modules</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
<span class="returnvalue">char</span> * <a class="link" href="p11-kit-Modules.html#p11-kit-registered-module-to-name" title="p11_kit_registered_module_to_name ()">p11_kit_registered_module_to_name</a>
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-registered-name-to-module" title="p11_kit_registered_name_to_module ()">p11_kit_registered_name_to_module</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-<span class="returnvalue">char</span> * <a class="link" href="p11-kit-Modules.html#p11-kit-registered-option" title="p11_kit_registered_option ()">p11_kit_registered_option</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>,
+ (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-registered-name-to-module" title="p11_kit_registered_name_to_module ()">p11_kit_registered_name_to_module</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
+<span class="returnvalue">char</span> * <a class="link" href="p11-kit-Modules.html#p11-kit-registered-option" title="p11_kit_registered_option ()">p11_kit_registered_option</a> (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *field</code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()">p11_kit_initialize_module</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-load-initialize-module" title="p11_kit_load_initialize_module ()">p11_kit_load_initialize_module</a> (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> *module</code></em>);
-<a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()">p11_kit_finalize_module</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()">p11_kit_initialize_module</a> (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-load-initialize-module" title="p11_kit_load_initialize_module ()">p11_kit_load_initialize_module</a> (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> *module</code></em>);
+<a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> <a class="link" href="p11-kit-Modules.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()">p11_kit_finalize_module</a> (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);
</pre>
</div>
<div class="refsect1">
@@ -95,7 +95,7 @@
<a name="p11-kit-Modules.details"></a><h2>Details</h2>
<div class="refsect2">
<a name="p11-kit-initialize-registered"></a><h3>p11_kit_initialize_registered ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_initialize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_initialize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
Initialize all the registered PKCS#11 modules.
</p>
@@ -123,7 +123,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-finalize-registered"></a><h3>p11_kit_finalize_registered ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_finalize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_finalize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
Finalize all the registered PKCS#11 modules. These should have been
initialized with <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a>.
@@ -148,7 +148,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-registered-modules"></a><h3>p11_kit_registered_modules ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> * p11_kit_registered_modules (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> * p11_kit_registered_modules (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
Get a list of all the registered PKCS#11 modules. This list will be valid
once the <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> function has been called.
@@ -170,7 +170,7 @@
<div class="refsect2">
<a name="p11-kit-registered-module-to-name"></a><h3>p11_kit_registered_module_to_name ()</h3>
<pre class="programlisting"><span class="returnvalue">char</span> * p11_kit_registered_module_to_name
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
+ (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
<p>
Get the name of a registered PKCS#11 module.
</p>
@@ -197,7 +197,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-registered-name-to-module"></a><h3>p11_kit_registered_name_to_module ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> p11_kit_registered_name_to_module (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span></a> p11_kit_registered_name_to_module (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
<p>
Lookup a registered PKCS#11 module by its name. This name is specified by
the registered module configuration.
@@ -220,7 +220,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-registered-option"></a><h3>p11_kit_registered_option ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> * p11_kit_registered_option (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>,
+<pre class="programlisting"><span class="returnvalue">char</span> * p11_kit_registered_option (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>,
<em class="parameter"><code>const <span class="type">char</span> *field</code></em>);</pre>
<p>
Lookup a configured option for a registered PKCS#11 module. If a
@@ -250,7 +250,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-initialize-module"></a><h3>p11_kit_initialize_module ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_initialize_module (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_initialize_module (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
<p>
Initialize an arbitrary PKCS#11 module. Normally using the
<a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> is preferred.
@@ -298,8 +298,8 @@
<hr>
<div class="refsect2">
<a name="p11-kit-load-initialize-module"></a><h3>p11_kit_load_initialize_module ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_load_initialize_module (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> *module</code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_load_initialize_module (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> *module</code></em>);</pre>
<p>
Load an arbitrary PKCS#11 module from a dynamic library file, and
initialize it. Normally using the <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> function
@@ -354,7 +354,7 @@
<hr>
<div class="refsect2">
<a name="p11-kit-finalize-module"></a><h3>p11_kit_finalize_module ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_finalize_module (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
+<pre class="programlisting"><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="returnvalue">CK_RV</span></a> p11_kit_finalize_module (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-FUNCTION-LIST-PTR:CAPS"><span class="type">CK_FUNCTION_LIST_PTR</span></a> module</code></em>);</pre>
<p>
Finalize an arbitrary PKCS#11 module. The module must have been initialized
using <a class="link" href="p11-kit-Modules.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()"><code class="function">p11_kit_initialize_module()</code></a>. In most cases callers will want to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/p11-kit-URIs.html new/p11-kit-0.7/doc/html/p11-kit-URIs.html
--- old/p11-kit-0.5/doc/html/p11-kit-URIs.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/p11-kit-URIs.html 2011-09-27 10:14:38.000000000 +0200
@@ -50,14 +50,14 @@
<span class="returnvalue">int</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-token-info" title="p11_kit_uri_match_token_info ()">p11_kit_uri_match_token_info</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_TOKEN_INFO_PTR</span> token_info</code></em>);
<span class="returnvalue">CK_ATTRIBUTE_PTR</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attributes" title="p11_kit_uri_get_attributes ()">p11_kit_uri_get_attributes</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> *n_attrs</code></em>);
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> *n_attrs</code></em>);
<span class="returnvalue">int</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attributes" title="p11_kit_uri_set_attributes ()">p11_kit_uri_set_attributes</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attrs</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);
<span class="returnvalue">void</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-clear-attributes" title="p11_kit_uri_clear_attributes ()">p11_kit_uri_clear_attributes</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);
<span class="returnvalue">int</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-attributes" title="p11_kit_uri_match_attributes ()">p11_kit_uri_match_attributes</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attrs</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);
<span class="returnvalue">CK_ATTRIBUTE_PTR</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attribute" title="p11_kit_uri_get_attribute ()">p11_kit_uri_get_attribute</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_ATTRIBUTE_TYPE</span> attr_type</code></em>);
<span class="returnvalue">int</span> <a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attribute" title="p11_kit_uri_set_attribute ()">p11_kit_uri_set_attribute</a> (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
@@ -117,7 +117,7 @@
<a name="p11-kit-URIs.details"></a><h2>Details</h2>
<div class="refsect2">
<a name="P11-KIT-URI-SCHEME:CAPS"></a><h3>P11_KIT_URI_SCHEME</h3>
-<pre class="programlisting">#define P11_KIT_URI_SCHEME "pkcs11:"
+<pre class="programlisting">#define P11_KIT_URI_SCHEME "pkcs11"
</pre>
<p>
String of URI scheme for PKCS#11 URIs.
@@ -126,7 +126,7 @@
<hr>
<div class="refsect2">
<a name="P11-KIT-URI-SCHEME-LEN:CAPS"></a><h3>P11_KIT_URI_SCHEME_LEN</h3>
-<pre class="programlisting">#define P11_KIT_URI_SCHEME_LEN 7
+<pre class="programlisting">#define P11_KIT_URI_SCHEME_LEN 6
</pre>
<p>
Length of <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME:CAPS" title="P11_KIT_URI_SCHEME"><code class="literal">P11_KIT_URI_SCHEME</code></a>.
@@ -422,7 +422,7 @@
<div class="refsect2">
<a name="p11-kit-uri-get-attributes"></a><h3>p11_kit_uri_get_attributes ()</h3>
<pre class="programlisting"><span class="returnvalue">CK_ATTRIBUTE_PTR</span> p11_kit_uri_get_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> *n_attrs</code></em>);</pre>
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> *n_attrs</code></em>);</pre>
<p>
</p>
</div>
@@ -431,7 +431,7 @@
<a name="p11-kit-uri-set-attributes"></a><h3>p11_kit_uri_set_attributes ()</h3>
<pre class="programlisting"><span class="returnvalue">int</span> p11_kit_uri_set_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attrs</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);</pre>
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);</pre>
<p>
</p>
</div>
@@ -447,7 +447,7 @@
<a name="p11-kit-uri-match-attributes"></a><h3>p11_kit_uri_match_attributes ()</h3>
<pre class="programlisting"><span class="returnvalue">int</span> p11_kit_uri_match_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
<em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attrs</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);</pre>
+ <em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-ULONG:CAPS"><span class="type">CK_ULONG</span></a> n_attrs</code></em>);</pre>
<p>
Match a attributes against the object parts of this URI.
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/p11-kit-Utilities.html new/p11-kit-0.7/doc/html/p11-kit-Utilities.html
--- old/p11-kit-0.5/doc/html/p11-kit-Utilities.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/p11-kit-Utilities.html 2011-09-27 10:14:38.000000000 +0200
@@ -37,7 +37,7 @@
</tr></table></div>
<div class="refsynopsisdiv">
<a name="p11-kit-Utilities.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">const <span class="returnvalue">char</span> * <a class="link" href="p11-kit-Utilities.html#p11-kit-strerror" title="p11_kit_strerror ()">p11_kit_strerror</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="type">CK_RV</span></a> rv</code></em>);
+<pre class="synopsis">const <span class="returnvalue">char</span> * <a class="link" href="p11-kit-Utilities.html#p11-kit-strerror" title="p11_kit_strerror ()">p11_kit_strerror</a> (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="type">CK_RV</span></a> rv</code></em>);
<span class="returnvalue">char</span> * <a class="link" href="p11-kit-Utilities.html#p11-kit-space-strdup" title="p11_kit_space_strdup ()">p11_kit_space_strdup</a> (<em class="parameter"><code>const unsigned <span class="type">char</span> *string</code></em>,
<em class="parameter"><code><span class="type">size_t</span> max_length</code></em>);
<span class="returnvalue">size_t</span> <a class="link" href="p11-kit-Utilities.html#p11-kit-space-strlen" title="p11_kit_space_strlen ()">p11_kit_space_strlen</a> (<em class="parameter"><code>const unsigned <span class="type">char</span> *string</code></em>,
@@ -54,7 +54,7 @@
<a name="p11-kit-Utilities.details"></a><h2>Details</h2>
<div class="refsect2">
<a name="p11-kit-strerror"></a><h3>p11_kit_strerror ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * p11_kit_strerror (<em class="parameter"><code><a href="http://library.gnome.org/devel/gck/unstable/pkcs11-links.html#CK-RV:CAPS"><span class="type">CK_RV</span></a> rv</code></em>);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> * p11_kit_strerror (<em class="parameter"><code><a href="http://developer.gnome.org/gck/stable/pkcs11-links.html#CK-RV:CAPS"><span class="type">CK_RV</span></a> rv</code></em>);</pre>
<p>
Get a message for a PKCS#11 return value or error code. Do not
pass CKR_OK or other such non errors to this function.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/p11-kit.devhelp new/p11-kit-0.7/doc/html/p11-kit.devhelp
--- old/p11-kit-0.5/doc/html/p11-kit.devhelp 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/p11-kit.devhelp 2011-09-27 10:14:38.000000000 +0200
@@ -15,6 +15,12 @@
<sub name="Solution: p11-kit" link="sharing-initialize.html"/>
<sub name="Solution: proxy module" link="sharing-module.html"/>
</sub>
+ <sub name="Developer and Packager Notes" link="config.html">
+ <sub name="Using pkg-config to determine paths" link="config.html#notes-paths">
+ <sub name="Path to place module configuration" link="config.html#notes-paths-config"/>
+ <sub name="Default path for modules with relative paths" link="config.html#notes-paths-modules"/>
+ </sub>
+ </sub>
<sub name="Reference" link="reference.html">
<sub name="Modules" link="p11-kit-Modules.html"/>
<sub name="URIs" link="p11-kit-URIs.html"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/p11-kit.devhelp2 new/p11-kit-0.7/doc/html/p11-kit.devhelp2
--- old/p11-kit-0.5/doc/html/p11-kit.devhelp2 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/p11-kit.devhelp2 2011-09-27 10:14:38.000000000 +0200
@@ -15,6 +15,12 @@
<sub name="Solution: p11-kit" link="sharing-initialize.html"/>
<sub name="Solution: proxy module" link="sharing-module.html"/>
</sub>
+ <sub name="Developer and Packager Notes" link="config.html">
+ <sub name="Using pkg-config to determine paths" link="config.html#notes-paths">
+ <sub name="Path to place module configuration" link="config.html#notes-paths-config"/>
+ <sub name="Default path for modules with relative paths" link="config.html#notes-paths-modules"/>
+ </sub>
+ </sub>
<sub name="Reference" link="reference.html">
<sub name="Modules" link="p11-kit-Modules.html"/>
<sub name="URIs" link="p11-kit-URIs.html"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/reference.html new/p11-kit-0.7/doc/html/reference.html
--- old/p11-kit-0.5/doc/html/reference.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/reference.html 2011-09-27 10:14:38.000000000 +0200
@@ -6,14 +6,14 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="p11-kit">
<link rel="up" href="index.html" title="p11-kit">
-<link rel="prev" href="sharing-module.html" title="Solution: proxy module">
+<link rel="prev" href="config.html" title="Developer and Packager Notes">
<link rel="next" href="p11-kit-Modules.html" title="Modules">
<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="sharing-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="config.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td> </td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">p11-kit</th>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/sharing-module.html new/p11-kit-0.7/doc/html/sharing-module.html
--- old/p11-kit-0.5/doc/html/sharing-module.html 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/sharing-module.html 2011-09-27 10:14:38.000000000 +0200
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="p11-kit">
<link rel="up" href="sharing.html" title="Sharing PKCS#11 modules">
<link rel="prev" href="sharing-initialize.html" title="Solution: p11-kit">
-<link rel="next" href="reference.html" title="Reference">
+<link rel="next" href="config.html" title="Developer and Packager Notes">
<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
@@ -17,7 +17,7 @@
<td><a accesskey="u" href="sharing.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">p11-kit</th>
-<td><a accesskey="n" href="reference.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="config.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/html/style.css new/p11-kit-0.7/doc/html/style.css
--- old/p11-kit-0.5/doc/html/style.css 2011-08-31 10:04:17.000000000 +0200
+++ new/p11-kit-0.7/doc/html/style.css 2011-09-27 10:14:38.000000000 +0200
@@ -79,5 +79,7 @@
}
H3 {
+ position: relative;
+ left: -1em;
font-weight: normal !important;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/p11-kit-config.xml new/p11-kit-0.7/doc/p11-kit-config.xml
--- old/p11-kit-0.5/doc/p11-kit-config.xml 2011-08-30 21:00:20.000000000 +0200
+++ new/p11-kit-0.7/doc/p11-kit-config.xml 2011-09-14 16:07:36.000000000 +0200
@@ -40,9 +40,11 @@
<para>One module configuration file per module: <literal>/etc/pkcs11/modules/my-module</literal></para>
<programlisting>
-# This setting controls the actual module library to load. This config file might
-# be installed by the package that installs this module library.
-module: /usr/lib/my-pkcs11-module.so
+# This setting controls the actual module library to load. This config file
+# might be installed by the package that installs this module library. This
+# is not an absolute path name. Relative path names are loaded from the
+# $(libdir)/pkcs11 directory by default.
+module: my-pkcs11-module.so
# This controls whether the module is required to successfully initialize. If 'yes', then
# a failure to load or initialize this module will result in a p11-kit system failure.
@@ -110,20 +112,22 @@
<section id="config-module">
<title>Module Configuration</title>
- <para>Each configured PKCS#11 module has its own config file. The
- location(s) of these files are described below. Most importantly each
- config file specifies the location of the PKCS#11 module to load. Each
- module config file has the following fields:</para>
+ <para>Each configured PKCS#11 module has its own config file. These files
+ can be <link linkend="config-locations">placed in various locations</link>.
+ Most importantly each config file specifies the path of the PKCS#11 module to
+ load. A module config file has the following fields:</para>
<variablelist>
<varlistentry>
<term>module:</term>
<listitem>
- <para>The absolute path to the PKCS#11 module to load.
+ <para>The filename of the PKCS#11 module to load.
This should include an extension like <literal>.so</literal></para>
<para>If this value is blank, then the module will be ignored.
This can be used in the user configs to override loading of a module
specified in the system configuration.</para>
+ <para>If this is a relative path, then the module will be loaded
+ from the <link linkend="notes-paths-modules">default module directory</link>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -174,16 +178,19 @@
files and a file for global configuration. Optionally each user can provide
additional configuration or override the system configuration.</para>
- <para>The system global configuration file is in
+ <para>The system global configuration file is usually in
<literal>/etc/pkcs11/pkcs11.conf</literal> and the user global
configuration file is in <literal>~/.pkcs11/pkcs11.conf</literal> in the
user's home directory.</para>
- <para>
- The module config files are located in the
- <literal>/etc/pkcs11/modules</literal> directory, with one configuration
- file per module. In addition the <literal>~/.pkcs11/modules</literal>
- directory can be used for modules installed by the user.
- </para>
+ <para>The module config files are usually located in the
+ <literal>/etc/pkcs11/modules</literal> directory, with one configuration
+ file per module. In addition the <literal>~/.pkcs11/modules</literal> directory
+ can be used for modules installed by the user.</para>
+
+ <para>The default system config file and module directory can be changed
+ when building p11-kit. Always
+ <link linkend="notes-paths">lookup these paths</link> using
+ <literal>pkg-config</literal>.</para>
</section>
</chapter>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/p11-kit-docs.sgml new/p11-kit-0.7/doc/p11-kit-docs.sgml
--- old/p11-kit-0.5/doc/p11-kit-docs.sgml 2011-07-06 16:21:55.000000000 +0200
+++ new/p11-kit-0.7/doc/p11-kit-docs.sgml 2011-09-14 16:07:36.000000000 +0200
@@ -13,6 +13,7 @@
+
<chapter xml:id="reference">
<title>Reference</title>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/style.css new/p11-kit-0.7/doc/style.css
--- old/p11-kit-0.5/doc/style.css 2011-06-06 22:02:43.000000000 +0200
+++ new/p11-kit-0.7/doc/style.css 2011-09-14 16:07:36.000000000 +0200
@@ -79,5 +79,7 @@
}
H3 {
+ position: relative;
+ left: -1em;
font-weight: normal !important;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/doc/version.xml new/p11-kit-0.7/doc/version.xml
--- old/p11-kit-0.5/doc/version.xml 2011-08-31 10:00:21.000000000 +0200
+++ new/p11-kit-0.7/doc/version.xml 2011-09-27 10:13:54.000000000 +0200
@@ -1 +1 @@
-0.5
+0.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/p11-kit/Makefile.am new/p11-kit-0.7/p11-kit/Makefile.am
--- old/p11-kit-0.5/p11-kit/Makefile.am 2011-08-01 13:16:30.000000000 +0200
+++ new/p11-kit-0.7/p11-kit/Makefile.am 2011-09-26 08:30:59.000000000 +0200
@@ -1,7 +1,14 @@
+NULL =
INCLUDES = \
-I$(top_srcdir) \
- -DP11_KIT_FUTURE_UNSTABLE_API
+ -DP11_KIT_FUTURE_UNSTABLE_API \
+ -DP11_SYSTEM_CONFIG_FILE=\""$(p11_system_config_file)"\" \
+ -DP11_SYSTEM_CONFIG_MODULES=\""$(p11_system_config_modules)"\" \
+ -DP11_USER_CONFIG_FILE=\""$(p11_user_config_file)"\" \
+ -DP11_USER_CONFIG_MODULES=\""$(p11_user_config_modules)"\" \
+ -DP11_MODULE_PATH=\""$(p11_module_path)"\" \
+ $(NULL)
incdir = $(includedir)/p11-kit-1/p11-kit
@@ -46,7 +53,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = p11-kit-1.pc
-exampledir = $(p11_system_dir)
+exampledir = $(p11_system_config)
example_DATA = pkcs11.conf.example
EXTRA_DIST = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/p11-kit/Makefile.in new/p11-kit-0.7/p11-kit/Makefile.in
--- old/p11-kit-0.5/p11-kit/Makefile.in 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/p11-kit/Makefile.in 2011-09-27 10:13:48.000000000 +0200
@@ -263,11 +263,13 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-p11_system_conf = @p11_system_conf@
-p11_system_dir = @p11_system_dir@
-p11_system_modules = @p11_system_modules@
-p11_user_conf = @p11_user_conf@
-p11_user_modules = @p11_user_modules@
+p11_module_path = @p11_module_path@
+p11_system_config = @p11_system_config@
+p11_system_config_file = @p11_system_config_file@
+p11_system_config_modules = @p11_system_config_modules@
+p11_user_config = @p11_user_config@
+p11_user_config_file = @p11_user_config_file@
+p11_user_config_modules = @p11_user_config_modules@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -280,9 +282,16 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+NULL =
INCLUDES = \
-I$(top_srcdir) \
- -DP11_KIT_FUTURE_UNSTABLE_API
+ -DP11_KIT_FUTURE_UNSTABLE_API \
+ -DP11_SYSTEM_CONFIG_FILE=\""$(p11_system_config_file)"\" \
+ -DP11_SYSTEM_CONFIG_MODULES=\""$(p11_system_config_modules)"\" \
+ -DP11_USER_CONFIG_FILE=\""$(p11_user_config_file)"\" \
+ -DP11_USER_CONFIG_MODULES=\""$(p11_user_config_modules)"\" \
+ -DP11_MODULE_PATH=\""$(p11_module_path)"\" \
+ $(NULL)
incdir = $(includedir)/p11-kit-1/p11-kit
inc_HEADERS = \
@@ -323,7 +332,7 @@
libp11_kit_testable_la_SOURCES = $(MODULE_SRCS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = p11-kit-1.pc
-exampledir = $(p11_system_dir)
+exampledir = $(p11_system_config)
example_DATA = pkcs11.conf.example
EXTRA_DIST = \
p11-kit-1.pc.in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/p11-kit/modules.c new/p11-kit-0.7/p11-kit/modules.c
--- old/p11-kit-0.5/p11-kit/modules.c 2011-08-30 21:19:27.000000000 +0200
+++ new/p11-kit-0.7/p11-kit/modules.c 2011-09-16 12:51:19.000000000 +0200
@@ -50,11 +50,12 @@
#include
#include
#include
+#include
#include
#include
#include
-#include
#include
+#include
#include
#include
@@ -244,6 +245,35 @@
return mod;
}
+static int
+is_relative_path (const char *path)
+{
+ assert (path);
+
+ return (*path != '/');
+}
+
+static char*
+build_path (const char *dir, const char *filename)
+{
+ char *path;
+ int len;
+
+ assert (dir);
+ assert (filename);
+
+ len = snprintf (NULL, 0, "%s/%s", dir, filename) + 1;
+ if (len <= 0 || len > PATH_MAX)
+ return NULL;
+
+ if (!(path = malloc (len)))
+ return NULL;
+
+ sprintf (path, "%s/%s", dir, filename);
+
+ return path;
+}
+
static CK_RV
dlopen_and_get_function_list (Module *mod, const char *path)
{
@@ -312,11 +342,27 @@
return CKR_OK;
}
+static char*
+expand_module_path (const char *filename)
+{
+ char *path;
+
+ if (is_relative_path (filename)) {
+ debug ("module path is relative, loading from: %s", P11_MODULE_PATH);
+ path = build_path (P11_MODULE_PATH, filename);
+ } else {
+ path = strdup (filename);
+ }
+
+ return path;
+}
+
static CK_RV
take_config_and_load_module_unlocked (char **name, hashmap **config)
{
Module *mod, *prev;
- const char *path;
+ const char *module_filename;
+ char *path;
CK_RV rv;
assert (name);
@@ -324,12 +370,22 @@
assert (config);
assert (*config);
- path = hash_get (*config, "module");
- if (path == NULL) {
+ module_filename = hash_get (*config, "module");
+ if (module_filename == NULL) {
debug ("no module path for module, skipping: %s", *name);
return CKR_OK;
}
+ path = expand_module_path (module_filename);
+ if (!path)
+ return CKR_HOST_MEMORY;
+
+ /* The hash map will take ownership of the variable */
+ if (!hash_set (*config, "module", path)) {
+ free (path);
+ return CKR_HOST_MEMORY;
+ }
+
mod = alloc_module_unlocked ();
if (!mod)
return CKR_HOST_MEMORY;
@@ -395,13 +451,14 @@
return CKR_OK;
/* Load the global configuration files */
- config = _p11_conf_load_globals (P11_SYSTEM_CONF, P11_USER_CONF, &mode);
+ config = _p11_conf_load_globals (P11_SYSTEM_CONFIG_FILE, P11_USER_CONFIG_FILE, &mode);
if (config == NULL)
return (errno == ENOMEM) ? CKR_HOST_MEMORY : CKR_GENERAL_ERROR;
assert (mode != CONF_USER_INVALID);
- configs = _p11_conf_load_modules (mode, P11_SYSTEM_MODULES, P11_USER_MODULES);
+ configs = _p11_conf_load_modules (mode, P11_SYSTEM_CONFIG_MODULES,
+ P11_USER_CONFIG_MODULES);
if (configs == NULL) {
rv = (errno == ENOMEM) ? CKR_HOST_MEMORY : CKR_GENERAL_ERROR;
hash_free (config);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/p11-kit/p11-kit-1.pc.in new/p11-kit-0.7/p11-kit/p11-kit-1.pc.in
--- old/p11-kit-0.5/p11-kit/p11-kit-1.pc.in 2011-07-27 11:55:09.000000000 +0200
+++ new/p11-kit-0.7/p11-kit/p11-kit-1.pc.in 2011-09-14 16:07:36.000000000 +0200
@@ -5,10 +5,13 @@
datarootdir=@datarootdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
-p11_system_conf=@p11_system_conf@
-p11_system_modules=@p11_system_modules@
-p11_user_conf=@p11_user_conf@
-p11_user_modules=@p11_user_modules@
+p11_system_config=@p11_system_config@
+p11_system_config_file=@p11_system_config_file@
+p11_system_config_modules=@p11_system_config_modules@
+p11_user_config=@p11_user_config@
+p11_user_config_file=@p11_user_config_file@
+p11_user_config_modules=@p11_user_config_modules@
+p11_module_path=@p11_module_path@
proxy_module=@libdir@/p11-kit-proxy.so
Name: p11-kit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/p11-kit/pkcs11.conf.example.in new/p11-kit-0.7/p11-kit/pkcs11.conf.example.in
--- old/p11-kit-0.5/p11-kit/pkcs11.conf.example.in 2011-08-01 13:17:42.000000000 +0200
+++ new/p11-kit-0.7/p11-kit/pkcs11.conf.example.in 2011-09-14 16:07:36.000000000 +0200
@@ -1,4 +1,4 @@
-# This is an example @p11_system_conf@ file. Copy it into
+# This is an example @p11_system_config_file@ file. Copy it into
# place before use.
# This setting controls whether to load user configuration from the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/po/p11-kit.pot new/p11-kit-0.7/po/p11-kit.pot
--- old/p11-kit-0.5/po/p11-kit.pot 2011-08-31 10:03:11.000000000 +0200
+++ new/p11-kit-0.7/po/p11-kit.pot 2011-09-27 10:14:08.000000000 +0200
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: p11-kit 0.5\n"
+"Project-Id-Version: p11-kit 0.7\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=p11-"
"glue\n"
-"POT-Creation-Date: 2011-08-31 10:03+0200\n"
+"POT-Creation-Date: 2011-09-27 10:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/tests/Makefile.am new/p11-kit-0.7/tests/Makefile.am
--- old/p11-kit-0.5/tests/Makefile.am 2011-08-14 18:48:47.000000000 +0200
+++ new/p11-kit-0.7/tests/Makefile.am 2011-09-26 08:59:32.000000000 +0200
@@ -16,7 +16,8 @@
conf-test \
uri-test \
pin-test \
- p11-test
+ p11-test \
+ print-messages
p11_test_SOURCES = \
p11-test.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/tests/Makefile.in new/p11-kit-0.7/tests/Makefile.in
--- old/p11-kit-0.5/tests/Makefile.in 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/tests/Makefile.in 2011-09-27 10:13:49.000000000 +0200
@@ -36,7 +36,7 @@
host_triplet = @host@
noinst_PROGRAMS = hash-test$(EXEEXT) ptr-array-test$(EXEEXT) \
conf-test$(EXEEXT) uri-test$(EXEEXT) pin-test$(EXEEXT) \
- p11-test$(EXEEXT)
+ p11-test$(EXEEXT) print-messages$(EXEEXT)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -83,6 +83,12 @@
pin_test_DEPENDENCIES = \
$(top_builddir)/p11-kit/libp11-kit-testable.la \
$(am__DEPENDENCIES_1)
+print_messages_SOURCES = print-messages.c
+print_messages_OBJECTS = print-messages.$(OBJEXT)
+print_messages_LDADD = $(LDADD)
+print_messages_DEPENDENCIES = \
+ $(top_builddir)/p11-kit/libp11-kit-testable.la \
+ $(am__DEPENDENCIES_1)
ptr_array_test_SOURCES = ptr-array-test.c
ptr_array_test_OBJECTS = ptr-array-test.$(OBJEXT)
ptr_array_test_LDADD = $(LDADD)
@@ -122,9 +128,9 @@
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = conf-test.c hash-test.c $(p11_test_SOURCES) pin-test.c \
- ptr-array-test.c uri-test.c
+ print-messages.c ptr-array-test.c uri-test.c
DIST_SOURCES = conf-test.c hash-test.c $(p11_test_SOURCES) pin-test.c \
- ptr-array-test.c uri-test.c
+ print-messages.c ptr-array-test.c uri-test.c
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -259,11 +265,13 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-p11_system_conf = @p11_system_conf@
-p11_system_dir = @p11_system_dir@
-p11_system_modules = @p11_system_modules@
-p11_user_conf = @p11_user_conf@
-p11_user_modules = @p11_user_modules@
+p11_module_path = @p11_module_path@
+p11_system_config = @p11_system_config@
+p11_system_config_file = @p11_system_config_file@
+p11_system_config_modules = @p11_system_config_modules@
+p11_user_config = @p11_user_config@
+p11_user_config_file = @p11_user_config_file@
+p11_user_config_modules = @p11_user_config_modules@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -350,6 +358,9 @@
pin-test$(EXEEXT): $(pin_test_OBJECTS) $(pin_test_DEPENDENCIES)
@rm -f pin-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pin_test_OBJECTS) $(pin_test_LDADD) $(LIBS)
+print-messages$(EXEEXT): $(print_messages_OBJECTS) $(print_messages_DEPENDENCIES)
+ @rm -f print-messages$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(print_messages_OBJECTS) $(print_messages_LDADD) $(LIBS)
ptr-array-test$(EXEEXT): $(ptr_array_test_OBJECTS) $(ptr_array_test_DEPENDENCIES)
@rm -f ptr-array-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ptr_array_test_OBJECTS) $(ptr_array_test_LDADD) $(LIBS)
@@ -368,6 +379,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock-module.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p11-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pin-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-messages.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptr-array-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uri-test.Po@am__quote@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/tests/print-messages.c new/p11-kit-0.7/tests/print-messages.c
--- old/p11-kit-0.5/tests/print-messages.c 1970-01-01 01:00:00.000000000 +0100
+++ new/p11-kit-0.7/tests/print-messages.c 2011-09-26 08:42:27.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * 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
+ */
+
+#include "config.h"
+
+#include
+#include
+#include
+#include
+
+#include "p11-kit.h"
+
+int
+main (int argc, char *argv[])
+{
+ if (argc != 1) {
+ fprintf (stderr, "usage: print-messages\n");
+ exit (2);
+ }
+
+ #define X(x) printf ("%s: %s\n", #x, p11_kit_strerror (x))
+ X(CKR_CANCEL);
+ X(CKR_FUNCTION_CANCELED);
+ X(CKR_HOST_MEMORY);
+ X(CKR_SLOT_ID_INVALID);
+ X(CKR_GENERAL_ERROR);
+ X(CKR_FUNCTION_FAILED);
+ X(CKR_ARGUMENTS_BAD);
+ X(CKR_NEED_TO_CREATE_THREADS);
+ X(CKR_CANT_LOCK);
+ X(CKR_ATTRIBUTE_READ_ONLY);
+ X(CKR_ATTRIBUTE_SENSITIVE);
+ X(CKR_ATTRIBUTE_TYPE_INVALID);
+ X(CKR_ATTRIBUTE_VALUE_INVALID);
+ X(CKR_DATA_INVALID);
+ X(CKR_DATA_LEN_RANGE);
+ X(CKR_DEVICE_ERROR);
+ X(CKR_DEVICE_MEMORY);
+ X(CKR_DEVICE_REMOVED);
+ X(CKR_ENCRYPTED_DATA_INVALID);
+ X(CKR_ENCRYPTED_DATA_LEN_RANGE);
+ X(CKR_FUNCTION_NOT_SUPPORTED);
+ X(CKR_KEY_HANDLE_INVALID);
+ X(CKR_KEY_SIZE_RANGE);
+ X(CKR_KEY_TYPE_INCONSISTENT);
+ X(CKR_KEY_NOT_NEEDED);
+ X(CKR_KEY_CHANGED);
+ X(CKR_KEY_NEEDED);
+ X(CKR_KEY_INDIGESTIBLE);
+ X(CKR_KEY_FUNCTION_NOT_PERMITTED);
+ X(CKR_KEY_NOT_WRAPPABLE);
+ X(CKR_KEY_UNEXTRACTABLE);
+ X(CKR_MECHANISM_INVALID);
+ X(CKR_MECHANISM_PARAM_INVALID);
+ X(CKR_OBJECT_HANDLE_INVALID);
+ X(CKR_OPERATION_ACTIVE);
+ X(CKR_OPERATION_NOT_INITIALIZED);
+ X(CKR_PIN_INCORRECT);
+ X(CKR_PIN_INVALID);
+ X(CKR_PIN_LEN_RANGE);
+ X(CKR_PIN_EXPIRED);
+ X(CKR_PIN_LOCKED);
+ X(CKR_SESSION_CLOSED);
+ X(CKR_SESSION_COUNT);
+ X(CKR_SESSION_HANDLE_INVALID);
+ X(CKR_SESSION_READ_ONLY);
+ X(CKR_SESSION_EXISTS);
+ X(CKR_SESSION_READ_ONLY_EXISTS);
+ X(CKR_SESSION_READ_WRITE_SO_EXISTS);
+ X(CKR_SIGNATURE_INVALID);
+ X(CKR_SIGNATURE_LEN_RANGE);
+ X(CKR_TEMPLATE_INCOMPLETE);
+ X(CKR_TEMPLATE_INCONSISTENT);
+ X(CKR_TOKEN_NOT_PRESENT);
+ X(CKR_TOKEN_NOT_RECOGNIZED);
+ X(CKR_TOKEN_WRITE_PROTECTED);
+ X(CKR_UNWRAPPING_KEY_HANDLE_INVALID);
+ X(CKR_UNWRAPPING_KEY_SIZE_RANGE);
+ X(CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT);
+ X(CKR_USER_ALREADY_LOGGED_IN);
+ X(CKR_USER_NOT_LOGGED_IN);
+ X(CKR_USER_PIN_NOT_INITIALIZED);
+ X(CKR_USER_TYPE_INVALID);
+ X(CKR_USER_ANOTHER_ALREADY_LOGGED_IN);
+ X(CKR_USER_TOO_MANY_TYPES);
+ X(CKR_WRAPPED_KEY_INVALID);
+ X(CKR_WRAPPED_KEY_LEN_RANGE);
+ X(CKR_WRAPPING_KEY_HANDLE_INVALID);
+ X(CKR_WRAPPING_KEY_SIZE_RANGE);
+ X(CKR_WRAPPING_KEY_TYPE_INCONSISTENT);
+ X(CKR_RANDOM_SEED_NOT_SUPPORTED);
+ X(CKR_RANDOM_NO_RNG);
+ X(CKR_DOMAIN_PARAMS_INVALID);
+ X(CKR_BUFFER_TOO_SMALL);
+ X(CKR_SAVED_STATE_INVALID);
+ X(CKR_INFORMATION_SENSITIVE);
+ X(CKR_STATE_UNSAVEABLE);
+ X(CKR_CRYPTOKI_NOT_INITIALIZED);
+ X(CKR_CRYPTOKI_ALREADY_INITIALIZED);
+ X(CKR_MUTEX_BAD);
+ X(CKR_MUTEX_NOT_LOCKED);
+ X(CKR_FUNCTION_REJECTED);
+ #undef X
+
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/p11-kit-0.5/tools/Makefile.in new/p11-kit-0.7/tools/Makefile.in
--- old/p11-kit-0.5/tools/Makefile.in 2011-08-31 10:00:16.000000000 +0200
+++ new/p11-kit-0.7/tools/Makefile.in 2011-09-27 10:13:49.000000000 +0200
@@ -224,11 +224,13 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-p11_system_conf = @p11_system_conf@
-p11_system_dir = @p11_system_dir@
-p11_system_modules = @p11_system_modules@
-p11_user_conf = @p11_user_conf@
-p11_user_modules = @p11_user_modules@
+p11_module_path = @p11_module_path@
+p11_system_config = @p11_system_config@
+p11_system_config_file = @p11_system_config_file@
+p11_system_config_modules = @p11_system_config_modules@
+p11_user_config = @p11_user_config@
+p11_user_config_file = @p11_user_config_file@
+p11_user_config_modules = @p11_user_config_modules@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org