diff options
| author | Werner Koch <[email protected]> | 2006-04-19 13:24:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-04-19 13:24:36 +0000 |
| commit | d0907e64f473b743ec7a6888583e19502b804ca2 (patch) | |
| tree | 455edb5bd2b75ce96b967fc398160f3adb989a66 /g10/seckey-cert.c | |
| parent | Merged with gpg 1.4.3 code. (diff) | |
| download | gnupg-d0907e64f473b743ec7a6888583e19502b804ca2.tar.gz gnupg-d0907e64f473b743ec7a6888583e19502b804ca2.zip | |
Continued with merging.
Still does not build.
Diffstat (limited to 'g10/seckey-cert.c')
| -rw-r--r-- | g10/seckey-cert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 382ad7534..acb2cdada 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -232,7 +232,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, copy_secret_key( sk, save_sk ); passphrase_clear_cache ( keyid, NULL, sk->pubkey_algo ); free_secret_key( save_sk ); - return G10ERR_BAD_PASS; + return gpg_error (GPG_ERR_BAD_PASSPHRASE); } /* The checksum may fail, so we also check the key itself. */ @@ -241,7 +241,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, copy_secret_key( sk, save_sk ); passphrase_clear_cache ( keyid, NULL, sk->pubkey_algo ); free_secret_key( save_sk ); - return G10ERR_BAD_PASS; + return gpg_error (GPG_ERR_BAD_PASSPHRASE); } free_secret_key( save_sk ); sk->is_protected = 0; @@ -286,7 +286,7 @@ check_secret_key( PKT_secret_key *sk, int n ) if( n < 1 ) n = (opt.batch && !opt.use_agent)? 1 : 3; /* use the default value */ - for(i=0; i < n && gpg_err_code (rc) == G10ERR_BAD_PASS; i++ ) { + for(i=0; i < n && gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE; i++ ) { int canceled = 0; const char *tryagain = NULL; if (i) { |