security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg: --gen-random code cleanup by using es_set_binary.

Browse Source 
* g10/gpg.c (main): Replace setmode by es_set_binary and use only when
needed.
--

It is better to use our es_set_binary than to use a Windows specific
method which still worked but is fragile because estream might be
changed.  We now set binary only when needed.  Note that it does not
harm to call es_set_binary more often than needed.
This commit is contained in:
Werner Koch 2023-02-16 13:14:30 +01:00
parent af9a1b5599
commit 1d6ed0a1b4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -8,6 +8,8 @@ Noteworthy changes in version 2.2.42 (unreleased)
* gpg: New list-options show-pref and show-pref-verbose. * gpg: New list-options show-pref and show-pref-verbose.
[rGb6ba7054a0] [rGb6ba7054a0]
* gpg: Add modes 16 and 30 to --gen-random.
* gpgsm: Support ECC certificates. [T6253] * gpgsm: Support ECC certificates. [T6253]
* gpgsm: Also announce AES256-CBC in signatures. [rGaa397fdcdb21] * gpgsm: Also announce AES256-CBC in signatures. [rGaa397fdcdb21]

2
g10/getkey.c
View File

@ -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 * 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 * from the key packet. We do not support v3 keys anymore but
* we keep the code in case a future key versions introduces a * 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 = pk->max_expiredate;
key_expire_seen = 1; key_expire_seen = 1;
} }

4
g10/gpg.c
View File

@ -4945,9 +4945,6 @@ main (int argc, char **argv)
size_t nn; size_t nn;
p = gcry_random_bytes (n, level); p = gcry_random_bytes (n, level);
#ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(stdout), O_BINARY );
#endif
if (hexhack) if (hexhack)
{ {
for (nn = 0; nn < n; nn++) for (nn = 0; nn < n; nn++)
@ -4965,6 +4962,7 @@ main (int argc, char **argv)
} }
else else
{ {
es_set_binary (es_stdout);
es_fwrite( p, n, 1, es_stdout ); es_fwrite( p, n, 1, es_stdout );
} }
xfree(p); xfree(p);