aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/getkey.c2
-rw-r--r--g10/gpg.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/g10/getkey.c b/g10/getkey.c
index f0843d154..093ce61b0 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2707,7 +2707,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;
}
diff --git a/g10/gpg.c b/g10/gpg.c
index c490ff72b..31cb066c9 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -5057,9 +5057,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++)
@@ -5077,6 +5074,7 @@ main (int argc, char **argv)
}
else
{
+ es_set_binary (es_stdout);
es_fwrite( p, n, 1, es_stdout );
}
xfree(p);