security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

gpg: Add level 16 to --gen-random

Browse Source 
* g10/gpg.c (main): Add that hack.
--

This is an yet undocumented hack to allow printing hex encoded random
number with gpg.  The level is forced to be 1 which is is good for
almost all uses.  Note that --armor is ignored.

Signed-off-by: Werner Koch <wk@gnupg.org>
Backported-from-master: d847f0651ab4304129145b55353501636b4e4728
This commit is contained in:
Werner Koch 2020-08-04 11:03:49 +02:00
parent 67a2973bf9
commit 1d8191faee
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
g10/gpg.c
View File

@ -4905,23 +4905,34 @@ main (int argc, char **argv)
int level = argc ? atoi(*argv):0; int level = argc ? atoi(*argv):0;
int count = argc > 1 ? atoi(argv[1]): 0; int count = argc > 1 ? atoi(argv[1]): 0;
int endless = !count; int endless = !count;
int hexhack = (level == 16);
if( argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0 ) if (hexhack)
wrong_args("--gen-random 0|1|2 [count]"); level = 1;
while( endless || count ) { if (argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0)
wrong_args ("--gen-random 0|1|2 [count]");
while (endless || count)
{
byte *p; byte *p;
/* Wee need a multiple of 3, so that in case of /* We need a multiple of 3, so that in case of armored
armored output we get a correct string. No * output we get a correct string. No linefolding is
linefolding is done, as it is best to levae this to * done, as it is best to leave this to other tools */
other tools */
size_t n = !endless && count < 99? count : 99; size_t n = !endless && count < 99? count : 99;
size_t nn;
p = gcry_random_bytes (n, level); p = gcry_random_bytes (n, level);
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(stdout), O_BINARY ); setmode ( fileno(stdout), O_BINARY );
#endif #endif
if (opt.armor) { if (hexhack)
{
for (nn = 0; nn < n; nn++)
es_fprintf (es_stdout, "%02x", p[nn]);
}
else if (opt.armor)
{
char *tmp = make_radix64_string (p, n); char *tmp = make_radix64_string (p, n);
es_fputs (tmp, es_stdout); es_fputs (tmp, es_stdout);
xfree (tmp); xfree (tmp);
@ -4929,14 +4940,16 @@ main (int argc, char **argv)
es_putc ('=', es_stdout); es_putc ('=', es_stdout);
if (n%3) if (n%3)
es_putc ('=', es_stdout); es_putc ('=', es_stdout);
} else { }
else
{
es_fwrite( p, n, 1, es_stdout ); es_fwrite( p, n, 1, es_stdout );
} }
xfree(p); xfree(p);
if( !endless ) if (!endless)
count -= n; count -= n;
} }
if (opt.armor) if (opt.armor || hexhack)
es_putc ('\n', es_stdout); es_putc ('\n', es_stdout);
} }
break; break;