summaryrefslogtreecommitdiffstats
path: root/g10/passphrase.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1997-12-09 13:46:23 +0100
committerWerner Koch <wk@gnupg.org>1997-12-09 13:46:23 +0100
commit935965049d424d3bb69efb672f9f44c36e7cbcb6 (patch)
tree37113923fa101828e1b43a8a71b9a85e17cd82a8 /g10/passphrase.c
parentdetached signatures are working (diff)
downloadgnupg2-935965049d424d3bb69efb672f9f44c36e7cbcb6.tar.xz
gnupg2-935965049d424d3bb69efb672f9f44c36e7cbcb6.zip
fingerprints and self signatures added
Diffstat (limited to 'g10/passphrase.c')
-rw-r--r--g10/passphrase.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 5a45f49bd..4e5e57bb3 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -44,13 +44,13 @@ get_passphrase_hash( u32 *keyid, char *text )
DEK *dek;
if( keyid ) {
- tty_printf("Need a pass phrase to unlock the secret key!\n");
+ tty_printf("\nNeed a pass phrase to unlock the secret key!\n");
tty_printf("KeyID: %08lX\n\n", keyid[1] );
}
- if( keyid && (p=getenv("PGPPATHPHRASE")) ) {
+ if( keyid && (p=getenv("G10PASSPHRASE")) ) {
pw = m_alloc_secure(strlen(p)+1);
strcpy(pw,p);
- tty_printf("Taking it from $PGPPATHPHRASE !\n", keyid[1] );
+ tty_printf("Taking it from $G10PASSPHRASE !\n", keyid[1] );
}
else
pw = tty_get_hidden("Enter pass phrase: " );
@@ -61,7 +61,7 @@ get_passphrase_hash( u32 *keyid, char *text )
m_free(pw); /* is allocated in secure memory, so it will be burned */
if( !p ) {
tty_kill_prompt();
- tty_printf("\n\n");
+ tty_printf("\n");
}
return dek;
}
@@ -70,6 +70,7 @@ get_passphrase_hash( u32 *keyid, char *text )
/****************
* This function is used to construct a DEK from a user input.
* It uses the default CIPHER
+ * Returns: 0 = okay, -1 No passphrase entered, > 0 error
*/
int
make_dek_from_passphrase( DEK *dek, int mode )
@@ -88,7 +89,10 @@ make_dek_from_passphrase( DEK *dek, int mode )
}
m_free(pw2);
}
- rc = hash_passphrase( dek, pw );
+ if( !*pw )
+ rc = -1;
+ else
+ rc = hash_passphrase( dek, pw );
m_free(pw);
return rc;
}