Daniel Kahn Gillmor 371c2b14b0 gpg: Warn about (but don't fail) on scdaemon options in gpg.conf. ...

* g10/gpg.c: Add config options that should belong in scdaemon.conf
* g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.

--

In gpg2, the following options are only relevant for scdaemon:

 reader-port
 ctapi-driver
 pcsc-driver
 disable-ccid

but in gpg1, they are options for gpg itself.

Some users of gpg1 might have these options in their
~/.gnupg/gpg.conf, which causes gpg2 to fail hard if it reads that
config file.

gpg2 should not fail hard, though giving a warning (and suggesting a
move to scdaemon.conf) seems OK.

This patch does *not* reintroduce any documentation for these options
in gpg.texi, even to indicate that they are "dummy" options, since
scdaemon.texi contains the appropriate documentation.

Debian-bug-id: 762844

- Program names factored out from obsolete_scdaemon_option to make
  reuse without new translations easier. -wk

2014-09-25 22:05:29 +02:00

..

armor.c

gpg: Change armor Version header to emit only the major version.

2013-11-27 09:20:02 +01:00

build-packet.c

gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.

2014-01-30 18:48:37 +01:00

call-agent.c

agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.

2014-08-18 15:42:54 +02:00

call-agent.h

gpg: Re-enable secret key deletion.

2014-04-15 19:44:50 +02:00

call-dirmngr.c

Use "samethread" mode keyword for some es_fopenmem.

2014-05-06 09:49:26 +02:00

call-dirmngr.h

gpg: Print the actual used keyserver address.

2014-03-14 16:12:54 +01:00

card-util.c

gpg: Allow key-to-card upload for cert-only keys

2014-06-25 09:21:32 +02:00

ChangeLog-2011

Generate the ChangeLog from commit logs.

2011-12-01 11:09:02 +01:00

cipher.c

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

comment.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

compress-bz2.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

compress.c

gpg: Avoid infinite loop in uncompressing garbled packets.

2014-06-20 10:41:38 +02:00

cpr.c

common: Add cpr_get_answer_is_yes_def()

2014-07-23 14:35:22 +02:00

dearmor.c

gpg: Create exported secret files and revocs with mode 700.

2014-06-30 09:12:48 +02:00

decrypt-data.c

gpg: Remove useless diagnostic in MDC verification.

2014-05-14 08:56:39 +02:00

decrypt.c

Silence several warnings when building under Windows.

2014-03-07 16:06:35 +01:00

dek.h

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

delkey.c

gpg: --delete-secret-key - check that a secret key exists.

2014-09-20 16:27:16 +02:00

distsigkey.gpg

gpg: Install the current release signing pubkey.

2014-08-18 16:38:13 +02:00

ecdh.c

gpg: Use only OpenPGP cipher algo ids.

2014-01-31 14:35:49 +01:00

encrypt.c

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

exec.c

w32: Include winsock2.h to silence warnings.

2014-03-07 14:18:43 +01:00

exec.h

Changed to GPLv3.

2007-07-04 19:49:40 +00:00

export.c

gpg: Fix export of ecc secret keys by adjusting check ordering.

2014-09-01 10:20:17 +02:00

filter.h

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

free-packet.c

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

getkey.c

gpg: Fix bug parsing a zero length user id.

2014-06-02 11:47:25 +02:00

gpg-w32info.rc

w32: Add icons and version information.

2013-05-07 21:35:48 +02:00

gpg.c

gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.

2014-09-25 22:05:29 +02:00

gpg.h

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

gpgv.c

gpgv: Init Libgcrypt to avoid syslog warning.

2014-03-07 09:58:22 +01:00

helptext.c

Change all quotes in strings and comments to the new GNU standard.

2012-06-05 19:29:22 +02:00

import.c

gpg: Screen keyserver responses.

2014-08-14 15:21:21 +02:00

kbnode.c

Fix minor compiler warnings.

2013-11-15 15:49:34 +01:00

keydb.c

gpg: Create default keyring with .kbx suffix.

2014-09-22 08:36:24 +02:00

keydb.h

gpg: Add list-option "show-usage".

2014-08-13 10:11:36 +02:00

keyedit.c

gpg: Print a warning if the subkey expiration may not be what you want.

2014-09-17 16:27:37 +02:00

keygen.c

gpg: Make algorithm selection prompt for ECC more clear.

2014-09-20 15:17:11 +02:00

keyid.c

gpg: Add list-option "show-usage".

2014-08-13 10:11:36 +02:00

keylist.c

gpg: Add list-option "show-usage".

2014-08-13 10:11:36 +02:00

keyring.c

gpg: Create exported secret files and revocs with mode 700.

2014-06-30 09:12:48 +02:00

keyring.h

Decryption and signi via agent is now implemented.

2010-04-23 11:36:59 +00:00

keyserver-internal.h

Initial code checking for backup - not yet working.

2011-01-10 14:30:17 +01:00

keyserver.c

gpg: Screen keyserver responses.

2014-08-14 15:21:21 +02:00

main.h

gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.

2014-09-25 22:05:29 +02:00

mainproc.c

gpg: Disable an MD5 workaround for pgp2 by default.

2014-08-14 11:28:11 +02:00

Makefile.am

gpg: Install the current release signing pubkey.

2014-08-18 16:38:13 +02:00

mdfilter.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

migrate.c

gpg: Auto-migrate existing secring.gpg.

2014-06-05 11:19:59 +02:00

misc.c

gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.

2014-09-25 22:05:29 +02:00

openfile.c

gpg: Auto-create revocation certificates.

2014-06-30 16:40:55 +02:00

OPTIONS

See ChangeLog: Mon Jul 31 10:04:47 CEST 2000 Werner Koch

2000-07-31 08:04:16 +00:00

options.h

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

options.skel

gpg: Remove legacy keyserver examples from the template conf file.

2014-03-07 09:53:29 +01:00

packet.h

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

parse-packet.c

gpg: Silence a compiler warning.

2014-09-18 15:09:10 +02:00

passphrase.c

gpg: Allow for positional parameters in the passphrase prompt.

2014-08-26 10:16:04 +02:00

photoid.c

gpg: New %U expando for the photo viewer.

2014-04-17 21:44:09 +02:00

photoid.h

Decryption and signi via agent is now implemented.

2010-04-23 11:36:59 +00:00

pkclist.c

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

pkglue.c

gpg: Fix memory leak in ECC encryption.

2014-09-08 18:25:06 +02:00

pkglue.h

gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.

2014-01-30 18:48:37 +01:00

plaintext.c

Change all quotes in strings and comments to the new GNU standard.

2012-06-05 19:29:22 +02:00

progress.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

pubkey-enc.c

ECC Fixes.

2014-04-28 10:36:16 +09:00

pubring.asc

See ChangeLog: Mon Jul 31 10:04:47 CEST 2000 Werner Koch

2000-07-31 08:04:16 +00:00

revoke.c

gpg: Improve passphrase caching.

2014-09-17 15:12:08 +02:00

rmd160.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

rmd160.h

Add missing header file.

2008-12-12 08:54:50 +00:00

seckey-cert.c

Add tweaks for the not anymore patented IDEA algorithm.

2012-05-08 18:18:32 +02:00

server.c

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

seskey.c

gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.

2014-01-30 18:48:37 +01:00

sig-check.c

gpg: Disable an MD5 workaround for pgp2 by default.

2014-08-14 11:28:11 +02:00

sign.c

gpg: Remove options --pgp2 and --rfc1991.

2014-08-14 11:03:55 +02:00

signal.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

skclist.c

gpg: Remove cipher.h and put algo ids into a common file.

2014-01-29 20:35:05 +01:00

t-rmd160.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

tdbdump.c

Change all quotes in strings and comments to the new GNU standard.

2012-06-05 19:29:22 +02:00

tdbio.c

Silence more warnings about unused vars and args.

2014-03-07 19:05:41 +01:00

tdbio.h

gpg: Do not require a trustdb with --always-trust.

2014-03-07 10:44:27 +01:00

textfilter.c

Started to implement the audit log feature.

2007-11-19 16:03:50 +00:00

trust.c

Fix g10/trust.c.

2014-03-06 16:23:10 +09:00

trustdb.c

w32: Silence warnings about unused vars.

2014-03-07 16:11:15 +01:00

trustdb.h

gpg: Allow building without any trust model support.

2014-02-10 17:46:40 +01:00

verify.c

Change all quotes in strings and comments to the new GNU standard.

2012-06-05 19:29:22 +02:00

zlib-riscos.h

include: Remove this directory.

2014-01-29 17:45:05 +01:00