committing so I can try this on a different system. MacOS is missing the toolchain I need grrrr krista_temp
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Tue, 16 Apr 2019 17:42:57 +0200
branchkrista_temp
changeset 35353beb2f01130e
parent 3533 a43f28ac5c9b
child 3536 ebd964291c30
committing so I can try this on a different system. MacOS is missing the toolchain I need grrrr
src/Makefile
src/pEpEngine.h
src/pgp_sequoia.c
test/src/util/test_util.cc
     1.1 --- a/src/Makefile	Tue Apr 16 16:38:33 2019 +0200
     1.2 +++ b/src/Makefile	Tue Apr 16 17:42:57 2019 +0200
     1.3 @@ -80,7 +80,7 @@
     1.4  endif
     1.5  
     1.6  $(TARGET): libpEpEngine.a
     1.7 -	$(CC) $(ALL_OBJECTS) $(LDFLAGS) $(LDLIBS) -o $@
     1.8 +	$(CC) $(CFLAGS) $(ALL_OBJECTS) $(LDFLAGS) $(LDLIBS) -o $@
     1.9  
    1.10  .PHONY: objects clean install_headers install uninstall
    1.11  
     2.1 --- a/src/pEpEngine.h	Tue Apr 16 16:38:33 2019 +0200
     2.2 +++ b/src/pEpEngine.h	Tue Apr 16 17:42:57 2019 +0200
     2.3 @@ -55,6 +55,7 @@
     2.4      PEP_KEY_UNSUITABLE                              = 0x0206,
     2.5      PEP_MALFORMED_KEY_RESET_MSG                     = 0x0210,
     2.6      PEP_KEY_NOT_RESET                               = 0x0211,
     2.7 +    PEP_CANNOT_DELETE_KEY                           = 0x0212,
     2.8  
     2.9      PEP_KEY_IMPORTED                                = 0x0220,
    2.10      PEP_NO_KEY_IMPORTED                             = 0x0221,
     3.1 --- a/src/pgp_sequoia.c	Tue Apr 16 16:38:33 2019 +0200
     3.2 +++ b/src/pgp_sequoia.c	Tue Apr 16 17:42:57 2019 +0200
     3.3 @@ -1544,6 +1544,9 @@
     3.4  
     3.5  PEP_STATUS pgp_delete_keypair(PEP_SESSION session, const char *fpr_raw)
     3.6  {
     3.7 +
     3.8 +	return PEP_CANNOT_DELETE_KEY;
     3.9 +/*    
    3.10      PEP_STATUS status = PEP_STATUS_OK;
    3.11      char *fpr = pgp_fingerprint_canonicalize(fpr_raw);
    3.12  
    3.13 @@ -1556,6 +1559,7 @@
    3.14  
    3.15      free(fpr);
    3.16      return status;
    3.17 +*/
    3.18  }
    3.19  
    3.20  // XXX: This needs to handle not only TPKs, but also keyrings and
     4.1 --- a/test/src/util/test_util.cc	Tue Apr 16 16:38:33 2019 +0200
     4.2 +++ b/test/src/util/test_util.cc	Tue Apr 16 17:42:57 2019 +0200
     4.3 @@ -176,6 +176,8 @@
     4.4              return "PEP_CANNOT_EXPORT_KEY";
     4.5          case PEP_CANNOT_EDIT_KEY:
     4.6              return "PEP_CANNOT_EDIT_KEY";
     4.7 +        case PEP_CANNOT_DELETE_KEY:
     4.8 +            return "PEP_CANNOT_DELETE_KEY";
     4.9          case PEP_CANNOT_FIND_IDENTITY:
    4.10              return "PEP_CANNOT_FIND_IDENTITY";
    4.11          case PEP_CANNOT_SET_PERSON: