aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * g10.c (i18n_init) [W32]: Pass registry key to gettextWerner Koch2005-01-201-10/+3
| | | | | | | | | initialization. * gpgv.c (i18n_init) [W32]: Ditto. * simple-gettext.c (set_gettext_file): Use MO files depending on the installation directory. Add new arg REGKEY.
* * g10.c (main): Typo.David Shaw2005-01-061-2/+2
| | | | | | | * armor.c (is_armor_header): Allow CR and LF (not just actual spaces) in an armor header line (-----BEGIN etc). This is needed due to CRLF issues on win32. As before, --openpgp makes it strict.
* * keyedit.c (keyedit_menu): Invisible alias "passwd" as "password".David Shaw2004-12-201-4/+12
| | | | | | | | | | | * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
* * g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg toDavid Shaw2004-12-161-18/+15
| | | | | | | | | | | exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
* * apdu.c (apdu_send_le, apdu_send_direct), keylist.cDavid Shaw2004-12-151-1/+1
| | | | | | | | | | (status_one_subpacket, print_one_subpacket): Fix some compiler warnings. * g10.c (main): Fix --compression-algo to take a string argument like --compress-algo. * trustdb.c (uid_trust_string_fixed): For safety, check for a pk.
* * options.h, g10.c (main), textfilter.c (standard): Use --rfc2440 orDavid Shaw2004-12-111-2/+0
| | | | | | | | --openpgp directly to determine the end of line hashing rule. * trustdb.c (uid_trust_string_fixed): Show uids as expired if the key is expired.
* * options.h, g10.c (main), textfilter.c (len_without_trailing_ws): RemovedDavid Shaw2004-12-101-0/+2
| | | | | | | | | | (not used). (standard): 2440 says that textmode hashes should canonicalize line endings to CRLF and remove spaces and tabs. 2440bis-12 says to just canonicalize to CRLF. So, we default to the 2440bis-12 behavior, but revert to the strict 2440 behavior if the user specifies --rfc2440. In practical terms this makes no difference to any signatures in the real world except for a textmode detached signature.
* * options.h, export.c (parse_export_options, do_export_stream), import.cDavid Shaw2004-11-261-3/+3
| | | | | | | (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.
* (S_IRGRP) [HAVE_DOSISH_SYSTEM]: Define to 0.Werner Koch2004-11-181-1/+4
|
* (open_info_file): New.Werner Koch2004-11-171-41/+69
| | | | | | | | (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
* * options.h, g10.c (main), mainproc.c (check_sig_and_print): RenameDavid Shaw2004-10-211-3/+4
| | | | | | | | verify-option show-validity to show-uid-validity to match the similar list-option. * app-openpgp.c (verify_chv3): Fix typo.
* * g10.c (parse_list_options): Fix non-constant initializer so we can buildDavid Shaw2004-10-211-1/+6
| | | | | with C89.
* Added SELInux hacks and did some cleanups.Werner Koch2004-10-131-10/+45
|
* * pkclist.c (do_edit_ownertrust): Different prompt when we're using directDavid Shaw2004-10-131-10/+17
| | | | | | | | | | | | | | trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
* * pkclist.c (do_edit_ownertrust): Use the same translated string forDavid Shaw2004-10-111-4/+4
| | | | | | | | | | | | | | showing the user ID as mainproc.c:print_pkenc_list. * mainproc.c (print_pkenc_list): Allow translating the quotes around the user ID. * card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s' quoting for things that aren't user IDs. * keyserver.c (keyserver_spawn): If there is no keyserver host, print the whole URI since it is self-contained.
* * gpgv.c, keydb.c (keydb_add_resource): Factored keyring creation out toDavid Shaw2004-09-301-0/+7
| | | | | | | | | | | .. (maybe_create_keyring): .. new. Make sure that we do the checks in a locked state. Problem reported by Stefan Haller. Try to create the home directory before acquiring a lock for the keyring. From Werner on stable branch. * g10.c (main): Blow up if we didn't lose setuid. From Werner on stable branch.
* * main.h, g10.c (main), card-util.c (change_pin): If "admin" has not beenDavid Shaw2004-09-251-10/+2
| | | | | | | | | | | | | | issued, skip right to the CHV1/CHV2 PIN change. No need to show the unblock or admin PIN change option. (card_edit): Add "admin" command to add admin commands to the menu. Do not allow admin commands until "admin" is given. * app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin PINs can be entered before the card is locked. * options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove --allow-admin.
* * main.h: Create S2K_DIGEST_ALGO macro so we do not need to always setDavid Shaw2004-09-241-6/+3
| | | | | | | | | | | 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.
* Note: I have not fully tested the new key creation due to a pc/scWerner Koch2004-09-231-2/+2
| | | | | | | | | | | | | | | | | | | error. However the backupfile has been created successfully. * rsa.c (rsa_generate): Return the dummy list of factors only if the caller asked for it. * card_util.c (generate_card_keys): ask whether backup should be created. (card_store_subkey): Factored some code out to .. * keygen.c (save_unprotected_key_to_card): .. new function. (gen_card_key_with_backup): New. (generate_raw_key): New. (generate_keypair): New arg BACKUP_ENCRYPTION_DIR. Changed all callers. (do_generate_keypair): Divert to gen_card_key_with_backup when desired.
* * gpg.sgml: Document -K.Werner Koch2004-09-201-1/+1
| | | | | | | | | | | | | | | | | * g10.c: Make -K an alias for --list-secret-keys. * keylist.c (print_card_serialno): New. Taken from gnupg 1.9.11. (list_keyblock_print): Make use of it. * keyedit.c (show_key_with_all_names): Print the card S/N. * keyedit.c (keyedit_menu): New command ADDCARDKEY. * card-util.c (card_generate_subkey): New. * keygen.c (generate_card_subkeypair): New. (gen_card_key): New arg IS_PRIMARY; changed all callers. * cardglue.c (open_card): Use shutdown code if possible. (check_card_serialno): Ditto.
* * configure.ac: Don't check for usb_create_match orWerner Koch2004-09-171-0/+16
| | | | | | | | | | | | | | | | | | | | | | use_get_string_simple anymore. * g10.c (list_config): New config option ccid-reader-id. (gpgconf_list): Add "reader-port". * apdu.c (open_ccid_reader): New arg PORTSTR. Pass it to ccid_open_reader. (apdu_open_reader): Pass portstr to open_ccid_reader. * ccid-driver.c (ccid_get_reader_list): New. (ccid_open_reader): Changed API to take a string for the reader. Removed al the cruft for the libusb development vesion which seems not to be maintained anymore and there are no packages anyway. The stable library works just fine. (struct ccid_reader_id_s): Deleted and replaced everywhere by a simple string. (usb_get_string_simple): Removed. (bulk_in): Do valgrind hack here and not just everywhere.
* * g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver.Werner Koch2004-09-151-0/+14
| | | | | | | | | | * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
* * options.h, keylist.c (print_one_subpacket, print_subpackets_colon):David Shaw2004-09-121-27/+115
| | | | | | | | | Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
* * encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup.David Shaw2004-08-271-40/+39
| | | | | Change some "this" to `this'.
* * plaintext.c (handle_plaintext): Bigger buffer for extra safety.David Shaw2004-08-081-6/+8
| | | | | | | | | | | | | | | | | * g10.c (main): New alias --throw-keyid for --throw-keyids, so that it continues to work in old configuration files. Noted by Jens Adam. * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2. * status.c (do_get_from_fd): Flush stdout if status isn't flushing it for us. This guarantees that any menus that were displayed before the prompt don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian bug #254072. * sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not appropriate to strip policy and notations when remaking a sig. That should only happen when specifically requested by the user.
* * keylist.c (list_keyblock_print): Always use the new listing format whereDavid Shaw2004-07-161-1/+1
| | | | | | | | | | | | | uids are always on a line for themselves. Mark expired secret keys as expired. * options.h, g10.c (main): Rename list show-validity to show-uid-validity as it only shows for uids. * armor.c (armor_filter): Do not use padding to get us to 8 bytes of header. Rather, use 2+4 as two different chunks. This avoids a fake filename of "is".
* * g10.c (main): Alias --charset as --display-charset to help avoid theDavid Shaw2004-07-151-3/+4
| | | | | | | | | | | | | | continuing confusion and make room for possible changes in devel. * parse-packet.c (parse_plaintext): Show the hex value for the literal packet mode since it may not be printable. * keygen.c (make_backsig): Make sure that the backsig was built successfully before we try and use it. * status.h, status.c (get_status_string), plaintext.c (handle_plaintext): New status tags PLAINTEXT and PLAINTEXT_LENGTH.
* * g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner onDavid Shaw2004-05-201-11/+54
| | | | | stable branch.
* * options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c (structDavid Shaw2004-05-101-4/+4
| | | | | | keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c (keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix some compiler warnings.
* * keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passingDavid Shaw2004-05-081-2/+2
| | | | | | | | | | preferred keyserver on "keyserver" command line. Sanity check keyserver URL before accepting it. * keyserver-internal.h, g10.c (main), keyserver.c (parse_keyserver_uri): Add an option to require the scheme:// and change all callers. (free_keyserver_spec): Make public.
* * keylist.c (show_notation): Use bits to select which sort of notation toDavid Shaw2004-05-051-1/+7
| | | | | | | | | | show. Don't allow a not-shown notation to prevent us from issuing the proper --status-fd message. * options.h, g10.c (main): Add show-std/standard-notations and show-user-notations. show-notations is both. Default is to show standard notations only during verify. Change all callers.
* A bunch of changes for the openpgp card.Werner Koch2004-04-271-0/+8
|
* * options.h, g10.c (main): Add keyserver-option honor-keyserver-url.David Shaw2004-04-191-2/+9
| | | | | | | | | | | | | | | | | | parse_keyserver_options now returns a success code. * keyserver.c (parse_keyserver_options): Return error on failure to parse. Currently there is no way to fail as any unrecognized options get saved to be sent to the keyserver plugins later. Check length of keyserver option tokens since with =arguments we must only match the prefix. (free_keyserver_spec): Moved code from parse_keyserver_url. (keyserver_work, keyserver_spawn): Pass in a struct keyserver_spec rather than using the global keyserver option. (calculate_keyid_fpr): New. Fills in a KEYDB_SEARCH_DESC for a key. (keyidlist): New implementation using get_pubkey_bynames rather than searching the keydb directly. If honor-keyserver-url is set, make up a keyserver_spec and try and fetch that key directly. Do not include it in the returned keyidlist in that case.
* * plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode thatDavid Shaw2004-04-161-0/+3
| | | | | | | | | | | | | | | | | | requires end of line conversion. This is being considered for a UTF8 text packet. If this doesn't take place, no major harm done. If it does take place, we'll get a jump on starting the changeover. * g10.c (main): --no-use-embedded-filename. * build-packet.c (calc_plaintext, do_plaintext): Do not create illegal (packet header indicates a size larger than the actual packet) encrypted data packets when not compressing and using a filename longer than 255 characters. * keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't give primary warning for subkey expiration changes. These cannot reorder primaries.
* * options.h, keyserver.c (parse_keyserver_options): Remove duplicate codeDavid Shaw2004-04-151-5/+7
| | | | | | | | | 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.
* * options.h, import.c, keyserver-internal.h, g10.c, mainproc.c,David Shaw2004-04-141-2/+3
| | | | | | | 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.
* * options.h: Encapsulate keyserver details. Change all callers.David Shaw2004-04-141-1/+1
|
* * options.h, g10.c (main), compress-bz2.c (init_uncompress): RenameDavid Shaw2004-03-251-5/+5
| | | | | | --bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to decompression, not compression.
* * trustdb.c (update_min_ownertrust, validate_keys): Do not use keystrDavid Shaw2004-03-191-1/+1
| | | | | | | | | | | | | | | 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.
* * revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.cDavid Shaw2004-03-051-10/+2
| | | | | | | | | | | (passphrase_to_dek), keyserver.c (print_keyrec): A few more places to use --keyid-format. * options.h, g10.c (main), export.c (parse_export_options, do_export_stream): Remove --export-all and the "include-non-rfc" export-option as they are no longer meaningful with the removal of v3 Elgamal keys.
* * options.h, g10.c (main), mainproc.c (check_sig_and_print): RemoveDavid Shaw2004-03-031-1/+0
| | | | | | verify-option show-long-keyids and replace with the more general keyid-format.
* * options.h, g10.c (main): Add a more flexible --keyid-format option toDavid Shaw2004-03-031-1/+15
| | | | | | | | | | | | replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
* * plaintext.c: Copyright.David Shaw2004-02-241-13/+20
| | | | | | | | | | | | | | * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
* * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): AddDavid Shaw2004-02-231-4/+10
| | | | | | --min-cert-check-level option to specify minimum cert check level. Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be ignored.
* * options.h, g10.c (main), plaintext.c (handle_plaintext): AddDavid Shaw2004-02-181-0/+3
| | | | | --max-output option to help people deal with decompression bombs.
* * keyserver.c (argsep): Move to misc.c.David Shaw2004-02-141-19/+19
| | | | | | | * 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.
* * main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the moreDavid Shaw2004-02-121-25/+29
| | | | | | | | general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
* * options.h, g10.c (main), keylist.c (list_keyblock_print): AddDavid Shaw2004-02-111-0/+2
| | | | | | "show-unusable-subkeys" list-option to show revoked and/or expired subkeys.
* * keygen.c (keygen_set_std_prefs): Build the default preferences list atDavid Shaw2004-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | runtime as it properly handles algorithms disabled at build or run time. * getkey.c (merge_selfsigs_main): Properly handle expired user IDs when the expired self-sig is not the only self-sig. * misc.c (compress_algo_to_string): Return NULL on failure like all of the other xxxx_algo_to_string() functions. * mainproc.c (list_node): Minor spacing tweak to match --list-keys output. * keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked subkeys as revoked. Requested by Matthew Wilcox. Revoked overrides expiration when both apply. * keyedit.c (show_prefs): Use compress algo constants. (show_basic_key_info): Make revoked and expired tags translatable. * g10.c (rm_group): Properly ungroup from a list of groups.
* * g10.c (main, rm_group): Add --ungroup command to remove a particularDavid Shaw2004-01-301-7/+55
| | | | | | | | | | | | group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.