agent: Make --disable-extended-key-format a dummy option.

* agent/agent.h (opt): Remove enable_extended_key_format.
* agent/gpg-agent.c (enum cmd_and_opt_values): Turn
oDisableExtendedKeyFormat and oEnableExtendedKeyFormat into dummy
options.

* agent/protect.c (do_encryption): Remove arg use_ocb and
corresponding code.
(agent_protect): Ditto.  Change all callers.

* agent/findkey.c (agent_write_private_key): Simplify due to the
removal of disable-extended-key-format.
(write_extended_private_key): Fold into agent_write_private_key.
--

This change is related to
GnuPG-bug-id: 6386
but should have no visible effect except for the removal of
option --disable-extended-key-format.

1 files changed, 5 insertions, 9 deletions

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 921522d53..1a03de010 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -615,15 +615,11 @@ remote machine.
 @itemx --disable-extended-key-format
 @opindex enable-extended-key-format
 @opindex disable-extended-key-format
-Since version 2.3 keys are created in the extended private key format.
-Changing the passphrase of a key will also convert the key to that new
-format.  This new key format is supported since GnuPG version 2.1.12
-and thus there should be no need to disable it.  The disable option
-allows to revert to the old behavior for new keys; be aware that keys
-are never migrated back to the old format.  However if the enable
-option has been used the disable option won't have an effect.  The
-advantage of the extended private key format is that it is text based
-and can carry additional meta data.
+These options are obsolete and have no effect.  The extended key format
+is used for years now and has been supported since 2.1.12.  Existing
+keys in the old format are migrated to the new format as soon as they
+are touched.
+
 
 @anchor{option --enable-ssh-support}
 @item --enable-ssh-support