diff options
author | Werner Koch <wk@gnupg.org> | 2000-07-14 19:34:53 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2000-07-14 19:34:53 +0200 |
commit | 92cd25550836198cf1e3a6aac239eef98364359d (patch) | |
tree | 4fad355126fae79c93535e0e7c6afd91e384552a /g10/passphrase.c | |
parent | See ChangeLog: Thu May 25 18:39:11 CEST 2000 Werner Koch (diff) | |
download | gnupg2-92cd25550836198cf1e3a6aac239eef98364359d.tar.xz gnupg2-92cd25550836198cf1e3a6aac239eef98364359d.zip |
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
Diffstat (limited to 'g10/passphrase.c')
-rw-r--r-- | g10/passphrase.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 53b2a82a3..24addd072 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1,5 +1,5 @@ /* passphrase.c - Get a passphrase - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -24,8 +24,9 @@ #include <string.h> #include <unistd.h> #include <assert.h> -#include "util.h" + #include <gcrypt.h> +#include "util.h" #include "options.h" #include "ttyio.h" #include "keydb.h" @@ -163,9 +164,9 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, tty_printf("\"\n"); if( !get_pubkey( pk, keyid ) ) { + const char *s = gcry_pk_algo_name( pk->pubkey_algo ); tty_printf( _("%u-bit %s key, ID %08lX, created %s"), - nbits_from_pk( pk ), - gcry_pk_algo_name( pk->pubkey_algo ), (ulong)keyid[1], + nbits_from_pk( pk ), s?s:"?", (ulong)keyid[1], strtimestamp(pk->timestamp) ); if( keyid[2] && keyid[3] && keyid[0] != keyid[2] && keyid[1] != keyid[3] ) |