aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--common/gettime.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4ea88e84e..3c62e53fe 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,9 @@ Noteworthy changes in version 2.2.42 (unreleased)
* gpg: Allow to specify seconds since Epoch beyond 2038 on 32-bit
platforms. [T6736]
+ * gpg: Fix the "keytocard" command for moving ECC keys with
+ non-standard ECDH parameters to OpenPGP cards. [rG92af3f88a9]
+
* gpgsm: Support ECC certificates. [T6253]
* gpgsm: Print PROGRESS status lines. Add new --input-size-hint.
@@ -65,6 +68,8 @@ Noteworthy changes in version 2.2.42 (unreleased)
* wkd: Make --add-revocs the default in gpg-wks-client. New option
--no-add-revocs. [rG67d57fae3f]
+ * Fix garbled time output in non-English Windows. [T6741]
+
* Ignore attempts to remove the /dev/null device. [T6556]
* Improve advisory file lock retry strategy. [rG45a1ab5017]
diff --git a/common/gettime.c b/common/gettime.c
index c6ee90a14..d24a4b117 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -890,7 +890,7 @@ asctimestamp (u32 stamp)
* 2018 has a lot of additional support but that will for sure
* break other things. We should move to ISO strings to get
* rid of such problems. */
- setlocale (LC_TIME, "");
+ setlocale (LC_TIME, ".UTF8");
done = 1;
/* log_debug ("LC_ALL now '%s'\n", setlocale (LC_ALL, NULL)); */
/* log_debug ("LC_TIME now '%s'\n", setlocale (LC_TIME, NULL)); */