diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -8,6 +8,8 @@ Noteworthy changes in version 2.2.42 (unreleased) * gpg: New list-options show-pref and show-pref-verbose. [rGb6ba7054a0] + * gpg: Add modes 16 and 30 to --gen-random. + * gpgsm: Support ECC certificates. [T6253] * gpgsm: Also announce AES256-CBC in signatures. [rGaa397fdcdb21] diff --git a/g10/getkey.c b/g10/getkey.c index 4642174e9..d883df63f 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2763,7 +2763,7 @@ merge_selfsigs_main (ctrl_t ctrl, kbnode_t keyblock, int *r_revoked, * and there was no way to change it, so we start with the one * from the key packet. We do not support v3 keys anymore but * we keep the code in case a future key versions introduces a - * hadr expire time again. */ + * hard expire time again. */ key_expire = pk->max_expiredate; key_expire_seen = 1; } @@ -4945,9 +4945,6 @@ main (int argc, char **argv) size_t nn; p = gcry_random_bytes (n, level); -#ifdef HAVE_DOSISH_SYSTEM - setmode ( fileno(stdout), O_BINARY ); -#endif if (hexhack) { for (nn = 0; nn < n; nn++) @@ -4965,6 +4962,7 @@ main (int argc, char **argv) } else { + es_set_binary (es_stdout); es_fwrite( p, n, 1, es_stdout ); } xfree(p); |