aboutsummaryrefslogtreecommitdiffstats
path: root/scd/scdaemon.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2011-12-13scd: New option --debug-assuan-log-cats.Werner Koch1-0/+5
* 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.
2011-12-13scd: Introduce a virtual reader table.Werner Koch1-1/+1
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.
2011-08-10Fixed set but unused variable bugsWerner Koch1-2/+1
2011-02-04Nuked almost all trailing white space.post-nuke-of-trailing-wsWerner Koch1-62/+60
We better do this once and for all instead of cluttering all future commits with diffs of trailing white spaces. In the majority of cases blank or single lines are affected and thus this change won't disturb a git blame too much. For future commits the pre-commit scripts checks that this won't happen again.
2010-10-27Honor TMPDIR.Werner Koch1-3/+11
2010-08-18Fix regression in logging.Werner Koch1-23/+23
Add a registry key to enable catch-all remote debugging for W32. Replace more stdio stuff by estream.
2010-06-09Merged Dirmngr with GnuPG.Werner Koch1-5/+6
A few code changes to support dirmngr.
2010-03-22More chnages to use estream. Add a way to replace the standardWerner Koch1-1/+1
descriptors.
2010-03-11Use a custom log handler for libassuan.Werner Koch1-2/+5
2009-12-03support numeric debug levels.Werner Koch1-6/+29
2009-10-28[scd] Memory leak fix.Werner Koch1-1/+5
[g13] Send MOUNTPOINT status line
2009-10-162009-10-16 Marcus Brinkmann <[email protected]>Marcus Brinkmann1-1/+4
* configure.ac: Check for libassuan instead of libassuan-pth. common/ 2009-10-16 Marcus Brinkmann <[email protected]> * Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead of LIBASSUAN_PTH_CFLAGS. scd/ 2009-10-16 Marcus Brinkmann <[email protected]> * AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth. * scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks and assuan_sock_init. g13/ 2009-10-16 Marcus Brinkmann <[email protected]> * AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth. * g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks. agent/ 2009-10-16 Marcus Brinkmann <[email protected]> * gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of libassuan-pth. * gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks and assuan_sock_init. Fix invocation of assuan_socket_connect.
2009-09-232009-09-23 Marcus Brinkmann <[email protected]>Marcus Brinkmann1-4/+7
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION): Update to new API (2, 1.1.0). agent/ 2009-09-23 Marcus Brinkmann <[email protected]> * gpg-agent.c (parse_rereadable_options): Don't set global assuan log file (there ain't one anymore). (main): Update to new API. (check_own_socket_pid_cb): Return gpg_error_t instead of int. (check_own_socket_thread, check_for_running_agent): Create assuan context before connecting to server. * command.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (write_and_clear_outbuf): Use gpg_error_t instead of assuan_error_t. (cmd_geteventcounter, cmd_istrusted, cmd_listtrusted) (cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc) (cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey) (cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase) (cmd_get_confirmation, cmd_learn, cmd_passwd) (cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval) (cmd_updatestartuptty, cmd_killagent, cmd_reloadagent) (cmd_getinfo, option_handler): Return gpg_error_t instead of int. (post_cmd_notify): Change type of ERR to gpg_error_t from int. (io_monitor): Add hook argument. Use symbols for constants. (register_commands): Change return type of HANDLER to gpg_error_t. (start_command_handler): Allocate assuan context before starting server. * call-pinentry.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (unlock_pinentry): Call assuan_release instead of assuan_disconnect. (getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int. (start_pinentry): Allocate assuan context before connecting to server. * call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb) (membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru) (pass_data_thru): Change return type to gpg_error_t. (start_scd): Allocate assuan context before connecting to server. common/ 2009-09-23 Marcus Brinkmann <[email protected]> * asshelp.c (start_new_gpg_agent): Allocate assuan context before starting server. g10/ 2009-09-23 Marcus Brinkmann <[email protected]> * call-agent.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb) (learn_status_cb, inq_writecert_parms, inq_writekey_parms) (scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of int. * gpg.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (main): Update to new Assuan API. * server.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (option_handler, cmd_recipient, cmd_signer, cmd_encrypt) (cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export) (cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys) (cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t instead of int. (register_commands): Allocate assuan context before starting server. (gpg_server): Allocate assuan_context before starting server. scd/ 2009-09-23 Marcus Brinkmann <[email protected]> * command.c: Include "scdaemon.h" before <assuan.h> because of GPG_ERR_SOURCE_DEFAULT check. (option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert) (cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt) (cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey) (cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock) (cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu) (cmd_killscd): Return gpg_error_t instead of int. (scd_command_handler): Allocate assuan context before starting server. * scdaemon.c (main): Update to new Assuan API. sm/ 2009-09-23 Marcus Brinkmann <[email protected]> * gpgsm.c (main): Update to new assuan API. * server.c: Include "gpgsm.h" before <assuan.h> due to check for GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h. (option_handler, cmd_recipient, cmd_signer, cmd_encrypt) (cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export) (cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys) (cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey) (cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int. (register_commands): Same for member HANDLER in table. (gpgsm_server): Allocate assuan context before starting server. * sm/call-dirmngr.c: * call-dirmngr.c (prepare_dirmngr): Check for CTX and error before setting LDAPSERVER. (start_dirmngr_ext): Allocate assuan context before starting server. (inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb) (run_command_cb, run_command_inq_cb, run_command_status_cb): Return gpg_error_t instead of int. tools/ 2009-09-23 Marcus Brinkmann <[email protected]> * gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response) (main): Update to new Assuan API.
2009-07-21Make bug reporting address easier changeable.Werner Koch1-2/+2
2009-07-16Add code to better handle unplugging of a reader.Werner Koch1-0/+2
2009-05-19Fix possible system freeze on Mac OS X.Werner Koch1-2/+2
2009-02-25Fixed a nasty bug in scdaemon which led to a card reset if the card wasWerner Koch1-10/+26
inserted during scdaemon startup and a connection was made before the ticker had a chance to run. Add some stuff for better debugging.
2009-02-19Fix bug 1001.Werner Koch1-1/+1
Documentation updates.
2009-01-28Make --allow-admin the default.Werner Koch1-5/+7
2008-12-09Minor fixes.Werner Koch1-1/+1
2008-12-08Align ticker to the full or half second.Werner Koch1-6/+20
2008-12-05Add option --card-timeout.Werner Koch1-35/+48
Add a new attribyte to app-openpgp.c Fix two portability bugs. Have gpg-connect-agent autostart gpg-agent on W32.
2008-11-18Print library versions according to GNU standards.Werner Koch1-0/+30
2008-10-20Marked all unused args on non-W32 platforms.Werner Koch1-1/+1
2008-10-15Made scdaemon more robust on Windows.Werner Koch1-10/+12
2008-10-14SCD changes for PC/SC under W32.Werner Koch1-10/+14
2008-08-312008-08-30 Moritz <[email protected]>Moritz Schulte1-3/+3
* scdaemon.c (main): Use estream_asprintf instead of asprintf. * command.c (update_reader_status_file): Likewise. (cmd_serialno): Use estream_asprintf instead of asprintf and xfree instead of free to release memory allocated through (estream_)asprintf. (cmd_learn): Likewise. (pin_cb): Likewise. * app-openpgp.c (get_public_key): Likewise.
2008-02-092008-02-09 Marcus Brinkmann <[email protected]>Marcus Brinkmann1-2/+4
* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set in gpgconf-list output.
2007-11-19Started to implement the audit log feature.Werner Koch1-5/+12
Pass PINENTRY_USER_DATA and XAUTHORITY to Pinentry. Improved support for the quality bar. Minor internal restructuring. Translation fixes.
2007-10-01Use Assuan socket wrapper calls.Werner Koch1-36/+41
Made socket servers secure under Windows.
2007-09-142007-09-14 Marcus Brinkmann <[email protected]>Marcus Brinkmann1-2/+8
* scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for W32 targets. Use it for create_socket_name.
2007-08-02Factored common gpgconf constants outWerner Koch1-17/+4
Fixed W32 compare_filenames
2007-07-04Changed to GPLv3.Werner Koch1-4/+7
Removed intl/.
2007-07-04A bunch of minor changes for Windows.Werner Koch1-5/+21
2007-06-20[w32] gpg-agent is now started automagically by gpgsm.Werner Koch1-1/+1
2007-06-19Made percent_escape more general.Werner Koch1-1/+1
Added regression tests support to jnlib. W32 changes.
2007-06-18jnlib/Marcus Brinkmann1-4/+9
2007-06-18 Marcus Brinkmann <[email protected]> * stringhelp.h (percent_escape): New prototype. * stringhelp.c (percent_escape): New function. agent/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpg-agent.c (main): Percent escape pathname in --gpgconf-list output. g10/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpg.c (gpgconf_list): Percent escape output of --gpgconf-list. scdaemon/ 2007-06-18 Marcus Brinkmann <[email protected]> * scdaemon.c (main): Percent escape output of --gpgconf-list. sm/ 2007-06-18 Marcus Brinkmann <[email protected]> * gpgsm.c (main): Percent escape output of --gpgconf-list.
2007-06-14A whole bunch of changes to allow building for Windows.Werner Koch1-2/+7
See the ChangeLogs for details.
2007-06-06First steps towards supporting W32.Werner Koch1-15/+0
This is mainly source code reorganization. Update gnulib. g10/ does currently not build.
2007-04-20Improved logging for error orginating from libgcrypt.Werner Koch1-22/+2
2007-02-18doc/Werner Koch1-1/+3
* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. scd/ * scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
2006-11-20Made some PIN pads work.Werner Koch1-10/+39
Some cleanups for 64 bit CPUs.
2006-10-23.Werner Koch1-0/+5
2006-09-06The big Assuan error code removal.Werner Koch1-0/+2
2006-06-20Updated FSF's address.Werner Koch1-1/+2
2006-04-11Added command APDUWerner Koch1-0/+2
2005-11-28Preparing an interim releaseWerner Koch1-1/+5
2005-07-27Removed directories which are only used by the 1.9 branchWerner Koch1-638/+0
2005-07-20* keylist.c (email_kludge): Reworked.Werner Koch1-0/+2
* certdump.c (gpgsm_print_serial, gpgsm_dump_serial): Cast printf arg to unsigned. * call-dirmngr.c (gpgsm_dirmngr_run_command): Ditto
2005-06-07New debugging optionhs, updates to the manual.Werner Koch1-0/+18