aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into npthnpthMarcus Brinkmann2012-01-0355-705/+1541
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog-2011 Makefile.am agent/ChangeLog-2011 agent/gpg-agent.c dirmngr/ChangeLog-2011 dirmngr/dirmngr.c doc/HACKING g13/g13.c po/de.po scd/ChangeLog-2011 scd/apdu.c scd/command.c scd/scdaemon.c scripts/gitlog-to-changelog tools/ChangeLog-2011
| * Silence gcc warning.Marcus Brinkmann2012-01-031-1/+1
| | | | | | | | * sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
| * Revert last change, add comment about link() return values.Marcus Brinkmann2012-01-031-21/+11
| | | | | | | | | | * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check return value of link().
| * Fix compiler warnings.Marcus Brinkmann2012-01-033-9/+24
| | | | | | | | | | | | | | * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return value of link(). * g13/g13.c: Make sure err is initialized. * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
| * Fix last change: Only set gcrypt thread callback for older versions.Marcus Brinkmann2012-01-032-4/+4
| | | | | | | | | | * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to USE_GCRY_THREAD_CBS.
| * Terminate csh commands with a semicolon also for dirmngr.Werner Koch2012-01-031-1/+1
| | | | | | | | * dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
| * Terminate csh commands with a semicolon.Werner Koch2012-01-032-3/+3
| | | | | | | | | | | | | | Fixes bug#1386. * agent/gpg-agent.c (main): Terminate csh style output with a semicolon. * scd/scdaemon.c: Ditto.
| * Only set gcrypt thread callback for older version of gcrypt.Marcus Brinkmann2012-01-024-1/+36
| | | | | | | | | | | | | | | | * agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c (USE_GCRY_THREAD_CBS): New macro, defined if GCRY_THREAD_OPTION_VERSION is 0. (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define. (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
| * Use the longest key ID available when talking to a HKP server.David Shaw2011-12-281-7/+13
| | | | | | | | | | | | This is issue 1340. Now that PKSD is dead, and SKS supports long key IDs, this is safe to do. Patch from Daniel Kahn Gillmor <[email protected]>.
| * Post-release version number updateWerner Koch2011-12-202-2/+6
| |
| * Release 2.1.0beta3.gnupg-2.1.0beta3Werner Koch2011-12-200-0/+0
| |
| * Prepare for the beta3 release.Werner Koch2011-12-204-10/+13
| |
| * po: Update the German translation.Werner Koch2011-12-201-11/+21
| |
| * Add the STEED Self-Signing Nonthority certificate.Werner Koch2011-12-205-2/+89
| | | | | | | | * doc/com-certs.pem: Install it when creating a keybox.
| * faq: Add section on US export restrictions.Werner Koch2011-12-201-7/+37
| |
| * Require Libassuan 2.0.3Werner Koch2011-12-204-21/+1
| | | | | | | | | | | | | | | | | | * configure.ac: Require Libassuan 2.0.3. * agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement. * agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove dependency. (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto. * scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
| * Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.NIIBE Yutaka2011-12-201-4/+22
| | | | | | | | | | * scd/apdu.c (pcsc_keypad_verify): Add debug log and error log. (pcsc_keypad_modify): Likewise.
| * scd: Fix for card change returning GPG_ERR_CARD_RESET.Werner Koch2011-12-191-2/+1
| | | | | | | | | | | | | | | | | | * scd/apdu.c (apdu_connect): Do not test for zero atrlen. -- When gpg-agent prompts for insertion of a card this error would be returned. Co-authored-by: Ben Kibbey <[email protected]>
| * Don't kill pinentry by SIGKILL but let it quit by SIGINT.NIIBE Yutaka2011-12-161-2/+1
| | | | | | | | | | * agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send SIGINT (was: SIGKILL).
| * Merge fix for issue 1331 from 1.4.David Shaw2011-12-151-3/+2
| | | | | | | | | | * photoid.c (generate_photo_id): Check for the JPEG magic numbers instead of JFIF since some programs generate an EXIF header first.
| * scd: Prefer application Geldkarte over DINSIG.Werner Koch2011-12-151-3/+3
| | | | | | | | | | | | | | | | | | * scd/app.c (select_application): Reorder application tests. -- Although the DINSIG application is available on most German cards, it is in reality not used. Thus showing the Geldkarte application is more desirable for a good user experience.
| * scd: Add option --dump-atr to command APDU.Werner Koch2011-12-154-184/+107
| | | | | | | | | | | | * scd/atr.c: Rewrite. * scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h. * scd/command.c (cmd_apdu): Add option --dump-atr.
| * estream: New function es_fclose_snatch.Werner Koch2011-12-152-1/+109
| | | | | | | | | | | | | | | | | | | | * common/estream.c (cookie_ioctl_function_t): New type. (es_fclose_snatch): New function. (COOKIE_IOCTL_SNATCH_BUFFER): New constant. (struct estream_internal): Add field FUNC_IOCTL. (es_initialize): Clear FUNC_IOCTL. (es_func_mem_ioctl): New function. (es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
| * scd: Skip S/N reading for the "undefined" application.Werner Koch2011-12-141-45/+52
| | | | | | | | * scd/app.c (select_application): Skip serial number reading.
| * scd: Add more status word values for documentation.Werner Koch2011-12-142-2/+8
| |
| * scd: Add the "undefined" stub application.Werner Koch2011-12-142-0/+21
| | | | | | | | | | * scd/app.c (select_application): Implement the "undefined" application.
| * agent: Pass comment lines from scd verbatim thru gpg-agent.Werner Koch2011-12-143-81/+121
| | | | | | | | | | | | * agent/call-scd.c (pass_status_thru): Pass comment lines verbatim. * tools/gpg-connect-agent.c (help_cmd_p): New. (main): Treat an "SCD HELP" the same as "HELP".
| * scd: Fix resetting and closing of the reader.Werner Koch2011-12-141-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * scd/command.c (update_card_removed): Do no act on an invalid VRDR. (do_reset): Ignore apdu_reset error codes for no and inactive card. Close the reader before setting the slot to -1. (update_reader_status_file): Notify the application before closing the reader. -- With this change the scd now works as it did in the past. In particular there is no more endless loop trying to open the reader by the update_reader_status_file ticker function. That bug basically blocked all card operations until the scdaemon was killed.
| * scd: Add debug option for reader function calls.Werner Koch2011-12-143-67/+143
| | | | | | | | | | | | | | | | * scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New. * scd/apdu.c (apdu_open_reader, apdu_close_reader) (apdu_shutdown_reader, apdu_connect, apdu_disconnect) (apdu_reset, apdu_get_atr, apdu_get_status): Add debug code. (apdu_activate): Remove this unused function.
| * scd: New option --debug-assuan-log-cats.Werner Koch2011-12-134-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | * scd/scdaemon.c (oDebugAssuanLogCats): New. (opts): Add option --debug-assuan-log-cats. (main): Implement option. * common/asshelp.c (set_libassuan_log_cats): New. -- The old way of setting the logging categories with an environment variable is awkward if sdaemon is spawned from a running gpg-agent.
| * scd: Introduce a virtual reader table.Werner Koch2011-12-135-99/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vreader table makes the code more clear by explicitly talking about APDU slots and reader indices. It also accommodates for future extensions. * scd/scdaemon.h (server_control_s): Remove READER_SLOT. * scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT. * scd/app.c (check_application_conflict): Add arg SLOT. * scd/command.c (slot_status_s): Rename to vreader_s. (server_local_s): Add field VREADER_IDX as replacement for the READER_SLOT in server_control_s. Change all users. (slot_table): Rename to vreader_table. Change all users. (vreader_slot): New. (do_reset, cmd_apdu): Map vreader to apdu slot. (get_reader_slot): Rename to get_current_reader. Return -1 on error. (open_card): Map vreader toapdu slot. Pass slot to check_application_conflict. (scd_command_handler): Init VREADER_IDX. (update_reader_status_file): Reset SLOT field on error.
| * scd: Retry command SERIALNO for an inactive card.Werner Koch2011-12-121-1/+8
| | | | | | | | * scd/command.c (cmd_serialno): Retry once for an inactive card.
| * Fix detection of card removal and insertion.Werner Koch2011-12-122-5/+18
| | | | | | | | | | | | | | * scd/apdu.c (apdu_connect): Return status codes for no card available and inactive card. * scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET. (open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
| * gitlog-to-changelog: New option --tear-off.Werner Koch2011-12-122-7/+13
| | | | | | | | | | * scripts/gitlog-to-changelog: Add option --tear-off. * Makefile.am (gen-ChangeLog): Use that option.
| * gpgsm: Add new validation model "steed".Werner Koch2011-12-079-29/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sm/gpgsm.h (VALIDATE_FLAG_STEED): New. * sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed". * sm/server.c (option_handler): Allow validation model "steed". * sm/certlist.c (gpgsm_cert_has_well_known_private_key): New. * sm/certchain.c (do_validate_chain): Handle the well-known-private-key attribute. Support the "steed" model. (gpgsm_validate_chain): Ditto. * sm/verify.c (gpgsm_verify): Return "steed" in the trust status line. * sm/keylist.c (list_cert_colon): Print the new 'w' flag. -- This is the first part of changes to implement the STEED proposal as described at http://g10code.com/steed.html . The idea for X.509 is not to use plain self-signed certificates but certificates signed by a dummy CA (i.e. one for which the private key is known). Having a single CA as an indication for the use of STEED might help other X.509 implementations to implement STEED.
| * Correct punctuation in the ChangeLog summary line.Werner Koch2011-12-071-0/+1
| | | | | | | | * Makefile.am (gen-ChangeLog): Supply --append-dot.
| * Allow comments which will not show up in the ChangeLogWerner Koch2011-12-071-0/+9
| | | | | | | | | | | | | | | | | | | | * scripts/gitlog-to-changelog: Ignore lines after a "--" line. -- The first line with two dashes at the start of a line (optionally followed by white space) stops copying the commit log lines to the ChangeLog entry in "make dist". This is useful to allow adding comments to the log which are not useful in a ChangeLog.
| * gpgsm: Allow specification of an AuthorityKeyIdentifier.Werner Koch2011-12-061-0/+56
| | | | | | | | | | | | | | * sm/certreqgen.c (pAUTHKEYID): New. (read_parameters): Add keyword Authority-Key-Id. (proc_parameters): Check its value. (create_request): Insert an Authority-Key-Id.
| * gpgsm: Allow arbitrary extensions for cert creation.Werner Koch2011-12-064-5/+187
| | | | | | | | | | | | | | | | * sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New. (read_parameters): Add new keywords. (proc_parameters): Check values of new keywords. (create_request): Add SubjectKeyId and extensions. (parse_parameter_usage): Support "cert" and the encrypt alias "encr".
| * gpgsm: Fix storing of the serial numberWerner Koch2011-12-061-1/+1
| | | | | | | | * sm/certreqgen.c (create_request): Fix hex-bin conversion.
| * Fix last change.Werner Koch2011-12-051-1/+0
| | | | | | | | * agent/command.c (start_command_handler): Remove use of removed var.
| * Amend the agent code with more comments.Werner Koch2011-12-053-46/+161
| | | | | | | | * agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
| * Support the Cherry ST-2000 card reader.Werner Koch2011-12-022-10/+25
| | | | | | | | | | | | | | | | * scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335) (SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants. (parse_ccid_descriptor): Use them. (scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry ST-2000. Suggested by Matthias-Christian Ott.
| * Avoid possible double free in export.c.Werner Koch2011-12-021-1/+1
| | | | | | | | | | * g10/export.c (transfer_format_to_openpgp): Avoid possible double free of LIST. Reported by NIIBE Yutaka.
| * Fix pinpad input support for passphrase modification.NIIBE Yutaka2011-12-024-194/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0. (pcsc_keypad_modify): Likewise. (pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA. bConfirmPIN value is determined by the parameter p0. * app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when reset_mode is on, or resetcode is on. use_keypad only makes sense for iso7816_change_reference_data_kp. * iso7816.h (iso7816_put_data_kp): Remove. (iso7816_reset_retry_counter_kp): Remove. (iso7816_reset_retry_counter_with_rc_kp): Remove. (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE. * iso7816.c (iso7816_put_data_kp): Remove. (iso7816_reset_retry_counter_kp): Remove. (iso7816_reset_retry_counter_with_rc_kp): Remove. (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
| * Add hook to check the commit log syntax.Werner Koch2011-12-012-0/+134
| | | | | | | | * autogen.sh: Install commit-msg hook for git.
| * Generate the ChangeLog from commit logs.Werner Koch2011-12-0144-1440/+2102
| | | | | | | | | | | | | | | | | | | | | | | | | | * scripts/gitlog-to-changelog: New script. Taken from gnulib. * scripts/git-log-fix: New file. * scripts/git-log-footer: New file. * doc/HACKING: Describe the ChangeLog policy * ChangeLog: New file. * Makefile.am (EXTRA_DIST): Add new files. (gen-ChangeLog): New. (dist-hook): Run gen-ChangeLog. Rename all ChangeLog files to ChangeLog-2011.
| * Fix pinpad input supportNIIBE Yutaka2011-12-012-17/+56
| |
| * Rewrite dns-cert.c to not use the gpg-only iobuf stuff.Werner Koch2011-11-307-109/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | * common/dns-cert.c: Remove iobuf.h. (get_dns_cert): Rename to _get_dns_cert. Remove MAX_SIZE arg. Change iobuf arg to a estream-t. Rewrite function to make use of estream instead of iobuf. Require all parameters. Return an gpg_error_t error instead of the type. Add arg ERRSOURCE. * common/dns-cert.h (get_dns_cert): New macro to pass the error source to _gpg_dns_cert. * common/t-dns-cert.c (main): Adjust for changes in get_dns_cert. * g10/keyserver.c (keyserver_import_cert): Ditto. * doc/gpg.texi (GPG Configuration Options): Remove max-cert-size.
| * * common/estream.c (es_fopenmem_init): New.Werner Koch2011-11-302-3/+39
| | | | | | | | * common/estream.h (es_fopenmem_init): New.