[git] Scute - branch, master, updated. scute-1.5.0-4-gf31e6af

[by Damien Goutte-Gattat]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PKCS#11 token on top of gpg-agent".

The branch, master has been updated
       via  f31e6af6e2d9e320dedc89e0b6b2692b7d72cda7 (commit)
       via  8b01c156a2dd1d45c70e65a4af8f48eaa69e9ba6 (commit)
      from  a9a229a7f4a8920a7cc335f7a8bf0b5736ebec64 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f31e6af6e2d9e320dedc89e0b6b2692b7d72cda7
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Sat May 19 23:03:21 2018 +0100

    Do not request certificate data when LEARNing.
    
    * src/agent.c (scute_agent_learn): Use LEARN --sendinfo instead
    of LEARN --send.
    --
    
    Using --send is useless here and we don't even collect the data
    that the agent may send (no data callback), which may cause the
    LEARN command to fail.
    
    Of note, the --sendinfo option is available since GnuPG 2.1.1,
    meaning Scute would not work anymore with GnuPG 2.0.x. Since that
    branch is now EOLed, this should not be a concern.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/src/agent.c b/src/agent.c
index 108e1ea..46d56d5 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -640,7 +640,7 @@ scute_agent_learn (struct agent_card_info_s *info)
   gpg_error_t err;
 
   memset (info, 0, sizeof (*info));
-  err = assuan_transact (agent_ctx, "LEARN --send",
+  err = assuan_transact (agent_ctx, "LEARN --sendinfo",
 			 NULL, NULL, default_inq_cb,
 			 NULL, learn_status_cb, info);
 

commit 8b01c156a2dd1d45c70e65a4af8f48eaa69e9ba6
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Sat May 19 22:56:34 2018 +0100

    Clean up files generated by make check.
    
    * tests/clean-socketdir: Remove more test-generated files.
    --
    
    Running make check may generate more files in the test directory
    (notably, if the tests are run while a token is present, the agent
    will have written down the shadow keys), that we need to cleanup
    afterwards.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/tests/clean-socketdir b/tests/clean-socketdir
index 32ffdc6..ccd454e 100755
--- a/tests/clean-socketdir
+++ b/tests/clean-socketdir
@@ -11,7 +11,9 @@ if [ "$GNUPGHOME" = "`/bin/pwd`" ]; then
         rmdir $socketdir || true
     fi
 
+    rm -f pubring.kbx reader_*.status
     if [ -d private-keys-v1.d ]; then
+        rm -f private-keys-v1.d/*.key
         rmdir private-keys-v1.d
     fi
 fi

-----------------------------------------------------------------------

Summary of changes:
 src/agent.c           | 2 +-
 tests/clean-socketdir | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PKCS#11 token on top of gpg-agent
http://git.gnupg.org