updated sequoia for ENGINE-448 fixes sync 1.3.0-RC-sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Wed, 06 Feb 2019 14:34:19 +0100
branchsync
changeset 32724d6c07372e3e
parent 3270 d8aea79654c3
child 3273 a9e910debbf2
updated sequoia for ENGINE-448 fixes
src/pEpEngine.h
src/pgp_sequoia.c
     1.1 --- a/src/pEpEngine.h	Wed Feb 06 07:17:26 2019 +0100
     1.2 +++ b/src/pEpEngine.h	Wed Feb 06 14:34:19 2019 +0100
     1.3 @@ -190,6 +190,10 @@
     1.4      case PEP_MALFORMED_KEY_RESET_MSG: return "PEP_MALFORMED_KEY_RESET_MSG";
     1.5      case PEP_KEY_NOT_RESET: return "PEP_KEY_NOT_RESET";
     1.6  
     1.7 +    case PEP_KEY_IMPORTED: return "PEP_KEY_IMPORTED";
     1.8 +    case PEP_NO_KEY_IMPORTED: return "PEP_NO_KEY_IMPORTED";
     1.9 +    case PEP_KEY_IMPORT_STATUS_UNKNOWN: return "PEP_KEY_IMPORT_STATUS_UNKNOWN";
    1.10 +    
    1.11      case PEP_CANNOT_FIND_IDENTITY: return "PEP_CANNOT_FIND_IDENTITY";
    1.12      case PEP_CANNOT_SET_PERSON: return "PEP_CANNOT_SET_PERSON";
    1.13      case PEP_CANNOT_SET_PGP_KEYPAIR: return "PEP_CANNOT_SET_PGP_KEYPAIR";
     2.1 --- a/src/pgp_sequoia.c	Wed Feb 06 07:17:26 2019 +0100
     2.2 +++ b/src/pgp_sequoia.c	Wed Feb 06 14:34:19 2019 +0100
     2.3 @@ -1510,13 +1510,14 @@
     2.4          // If private_idents is not NULL and there is any private key
     2.5          // material, it will be saved.
     2.6          status = tpk_save(session, tpk, private_idents);
     2.7 +        if (status == PEP_STATUS_OK)
     2.8 +            status = PEP_KEY_IMPORTED;
     2.9          ERROR_OUT(session, status, "saving TPK");
    2.10 -
    2.11          break;
    2.12      }
    2.13      default:
    2.14 -        ERROR_OUT(session, PEP_STATUS_OK,
    2.15 -                  "Can't import %s", sq_tag_to_string(tag));
    2.16 +        ERROR_OUT(session, PEP_NO_KEY_IMPORTED,
    2.17 +                  "Can't import %s", sq_tag_to_string(tag));        
    2.18          break;
    2.19      }
    2.20