summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-03-07 16:33:25 +0100
committerStef Walter <stefw@gnome.org>2013-03-07 16:35:31 +0100
commitbe5d505fe840836561488bba3d11d8584ca9cb97 (patch)
treedcb95e65b05519bf49e9f3d95df490b1a007cd1e /tools
parent0644bfd4c09c710fec1ed424779919fea7c06fca (diff)
extract-trust: Turn into a placeholder script that does nothing
If the 'p11-kit extract-trust' command is to be used by distributions, make them customize it appropriately.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/p11-kit-extract-trust.in36
1 files changed, 15 insertions, 21 deletions
diff --git a/tools/p11-kit-extract-trust.in b/tools/p11-kit-extract-trust.in
index cc7e5fa..b15dd7d 100755
--- a/tools/p11-kit-extract-trust.in
+++ b/tools/p11-kit-extract-trust.in
@@ -1,27 +1,21 @@
#!/bin/sh
# This script is a placeholder designed to be replaced when this software
-# has been customized for distribution.
+# has been customized for distribution. It should be symlinked linked to the
+# distribution's update-ca-certificates or update-ca-trust command as
+# appropriate. In the future this script will be called when the PKCS#11
+# trust module is used to modifiy trust anchors and related data.
-echo "WARNING: This placeholder extract-trust command has not been customized"
-echo "by your distribution or administrator. Extracting trust infromation to"
-echo "the following example locations:"
-echo
-echo " ~/extract-trust-example/openssl-bundle.pem"
-echo " ~/extract-trust-example/server-auth-bundle.pem"
-echo " ~/extract-trust-example/cacerts"
+echo "p11-kit: the placeholder extract-trust command has not been customized by your distribution."
-DEST=~/extract-trust-example
+# You can use commands like this to extract data from trust modules
+# into appropriate locations for your distribution.
+#
+# p11-kit extract --format=openssl-bundle --filter=ca-anchors \
+# --overwrite /tmp/openssl-bundle.pem
+# p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite \
+# --purpose server-auth /tmp/server-auth-bundle.pem
+# p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite \
+# --purpose server-auth /tmp/cacerts
-# These are nested autoconf variables
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-mkdir -p $DEST
-
-@bindir@/p11-kit extract --format=openssl-bundle --filter=ca-anchors \
- --overwrite $DEST/openssl-bundle.pem
-@bindir@/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite \
- --purpose server-auth $DEST/server-auth-bundle.pem
-@bindir@/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite \
- --purpose server-auth $DEST/cacerts
+exit 1