mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-13 22:21:09 +02:00
* g10.c (main): --gen-random --armor does now output a base64
encoded string.
This commit is contained in:
parent
04d8d2263c
commit
e245123907
@ -1,3 +1,8 @@
|
|||||||
|
2002-01-30 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
|
* g10.c (main): --gen-random --armor does now output a base64
|
||||||
|
encoded string.
|
||||||
|
|
||||||
2002-01-28 David Shaw <dshaw@jabberwocky.com>
|
2002-01-28 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* g10.c (main), options.h, pkclist.c (algo_available): --pgp6
|
* g10.c (main), options.h, pkclist.c (algo_available): --pgp6
|
||||||
|
20
g10/g10.c
20
g10/g10.c
@ -1879,17 +1879,33 @@ main( int argc, char **argv )
|
|||||||
|
|
||||||
while( endless || count ) {
|
while( endless || count ) {
|
||||||
byte *p;
|
byte *p;
|
||||||
size_t n = !endless && count < 100? count : 100;
|
/* Wee need a multiple of 3, so that in case of
|
||||||
|
armored output we get a correct string. No
|
||||||
|
linefolding is done, as it is best to levae this to
|
||||||
|
other tools */
|
||||||
|
size_t n = !endless && count < 99? count : 99;
|
||||||
|
|
||||||
p = get_random_bits( n*8, level, 0);
|
p = get_random_bits( n*8, level, 0);
|
||||||
#ifdef HAVE_DOSISH_SYSTEM
|
#ifdef HAVE_DOSISH_SYSTEM
|
||||||
setmode ( fileno(stdout), O_BINARY );
|
setmode ( fileno(stdout), O_BINARY );
|
||||||
#endif
|
#endif
|
||||||
fwrite( p, n, 1, stdout );
|
if (opt.armor) {
|
||||||
|
char *tmp = make_radix64_string (p, n);
|
||||||
|
fputs (tmp, stdout);
|
||||||
|
m_free (tmp);
|
||||||
|
if (n%3 == 1)
|
||||||
|
putchar ('=');
|
||||||
|
if (n%3)
|
||||||
|
putchar ('=');
|
||||||
|
} else {
|
||||||
|
fwrite( p, n, 1, stdout );
|
||||||
|
}
|
||||||
m_free(p);
|
m_free(p);
|
||||||
if( !endless )
|
if( !endless )
|
||||||
count -= n;
|
count -= n;
|
||||||
}
|
}
|
||||||
|
if (opt.armor)
|
||||||
|
putchar ('\n');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user