summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2005-11-13 20:05:00 +0100
committerWerner Koch <wk@gnupg.org>2005-11-13 20:05:00 +0100
commitcaed7370e996eba1f60dc4e25eb8d8fe901a7e17 (patch)
tree6c9e0eb807acdd58352ded05d8514a12f31b2248 /doc
parent2005-10-08 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-caed7370e996eba1f60dc4e25eb8d8fe901a7e17.tar.xz
gnupg2-caed7370e996eba1f60dc4e25eb8d8fe901a7e17.zip
NEw file qualified.ttx - not yet ready for distribution
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/qualified.txt17
-rw-r--r--doc/scdaemon.texi4
4 files changed, 27 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d93a473a2..098139ec8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-13 Werner Koch <wk@g10code.com>
+
+ * qualified.txt: New.
+ * Makefile.am (dist_pkgdata_DATA): New.
+
2005-08-16 Werner Koch <wk@g10code.com>
* gpg-agent.texi (Agent Options): Note default file name for
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fdcd62dc0..47dd36208 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,7 +25,7 @@ BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png
info_TEXINFOS = gnupg.texi
-
+dist_pkgdata_DATA = qualified.txt
gnupg_TEXINFOS = \
gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi assuan.texi \
diff --git a/doc/qualified.txt b/doc/qualified.txt
new file mode 100644
index 000000000..bdab79ad4
--- /dev/null
+++ b/doc/qualified.txt
@@ -0,0 +1,17 @@
+# This is the list of root certificates used for qualified
+# certificates. They are defined as certificates capable of creating
+# legally binding signatures in the same way as a handwritten
+# signatures are. Comments like this one and empty lines are allowed
+# Lines do have a length limit but this is not a serious limitation as
+# the format of the entries is fixed and checked by gpgsm: A
+# non-comment line starts with optional white spaces, followed by
+# exactly 40 hex character, white space and a lowercased 2 letter
+# country code. Additional data delimited with by a white space is
+# current ignored but might late be used for other pusposes.
+
+# CN=Wurzel ZS 3,O=Intevation GmbH,C=DE
+A6935DD34EF3087973C706FC311AA2CCF733765B de
+
+# CN=SPECIMEN Belgium Root CA,C=BE
+6A5FFD257E85DC6081828DD169AA304E7E37DD3B be
+
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 35dca4780..8bc5810cb 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -229,6 +229,10 @@ readers might need a string here; run the program in verbose mode to get
a list of available readers. The default is then the first reader
found.
+@item --disable-keypad
+@opindex disable-keypad
+Even if a card reader features a keypad, do not try to use it.
+
@item --allow-admin
@itemx --deny-admin