aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* ssh: Rewrite a function for better maintainabilityWerner Koch2013-07-011-40/+41
| | | | | | | | | * agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite. -- Using es_fopenmem instead of a preallocated buffer is safer and easier to read. (cherry picked from commit f76a0312c3794afd81fe1e172df15eb0612deae0)
* ssh: Improve key lookup for many keys.Werner Koch2013-07-011-154/+166
| | | | | | | | | | | | | | | | | | | | | * agent/command-ssh.c: Remove dirent.h. (control_file_s): Add struct item. (rewind_control_file): New. (search_control_file): Factor code out to ... (read_control_file_item): New. (ssh_handler_request_identities): Change to iterate over entries in sshcontrol. -- Formerly we scanned the private key directory for matches of entries in sshcontrol. This patch changes it to scan the sshcontrol file and thus considers only keys configured there. The rationale for this is that it is common to have only a few ssh keys but many private keys. Even if that assumption does not hold true, the scanning of the sshcontrol file is faster than reading the directory and only then scanning the ssh control for each directory entry. (cherry picked from commit d2777f84be0ded5906a9bec3bc23cfed0a9be02f)
* ssh: Cleanup sshcontrol file access code.Werner Koch2013-07-011-59/+102
| | | | | | | | | | | | | * agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace the direct use of the string. (struct control_file_s, control_file_t): New. (open_control_file, close_control_file): New. Use them instead of using fopen/fclose directly. -- (cherry picked from commit 25fb53ab4ae7e1c098500229c776d29b82713a20) Fixed conflicts in some variabale names.
* ssh: Do not look for a card based ssh key if scdaemon is disabled.Werner Koch2013-07-011-1/+2
| | | | | | | | * agent/command-ssh.c (ssh_handler_request_identities): Do not call card_key_available if the scdaemon is disabled. -- (back ported from commit id 781e9746dff21fc2721373205e63d1d09722d590)
* ssh: Make the mode extension "x" portable by a call to es_fopen.Werner Koch2013-07-011-7/+5
| | | | | | | | | | | * agent/command-ssh.c (open_control_file): Use_es_fopen to support the "wx" mode flag. -- This also patch also specifies a file mode parameter. However, this will only be used with an updated version of es_stream which we have not yet done.
* Fix syntax error for building on APPLE.Werner Koch2013-05-111-1/+1
| | | | | | | | * scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error. -- For W32 and probably for Cygwin we don't need the wrapper, thus the problems does not exhibit itself.
* Post release version bump.Werner Koch2013-05-103-29/+51
| | | | --
* Release 2.0.20gnupg-2.0.20Werner Koch2013-05-104-15/+22
|
* po: Auto updatesWerner Koch2013-05-101-21/+0
| | | | --
* Update gpg-error, libgcrypt, and ksba m4 scripts.Werner Koch2013-05-103-17/+70
| | | | | | | | | | * m4/gpg-error.m4: Update from libgpg-error repo. * m4/ksba.m4: Likewise. * m4/libgcrypt.m4: Likewise. -- GnuPG-bug-id: 1496. Signed-off-by: Werner Koch <[email protected]>
* Update Ukrainian translation.Yuri Chornoivan2013-05-101-20/+9
|
* Note: Wrong author in previous commit 049b3d9.Werner Koch2013-05-071-0/+4
| | | | | | | -- Magit keeps the author and date from the last commit unless reset with a c-t. Time for Jim's git-log-fix.
* w32: Add icons and version information.Ian Abbott2013-05-0715-39/+349
| | | | | | | | | | | | | | | | | | | * common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico. * agent/gpg-agent-w32info.rc: New. * g10/gpg-w32info.rc: New. * scd/scdaemon-w32info.rc: New. * sm/gpgsm-w32info.rc: New. * tools/gpg-connect-agent-w32info.rc: New. * common/w32info-rc.h.in: New. * configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP) (BUILD_HOSTNAME): New. (AC_CONFIG_FILES): Add w32info-rc.h. * am/cmacros.am (.rc.o): New rule. * agent/Makefile.am, common/Makefile.am, g10/Makefile.am * scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to build resource files. Signed-off-by: Werner Koch <[email protected]>
* doc: fix some Texinfo warnings.Ian Abbott2013-05-072-8/+12
| | | | | | | | | | | | | | | | | | | | | * doc/gpg.texi: Fix syntax and add missing menu entries. * doc/gpgsm.texi: Fix subsectioning. -- These five patches fix some warnings from Texinfo 5 by adding some missing nodes and changing some sections to subsections, and moving an '@end ifset' to the start of a line. I also noticed the 'Deprecated options' subsection didn't appear in the GPG options menu, so I added it. (Texinfo never warned about it because it was after the last node in the menu.) 1) doc/gpg.texi: move '@end ifset' to start of line 2) doc/gpg.texi: Add missing node for 'Compliance options' section. 3) doc/gpg.texi: add node for 'Deprecated options' subsection. 4) doc/gpg.texi: make 'Unattended key generation' a subsection 5) doc/gpgsm.texi: fix subsectioning for Unattended Usage (all 5 merged into one patch by wk)
* Fix a typo and a wrong code indentation.Jedi2013-04-252-3/+3
| | | | | | -- Reported-by: NIIBE Yutaka <[email protected]>
* Update Traditional Chinese translation.Jedi2013-04-241-11/+6
| | | | | | -- Kudos to Jedi for this really fast update (wk).
* Point to copies in the master branch for some doc file.Jedi2013-04-242-4/+18
| | | | --
* Update helper scripts.Jedi2013-04-248-493/+961
| | | | | | * compile, config.guess, config.rpath, config.sub, depcomp, * install-sh, mdate-sh, mkinstalldirs: Update to Feb 25 versions from gnulib.
* Update Traditional Chinese translation.Jedi2013-04-241-34/+6
| | | | | | -- Original translation date was 2012-05-13. Some fuzzies fixed by wk.
* Update Danish translationJoe Hansen2013-04-241-3178/+2317
| | | | * po/da.po: Update.
* Update Spanish translation.Jaime Suarez2013-04-241-130/+107
|
* Run an update-po.Werner Koch2013-04-2425-271/+414
| | | | --
* Update de.po and fr.po for keypad->pinpad change.Werner Koch2013-04-242-26/+35
|
* scd: Add pinpad support for REINER SCT cyberJack goNIIBE Yutaka2013-04-231-1/+4
| | | | | | | | * scd/ccid-driver.c (VENDOR_REINER, CYBERJACK_GO): New. (ccid_transceive_secure): Handle the case for VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change). -- This is revised version which adapts changes of ccid-driver.
* w32: Almost everywhere include winsock2.h before windows.h.Werner Koch2013-04-2320-380/+436
| | | | | | | | | | | -- This is required by newer mingw toolchain versions which demand that winsock2.h is included before windows.h. Now, due to the use of socket definitions in pth.h we need to include winsock2.h also in pth.h, now pth.h is often included after an include of windows.h and thus the compiler spits out a warning. To avoid that we include winsock2.h at all places the compiler complains about.
* Allow building gpgkeys_ldap with the 32 bit mingw-w64 toolchain.Werner Koch2013-04-231-1/+16
| | | | | | | | | | | | * keyserver/gpgkeys_ldap.c (my_ldap_start_tls_s): Define macro depending on compiler version. (main): Use new macro. -- It seems that the LDAP keyserver helper if build with the old mingw32 toolchain never worked correctly for LDAPS. The prototype there for ldap_start_tls_s is plainly wrong for Windows. However, the fix here has special support so not to break building with the old compiler.
* Update NEWS and READMEWerner Koch2013-04-222-4/+29
| | | | --
* Fix bashism in autogen.sh.Werner Koch2013-04-221-2/+2
| | | | | | -- The use of options for cp is not required. Probably c+p cruft.
* Try to use w64 toolchain for --build-w32.Werner Koch2013-04-221-1/+1
| | | | --
* Fix potential heap corruption in "gpg -v --version".Werner Koch2013-04-221-43/+40
| | | | | | | | | | | | | | | | | | | | | | * g10/gpg.c (build_list): Rewrite to cope with buffer overflow in certain locales. -- This fixes an obvious bug in locales where the translated string is longer than the original. The bug could be exhibited by using LANG=ru_RU.utf8 gpg -v --version. En passant we also removed the trailing white space on continued lines. Reported-by: Dmitry V. Levin" <ldv at altlinux.org> (cherry picked from commit e33e74e3a4b2b4a0341f933410ddd5db7a12515e) Note that this version uses utf8_charcount to get the indentation mostly right. Signed-off-by: Werner Koch <[email protected]>
* Comment fixes.Werner Koch2013-04-221-3/+3
| | | | | | -- Reported-by: Daniel Kahn Gillmor
* Adjust git-log-fix for cherry-picked commits.Werner Koch2013-04-221-2/+2
| | | | --
* Switch to the new automagic beta numbering scheme.Werner Koch2013-04-222-32/+28
| | | | | | | | | | | | | * configure.ac: Add all the required m4 magic. -- This also removes the hack to allow custom version numbers which are not considered a development version. A custom version number can be done anyway by simply setting the version to it and tag the release with it. This is a backport from master including the later patch to use rev-parse.
* Update docs from master.Werner Koch2013-04-225-38/+146
| | | | | | | | | | | * doc/gpg-agent.texi: Update from master. * doc/gpg.texi: Ditto. * doc/gpgsm.texi: Ditto. * doc/gpl.texi: Ditto. * doc/yat2m.c: Ditto. -- (updated from commit d6798d261cbe6519ef5b3ebb474e2ad348442c0c)
* Ignore obsolete option --disable-keypad.Werner Koch2013-04-221-0/+3
| | | | | | | | | | | | | * scd/scdaemon.c (opts): Ignore --disable-keypad. -- The renaming of --disable-keypad to --disable-pinpad might mess up configuration files managed with a GUI. The GUI does not not anymore know about the old option and would allow the user to switch "disable-pinpad" on. However, a "disable-keypad" might still linger in the conf file with gpgconf not knowing about it. Thus the conf file would always be rejected and manual intervention would be required. Ignoring the old option nicely solves the problem.
* Allow marking options as ignored.Werner Koch2013-04-222-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | * jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New. (ARGPARSE_TYPE_MASK): New, for internal use. (ARGPARSE_ignore): New. * jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining constants by macros. (optfile_parse): Implement ARGPARSE_OPT_IGNORE. (arg_parse): Exclide ignore options from --dump-options. -- In addition to the ignore-invalid-option (commit 8ea49cf5) it is often useful to mark options in a configuration which as NOP. For example options which have no more function at all but can be expected to be found in existing conf files. Such an option (or command) may now be given as ARGPARSE_ignore (300, "obsolete-option") The 300 is merely used as a non-valid single option name much like group names or the 500+n values used for long options. Signed-off-by: Werner Koch <[email protected]>
* Do not mix test result with progress lines.Werner Koch2013-04-226-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | This makes parsing of the results easier. Fixes bug#1400. * tests/openpgp/defs.inc (progress_cancel, progress_end) (progress_new): New. * tests/openpgp/conventional-mdc.test: Use progress functions * tests/openpgp/conventional.test: Ditto. * tests/openpgp/encrypt-dsa.test: Ditto. * tests/openpgp/encrypt.test: Ditto. * tests/openpgp/sigs.test: Ditto. -- The new output style is now: > MD5 SHA1 RIPEMD160 SHA256 SHA384 SHA512 SHA224 < PASS: sigs.test or if the test fails: > MD5 SHA1 sigs.test: ooops FAIL: sigs.test (cherry picked from commit f1e1387bee286c7434f0462185048872bcdb4484)
* scd: move SCDaemon to libexecdir.NIIBE Yutaka2013-04-012-4/+5
| | | | | | * common/homedir.c (gnupg_module_name): It's now libexecdir. * scd/Makefile.am (libexec_PROGRAMS): Add scdaemon (bin_PROGRAMS): Remove scdaemon.
* scd: PC/SC status fix.NIIBE Yutaka2013-03-262-6/+10
| | | | | | | * scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when PCSC_STATE_PRESENT. * scd/pcsc-wrapper.c (handle_status): Ditto.
* scd: PC/SC cleanup (more).NIIBE Yutaka2013-03-261-6/+6
| | | | | | * scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc) (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use pcsc_dword_t.
* scd: call update_card_removed only when detecting removal.NIIBE Yutaka2013-03-251-4/+2
| | | | | | | | | | | | | * scd/command.c (update_reader_status_file): Add condition ss->status == 0. -- To reproduce the bug: (1) insert card, (2) run "gpg2 --card-status", (3) remove card, (4) invoke "gpg2 --card-edit", (5) invoke some command like "verify" The last step fails (but with no error message to user).
* scd: PC/SC cleanup.NIIBE Yutaka2013-03-222-109/+137
| | | | | | | | | | | | | | * scd/apdu.c (pcsc_dword_t): New. It was named as DWORD (double-word) when a word was 16-bit. (struct reader_table_s): Fixes for types. (struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1). Throughout: Fixes for types. * scd/pcsc-wrapper.c: Likewise. -- Problem reported for 1.4.x by the issue 1358.
* scd: change default value of pinpad maxlen.NIIBE Yutaka2013-03-212-4/+5
| | | | | | | | | | | | * scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value of maxlen for pinpad input is now 15 (was: 25). * scd/ccid-driver.c (ccid_transceive_secure): Likewise. -- For newer PC/SC, it is better to use FEATURE_GET_TLV_PROPERTIES to get bMaxPINSize.
* scd: ccid-driver supporting larger APDU.NIIBE Yutaka2013-03-141-1/+1
| | | | | | | | | * scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger APDU. -- This is still ad hoc change, but it's OK. Supporting full extended APDU exchange level is not worth yet.
* Differentiate between success (full or partial), not-found, and failure.David Shaw2013-03-031-11/+76
| | | | | | * keyserver/gpgkeys_hkp.c (get_key): Use curl_easy_setinfo to get the HTTP status code so we can tell the difference between a successful retrieval, a partial retrieval, a not-found, or a server failed.
* Emulate curl_easy_getinfo and CURLINFO_RESPONSE_CODE in curl-shim.David Shaw2013-03-032-3/+31
| | | | | * keyserver/curl-shim.h, keyserver/curl-shim.c (curl_easy_getinfo): New. Return the HTTP status code for the last transfer.
* Bring the fix for bug 739 on 1.4 over to 2.0 (bug 1479)David Shaw2013-02-282-9/+5
| | | | | * http.h, http.c (http_wait_response, main): Remove HTTP_FLAG_NO_SHUTDOWN.
* Japanese: minor doc update.NIIBE Yutaka2013-02-121-1/+1
| | | | * doc/help.ja.txt: Update.
* Japanese: updated po and doc.NIIBE Yutaka2013-02-122-182/+234
| | | | * doc/help.ja.txt, po/ja.po: Updated.
* scd: Rename 'keypad' to 'pinpad'.NIIBE Yutaka2013-02-0817-130/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * NEWS: Mention scd changes. * agent/divert-scd.c (getpin_cb): Change message. * agent/call-scd.c (inq_needpin): Change the protocol to POPUPPINPADPROMPT and DISMISSPINPADPROMPT. * scd/command.c (pin_cb): Likewise. * scd/apdu.c (struct reader_table_s): Rename member functions. (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify, check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad apdu_pinpad_verify, apdu_pinpad_modify): Rename. * scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad) (apdu_pinpad_verify, apdu_pinpad_modify): Rename. * scd/iso7816.h (iso7816_check_pinpad): Rename. * scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD. (iso7816_check_pinpad): Rename. (iso7816_verify_kp, iso7816_change_reference_data_kp): Follow the change. * scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename. * scd/ccid-driver.c (ccid_transceive_secure): Use it. * scd/app-dinsig.c (verify_pin): Follow the change. * scd/app-nks.c (verify_pin): Follow the change. * scd/app-openpgp.c (check_pinpad_request): Rename. (parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow the change. * scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename. * scd/scdaemon.h (opt): Rename to disable_pinpad, enable_pinpad_varlen. * tools/gpgconf-comp.c (gc_options_scdaemon): Rename to disable-pinpad.