ENGINE-73: #comment Works on gpgme, including revoked filtering. Netpgp still causes problems, but I'll move this feature for netpgp into a separate feature so that Dean and Huss arent blocked. ENGINE-73
authorKrista Grothoff <krista@pep-project.org>
Mon, 22 Aug 2016 18:37:22 +0200
branchENGINE-73
changeset 1050a73bf9737993
parent 1049 d35c550050e0
child 1051 8718d4bd5f59
ENGINE-73: #comment Works on gpgme, including revoked filtering. Netpgp still causes problems, but I'll move this feature for netpgp into a separate feature so that Dean and Huss arent blocked.
src/Makefile
src/pgp_gpg.c
test/pgp_list_keys_test.cc
     1.1 --- a/src/Makefile	Mon Aug 22 17:03:40 2016 +0200
     1.2 +++ b/src/Makefile	Mon Aug 22 18:37:22 2016 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  include ../Makefile.conf
     1.5  
     1.6 -OPENPGP?=NETPGP
     1.7 +OPENPGP?=GPG
     1.8  
     1.9  ifeq ($(BUILD_ON),Darwin)
    1.10  ifeq ($(BUILD_FOR),Darwin)
     2.1 --- a/src/pgp_gpg.c	Mon Aug 22 17:03:40 2016 +0200
     2.2 +++ b/src/pgp_gpg.c	Mon Aug 22 18:37:22 2016 +0200
     2.3 @@ -1281,10 +1281,8 @@
     2.4                  PEP_STATUS key_status = PEP_GET_KEY_FAILED;
     2.5                  
     2.6                  bool key_revoked = false;
     2.7 -                
     2.8 -                key_status = pgp_key_revoked(session, fpr, &key_revoked);
     2.9 -                
    2.10 -                if (key_revoked || key_status == PEP_GET_KEY_FAILED)
    2.11 +                                
    2.12 +                if (key->subkeys->revoked)
    2.13                      continue;
    2.14                  
    2.15                  pair = new_stringpair(fpr, uid);
     3.1 --- a/test/pgp_list_keys_test.cc	Mon Aug 22 17:03:40 2016 +0200
     3.2 +++ b/test/pgp_list_keys_test.cc	Mon Aug 22 18:37:22 2016 +0200
     3.3 @@ -46,7 +46,7 @@
     3.4      stringlist_t* all_the_keys;
     3.5      find_keys(session, "pEp Test", &all_the_keys);
     3.6      stringlist_t* i;
     3.7 -    for (i = all_the_keys; i->next; i = i->next) {
     3.8 +    for (i = all_the_keys; i; i = i->next) {
     3.9          cout << i->value << endl;
    3.10      }
    3.11      free_stringlist(all_the_keys);