diff options
| author | Werner Koch <[email protected]> | 2011-04-29 13:10:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-04-29 13:10:36 +0000 |
| commit | c36deeea8bb06ed62b33cfd23f57ea3bba8eddde (patch) | |
| tree | da8728c09089706dab6e44cf5c72bf9d00e05585 /kbx/kbxutil.c | |
| parent | Fix import stat counter and abort secret key import on merge-only error case. (diff) | |
| parent | Re-indentation of keydb.c and error code changes. (diff) | |
| download | gnupg-c36deeea8bb06ed62b33cfd23f57ea3bba8eddde.tar.gz gnupg-c36deeea8bb06ed62b33cfd23f57ea3bba8eddde.zip | |
Merge branch 'wk-gpg-keybox'
Diffstat (limited to '')
| -rw-r--r-- | kbx/kbxutil.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index b1fd3348d..333c28695 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -1,5 +1,5 @@ /* kbxutil.c - The Keybox utility - * Copyright (C) 2000, 2001, 2004, 2007 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2004, 2007, 2011 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -389,8 +389,18 @@ import_openpgp (const char *filename) { if (gpg_err_code (err) == GPG_ERR_NO_DATA) break; - log_info ("%s: failed to parse OpenPGP keyblock: %s\n", - filename, gpg_strerror (err)); + if (gpg_err_code (err) == GPG_ERR_UNSUPPORTED_ALGORITHM) + { + /* This is likely a v3 key packet with a non-RSA + algorithm. These are keys from very early versions + of GnuPG (pre-OpenPGP). */ + } + else + { + fflush (stdout); + log_info ("%s: failed to parse OpenPGP keyblock: %s\n", + filename, gpg_strerror (err)); + } } else { |