security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

agent: Do not consider --min-passphrase-len for the magic wand.

Browse source 
* agent/call-pinentry.c (generate_pin): Lock to exactly 30 octets.
* g10/gpg.c (main) <aGenRandom>: Add Level 30.
This commit is contained in:
Werner Koch 2022-06-27 18:02:03 +02:00
parent 99d2931887
commit ae2f1f0785
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
3 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
g10/gpg.c
View file

@ -64,6 +64,7 @@
#include "objcache.h"
#include "../common/init.h"
#include "../common/mbox-util.h"
#include "../common/zb32.h"
#include "../common/shareddefs.h"
#include "../common/compliance.h"
#include "../common/comopt.h"
@ -5068,8 +5069,29 @@ main (int argc, char **argv)
if (hexhack)
level = 1;
/* Level 30 uses the same algorithm as our magic wand in
* pinentry/gpg-agent. */
if (level == 30)
{
unsigned int nbits = 150;
size_t nbytes = (nbits + 7) / 8;
void *rand;
char *generated;
rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
if (!rand)
log_fatal ("failed to generate random password\n");
generated = zb32_encode (rand, nbits);
gcry_free (rand);
es_fputs (generated, es_stdout);
es_putc ('\n', es_stdout);
xfree (generated);
break;
}
if (argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0)
wrong_args ("--gen-random 0|1|2 [count]");
wrong_args ("--gen-random 0|1|2|16|30 [count]");
while (endless || count)
{