merge "default" branch into "keysync" keysync
authorRoker <roker@pep-project.org>
Mon, 26 Sep 2016 08:07:58 +0200
branchkeysync
changeset 11905afe2c436c5d
parent 1173 5a8002f941e0
parent 1187 8bbb80bb4323
child 1198 47ff9a548e96
merge "default" branch into "keysync"
src/pgp_gpg.c
     1.1 --- a/src/pgp_gpg.c	Sat Sep 24 09:46:53 2016 +0200
     1.2 +++ b/src/pgp_gpg.c	Mon Sep 26 08:07:58 2016 +0200
     1.3 @@ -1261,7 +1261,7 @@
     1.4      stringpair_list_t* list_curr = _keyinfo_list;
     1.5      stringpair_t* pair = NULL;
     1.6          
     1.7 -    do {
     1.8 +    do { 
     1.9          gpgme_error = gpg.gpgme_op_keylist_next(session->ctx, &key);
    1.10          gpgme_error = _GPGERR(gpgme_error);
    1.11        
    1.12 @@ -1276,10 +1276,8 @@
    1.13  
    1.14                  // first subkey is primary key
    1.15                  char* fpr = key->subkeys->fpr;
    1.16 -                char* uid = key->uids->uid;
    1.17 -                
    1.18 +
    1.19                  assert(fpr);
    1.20 -                assert(uid); // ??
    1.21                  if (!fpr)
    1.22                      return PEP_GET_KEY_FAILED;
    1.23