summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-02-09 11:25:41 +0100
committerWerner Koch <wk@gnupg.org>2009-02-09 11:25:41 +0100
commitd1c2e66fbc4c67cd39230fa0418d5647fdc7163a (patch)
tree4f47077f36cdc3ee6a26865f5954b1a51f8c399b
parentMake --allow-admin the default. (diff)
downloadgnupg2-d1c2e66fbc4c67cd39230fa0418d5647fdc7163a.tar.xz
gnupg2-d1c2e66fbc4c67cd39230fa0418d5647fdc7163a.zip
Change default gpgsm cipher back to 3DES.
Typo fixes.
-rw-r--r--NEWS8
-rw-r--r--scd/atr.c2
-rw-r--r--scd/command.c2
-rw-r--r--sm/ChangeLog4
4 files changed, 13 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 4dfe2d0bd..3dcb4e7bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,13 @@
Noteworthy changes in version 2.0.11 (unreleased)
-------------------------------------------------
- * [scdaemon] --allow-admin is now the default.
+ * The SCDAEMON option --allow-admin is now used by default.
+
+ * SCDAEMON is now aware of the Geldkarte.
+
+ * [gpgsm] The default cipher algorith is now again 3DES. This is due
+ to interoperability problems with Outlook 2003 which still can't
+ cope with AES.
Noteworthy changes in version 2.0.10 (2009-01-12)
diff --git a/scd/atr.c b/scd/atr.c
index 67a86d09c..f6efd8a95 100644
--- a/scd/atr.c
+++ b/scd/atr.c
@@ -278,7 +278,7 @@ atr_dump (int slot, FILE *fp)
/* Note: This code has not yet been tested! It shall return -1 on
- error or the nu,ber of hiostroical bytes and store them at
+ error or the number of historical bytes and store them at
HISTORICAL. */
int
atr_get_historical (int slot, unsigned char historical[])
diff --git a/scd/command.c b/scd/command.c
index c2b97e64d..8ebcdb323 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -469,7 +469,7 @@ percent_plus_unescape (unsigned char *string)
/* SERIALNO [APPTYPE]
Return the serial number of the card using a status reponse. This
- functon should be used to check for the presence of a card.
+ function should be used to check for the presence of a card.
If APPTYPE is given, an application of that type is selected and an
error is returned if the application is not supported or available.
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 6035c057f..83f4569ca 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-09 Werner Koch <wk@g10code.com>
+
+ * gpgsm.c (main): Change default cipher back to 3DES.
+
2009-01-12 Werner Koch <wk@g10code.com>
* keylist.c (print_utf8_extn_raw): Cast printf precision argument.