security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

sm: Move qualified.txt from datadir into sysconfdir

Browse Source 
* doc/Makefile.am: Move qualified.txt into examples.
* doc/qualified.txt: Move into examples, remove trailing spaces.
* doc/examples/README: Document qualified.txt.
* doc/gpgsm.texi: Move qualified.txt from datadir into sysconfdir.
* sm/qualified.c (read_list): Move qualified.txt from datadir into
sysconfdir.
--

The qualified.txt is maintained by Administrator it is a configuration
file. In the past it was a hybrid, provided by package and controlled
by the Administrator, however, it is no longer maintained by package.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
This commit is contained in:
Alon Bar-Lev 2017-09-01 22:19:26 +03:00 committed by Werner Koch
parent 926d07c5fa
commit 384a3748d9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Makefile.am
View File

@ -22,7 +22,7 @@ AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am
examples = examples/README examples/scd-event examples/trustlist.txt \ examples = examples/README examples/scd-event examples/trustlist.txt \
examples/vsnfd.prf examples/debug.prf \ examples/vsnfd.prf examples/debug.prf examples/qualified.txt \
examples/systemd-user/README \ examples/systemd-user/README \
examples/systemd-user/dirmngr.service \ examples/systemd-user/dirmngr.service \
examples/systemd-user/dirmngr.socket \ examples/systemd-user/dirmngr.socket \
@ -43,7 +43,7 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
profiles = profiles =
EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem qualified.txt \ EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \ gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \
gnupg-module-overview.png gnupg-module-overview.pdf \ gnupg-module-overview.png gnupg-module-overview.pdf \
gnupg-card-architecture.png gnupg-card-architecture.pdf \ gnupg-card-architecture.png gnupg-card-architecture.pdf \

2
doc/examples/README
View File

@ -9,3 +9,5 @@ trustlist.txt A list of trustworthy root certificates
gpgconf.conf A sample configuration file for gpgconf. gpgconf.conf A sample configuration file for gpgconf.
systemd-user Sample files for a Linux-only init system. systemd-user Sample files for a Linux-only init system.
qualified.txt Sample file for qualified.txt.

0
doc/qualified.txt → doc/examples/qualified.txt
View File

12
doc/gpgsm.texi
View File

@ -843,15 +843,9 @@ purposes.
Note that even if a certificate is listed in this file, this does not Note that even if a certificate is listed in this file, this does not
mean that the certificate is trusted; in general the certificates listed mean that the certificate is trusted; in general the certificates listed
in this file need to be listed also in @file{trustlist.txt}. in this file need to be listed also in @file{trustlist.txt}. This is a global
file an installed in the sysconf directory (e.g.
This is a global file an installed in the data directory @file{@value{SYSCONFDIR}/qualified.txt}).
(e.g. @file{@value{DATADIR}/qualified.txt}). GnuPG installs a suitable
file with root certificates as used in Germany. As new Root-CA
certificates may be issued over time, these entries may need to be
updated; new distributions of this software should come with an updated
list but it is still the responsibility of the Administrator to check
that this list is correct.
Every time @command{gpgsm} uses a certificate for signing or verification Every time @command{gpgsm} uses a certificate for signing or verification
this file will be consulted to check whether the certificate under this file will be consulted to check whether the certificate under

2
sm/qualified.c
View File

@ -58,7 +58,7 @@ read_list (char *key, char *country, int *lnr)
if (!listname) if (!listname)
{ {
listname = make_filename (gnupg_datadir (), "qualified.txt", NULL); listname = make_filename (gnupg_sysconfdir (), "qualified.txt", NULL);
listfp = fopen (listname, "r"); listfp = fopen (listname, "r");
if (!listfp && errno != ENOENT) if (!listfp && errno != ENOENT)
{ {