merge double head keysync
authorRoker <roker@pep-project.org>
Tue, 27 Sep 2016 14:16:03 +0200
branchkeysync
changeset 119847ff9a548e96
parent 1195 53f8859f476b
parent 1190 5afe2c436c5d
child 1199 6ca94fa73ff3
merge double head
     1.1 --- a/src/pgp_gpg.c	Mon Sep 26 16:55:23 2016 +0200
     1.2 +++ b/src/pgp_gpg.c	Tue Sep 27 14:16:03 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