aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2006-10-18Fixed a bug with very long keys.Werner Koch1-5/+5
2006-10-02Fix for bug 537Werner Koch1-1/+1
2006-07-26Fixed memory allocation bug and typos.Werner Koch1-5/+3
2006-06-28i18n fixWerner Koch1-2/+7
2006-06-27Ported patches from 1.4.x Werner Koch1-9/+25
2006-06-12* import.c (import_one): Add a flag (from_sk) so we don't check prefsDavid Shaw1-6/+7
on an autoconverted public key. The check should only happen on the sk size. Noted by Dirk Traulsen.
2006-05-25* keygen.c (gen_dsa): Allow generating DSA2 keys (allow specifying sizes >David Shaw1-0/+9
1024 when --enable-dsa2 is set). The size of q is set automatically based on the key size. (ask_keysize, generate_keypair): Ask for DSA size when --enable-dsa2 is set.
2006-05-23g10/ does build again.Werner Koch1-2/+4
2006-05-22* import.c (import_one): Fix bug when importing a new key from a file.David Shaw1-7/+5
2006-05-22* getkey.c (get_pubkey_byname), import.c (import_one): Fix key selectionDavid Shaw1-3/+11
problem when auto-key-locate returns a list of keys, not all of which are usable (revoked, expired, etc). Noted by Simon Josefsson.
2006-04-19Continued with merging.Werner Koch1-8/+8
Still does not build.
2006-04-19Merged with gpg 1.4.3 code. Werner Koch1-412/+882
The gpg part does not yet build.
2006-04-03About to release 1.4.3gnupg-1.4.3Werner Koch1-3/+2
2006-03-14* main.h, import.c (import_one): Optionally return the fingerprint ofDavid Shaw1-22/+31
the key being imported. (import_keys_internal, import_keys_stream, import): Change all callers.
2005-11-18* keyedit.c (keyedit_menu, menu_clean): Simplify clean options to justDavid Shaw1-6/+4
"clean", and add "minimize". * import.c (parse_import_options): Make help text match the export versions of the options. * options.h, export.c (parse_export_options, do_export_stream): Reduce clean options to two: clean and minimize. * trustdb.h, trustdb.c (clean_one_uid): New function that joins uid and sig cleaning into one for a simple API outside trustdb.
2005-11-12* trustdb.h, trustdb.c (clean_key): New function to handle keyDavid Shaw1-33/+12
cleaning from one convenient place. * options.h, import.c (parse_import_options, clean_sigs_from_all_uids, import_one): Reduce clean options to two: clean and minimize. * parse-packet.c (setup_user_id): Remove. (parse_user_id, parse_attribute): Just use xmalloc_clear instead.
2005-11-10* options.h, import.c (parse_import_options, clean_sigs_from_all_uids,David Shaw1-4/+8
import_one): Add import-minimal option. Similar to export-minimal, except it works on the way in.
2005-11-10* trustdb.h, trustdb.c (clean_sigs_from_uid): Add flag to remove allDavid Shaw1-1/+1
non-selfsigs from key during cleaning. Change all callers. * export.c (do_export_stream): Use it here so we don't need additional minimize code in the export path.
2005-11-02* import.c (import_one): Do collapse_uids() before we do any cleaningDavid Shaw1-5/+4
so keyserver mangled keys with doubled user IDs can be properly cleaned - possibly sigs on the different user IDs cancel each other out. * import.c (parse_import_options), export.c (parse_export_options): List "xxx-clean" before the longer options so we don't end up with a partial match on the longer options. * trustdb.c (clean_uids_from_key): Return proper number of cleaned user IDs. Don't count user IDs as cleaned unless we actually delete something.
2005-09-14* main.h, misc.c (parse_options): Add the ability to have helpDavid Shaw1-12/+20
strings in xxx-options commands. * keyserver.c (keyserver_opts), import.c (parse_import_options), export.c (parse_export_options), g10.c (parse_list_options, main): Add help strings to xxx-options.
2005-07-27Converted all m_free to xfree etc.Werner Koch1-27/+27
2005-07-26Preparing a releaseWerner Koch1-2/+1
2005-07-22* gpg.sgml (http):Werner Koch1-1/+2
* g10.c, options.h: New option --exit-on-status-write-error. * status.c (write_status_text): Make use of this option.
2005-07-09* trustdb.c (clean_uids_from_key): Don't keep a valid selfsig aroundDavid Shaw1-6/+7
when compacting a uid. There is no reason to make an attacker's job easier - this way they only have a revocation which is useless in bringing the uid back. * keydb.h, kbnode.c (undelete_kbnode): Removed. No longer needed. * import.c (chk_self_sigs): Allow a uid revocation to be enough to allow importing a particular uid (no self sig needed). This allows importing compacted uids.
2005-06-14* keygen.c (save_unprotected_key_to_card): Fix gcc4 warning.David Shaw1-5/+25
* options.h, import.c (parse_import_options, import_one): Add import-clean-uids option to automatically compact unusable uids when importing. Like import-clean-sigs, this may nodify the local keyring. * trustdb.c (clean_uids_from_key): Only allow selfsigs to be a candidate for re-inclusion.
2005-06-12* options.h, import.c (parse_import_options, clean_sigs_from_all_uids,David Shaw1-6/+41
import_one): Add import-clean-sigs option to automatically clean a key when importing. Note that when importing a key that is already on the local keyring, the clean applies to the merged key - i.e. existing superceded or invalid signatures are removed.
2005-06-10* options.h, import.c (parse_import_options, delete_inv_parts):David Shaw1-25/+2
import-unusable-sigs is now a noop.
2005-05-31Updated FSF street address and preparations for a release candidate.Werner Koch1-1/+2
2005-02-06* trustdb.h, trustdb.c (trustdb_check_or_update): New. If the trustdbDavid Shaw1-9/+6
is dirty and --interactive is set, do an --update-trustdb. If not interactive, do a --check_trustdb unless --no-auto-check-trustdb is set. * import.c (import_keys_internal): Moved from here. * keyserver.c (keyserver_refresh): Call it here after all refreshing has happened so that we don't rebuild after each preferred keyserver set of imports, but do one big rebuild at the end. This is Debian bug #293816, noted by Kurt Roeckx.
2005-01-20* gpgv.c (tty_fprintf): New stub.Werner Koch1-2/+231
* card-util.c (card_status): Create asecret key stub on the fly and print more information about a card key. * import.c (pub_to_sec_keyblock, auto_create_card_key_stub): New. * getkey.c (get_seckeyblock_byfprint): New. * keylist.c (print_card_key_info): New.
2005-01-03* Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@David Shaw1-0/+6
* import.c (delete_inv_parts): Comments on import-unusable-sigs.
2005-01-01* options.h, import.c (parse_import_options, delete_inv_parts): AddDavid Shaw1-1/+20
import-unusable-sigs flag to enable importing unusable (currently: expired) sigs. * options.h, export.c (parse_export_options, do_export_stream): Add export-unusable-sigs flag to enable exporting unusable (currently: expired) sigs.
2004-11-26* options.h, export.c (parse_export_options, do_export_stream), import.cDavid Shaw1-5/+7
(parse_import_options, import_keys_internal): Make the import-options and export-options distinct since they can be mixed together as part of keyserver-options.
2004-10-14* export.c (do_export_stream) [ENABLE_SELINUX_HACKS]: Don't allowWerner Koch1-0/+11
secret key export. * import.c (import_secret_one) [ENABLE_SELINUX_HACKS]: Likewise
2004-10-13Added SELInux hacks and did some cleanups.Werner Koch1-0/+6
2004-09-24* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always setDavid Shaw1-5/+5
opt.s2k_digest_algo. This helps fix a problem with PGP 2.x encrypted symmetric messages. Change all callers (encode.c, g10.c, keyedit.c, keygen.c, passphrase.c, sign.c). * armor.c, cardglue.c, getkey.c, import.c, keygen.c: Be consistent in some more quoted strings. Always use 'user ID', not 'user id', "quotes" for user IDs, etc.
2004-09-11* card-util.c (fetch_url, card_edit): Use the pubkey URL stored on theDavid Shaw1-1/+2
card to fetch an updated copy. Works with either straight URLs or HKP or LDAP keyservers. * keyserver-internal.h, keyserver.c (keyserver_import_fprint), import.c (revocation_present): Use a keyserver_spec so the caller can pass in whatever keyserver they like.
2004-08-23* keydb.h, getkey.c (get_user_id_printable): Rename to get_user_id_nativeDavid Shaw1-6/+6
and remove the printable stuff since we're print-ifying valid utf8 characters. Change all callers in import.c, sign.c, keylist.c, and encode.c.
2004-04-15* options.h, keyserver.c (parse_keyserver_options): Remove duplicate codeDavid Shaw1-1/+2
from parse_keyserver_options by calling the generic parse_options. * keyserver.c (keyserver_spawn, keyserver_refresh), g10.c (main), gpgv.c (main), mainproc.c (check_sig_and_print), import.c (revocation_present): Change all callers.
2004-04-14* options.h, import.c, keyserver-internal.h, g10.c, mainproc.c,David Shaw1-2/+2
keyserver.c (parse_keyserver_uri): Parse keyserver URI into a structure. Cleanup for new "guess my keyserver" functionality, as well as refreshing via a preferred keyserver subpacket.
2004-04-14* options.h: Encapsulate keyserver details. Change all callers.David Shaw1-1/+1
2004-03-19* trustdb.c (update_min_ownertrust, validate_keys): Do not use keystrDavid Shaw1-0/+3
functions in log_debug. * import.c (import_one): Try and collapse user IDs when importing a key for the first time. * keyedit.c (menu_addrevoker): Allow appointing a subkey as a designated revoker if the user forces it via keyid!, so long as the subkey can certify. Also use the proper date string when prompting for confirmation. * g10.c (main): Maintain ordering of multiple Comment lines. Requested by Peter Hyman.
2004-03-15* import.c (check_prefs_warning, check_prefs): --keyid-format conversionDavid Shaw1-228/+265
and a little better text. (import_one, import_secret_one, import_revoke_cert, chk_self_sigs, delete_inv_parts, merge_blocks): Still more --keyid-format conversions.
2004-02-14* keyserver.c (argsep): Move to misc.c.David Shaw1-8/+8
* main.h, misc.c (parse_options), export.c (parse_export_options), import.c (parse_import_options), g10.c (main): Use it here to allow for options with optional arguments. Change all callers.
2004-02-14* import.c (check_prefs): Some language fixes. (sec_to_pub_keyblock,David Shaw1-7/+15
import_secret_one): Without knowing the number of MPIs there are, we cannot try and sk-to-pk-ize a key.
2004-02-12* import.c (check_prefs): New function to check preferences on a publicDavid Shaw1-10/+144
key to ensure that it does not advertise any that we cannot fulfill. Use the keyedit command list function to optionally rewrite the prefs. (import_one, import_secret_one): Use it here when importing a public key that we have the secret half of, or when importing a secret key that we have the public half of.
2004-02-12* import.c (import_one): Do the revocation check even in the case when aDavid Shaw1-7/+10
key, a revocation key set in a direct key signature, and a revocation from that revocation key, all arrive piecemeal. Needless to say, this is pretty obscure.
2003-12-31* options.h, g10.c (main), import.c (parse_import_options, import_one,David Shaw1-12/+16
import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only to --import-option merge-only. Deprecate --merge-only.
2003-12-28* main.h, misc.c (parse_options): Add a "noisy" flag to enable and disableDavid Shaw1-4/+4
the messages about which option didn't match or matched ambiguously. Change all callers (g10.c, keyserver.c). * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through.
2003-12-11* packet.h, build-packet.c (hash_public_key): Remove function ...David Shaw1-4/+0
* keydb.h, keyid.c (hash_public_key, do_fingerprint_md): ... and make a new one here that shares code with the fingerprint calculations. This removes some duplicated functionality, and is also around 14% faster. (Every bit helps). * import.c (import_one): No longer need the Elgamal import warning. * getkey.c (get_pubkey_fast): This one is sort of obscure. get_pubkey_fast returns the primary key when requesting a subkey, so if a user has a key signed by a subkey (we don't do this, but used to), AND that key is not self-signed, AND the algorithm of the subkey in question is not present in GnuPG, AND the algorithm of the primary key that owns the subkey in question is present in GnuPG, then we will try and verify the subkey signature using the primary key algorithm and hit a BUG(). The fix is to not return a hit if the keyid is not the primary. All other users of get_pubkey_fast already expect a primary only.