subtype "pEp.sync" invalid, switching to "pEp-sync" sync
authorVolker Birk <vb@pep-project.org>
Thu, 06 Jun 2019 22:20:55 +0200
branchsync
changeset 3817c2cb0ab6040a
parent 3816 c4e27127ffa5
child 3818 0b34a967ab39
subtype "pEp.sync" invalid, switching to "pEp-sync"
src/baseprotocol.c
test/src/engine_tests/SyncTests.cc
test/src/engine_tests/SyncTests.cc.b0rken
     1.1 --- a/src/baseprotocol.c	Thu Jun 06 21:47:19 2019 +0200
     1.2 +++ b/src/baseprotocol.c	Thu Jun 06 22:20:55 2019 +0200
     1.3 @@ -22,7 +22,7 @@
     1.4          return PEP_ILLEGAL_VALUE;
     1.5  
     1.6      bloblist_t *bl = bloblist_add(msg->attachments, payload, size,
     1.7 -            "application/pEp.sync", "ignore_this_attachment.pEp");
     1.8 +            "application/pEp-sync", "ignore_this_attachment.pEp");
     1.9      if (bl == NULL)
    1.10          goto enomem;
    1.11      else if (!msg->attachments) {
    1.12 @@ -39,7 +39,7 @@
    1.13          assert(sign && sign_size);
    1.14  
    1.15          bl = bloblist_add(bl, sign, sign_size,
    1.16 -                "application/pEp.sign", "electronic_signature.asc");
    1.17 +                "application/pEp-sign", "electronic_signature.asc");
    1.18          if (!bl)
    1.19              goto enomem;
    1.20      }
    1.21 @@ -136,7 +136,7 @@
    1.22      stringlist_t *keylist = NULL;
    1.23  
    1.24      for (bloblist_t *bl = msg->attachments; bl ; bl = bl->next) {
    1.25 -        if (bl->mime_type && strcasecmp(bl->mime_type, "application/pEp.sync") == 0) {
    1.26 +        if (bl->mime_type && strcasecmp(bl->mime_type, "application/pEp-sync") == 0) {
    1.27              if (!_payload) {
    1.28                  _payload = bl->value;
    1.29                  _payload_size = bl->size;
    1.30 @@ -146,7 +146,7 @@
    1.31                  goto the_end;
    1.32              }
    1.33          }
    1.34 -        else if (bl->mime_type && strcasecmp(bl->mime_type, "application/pEp.sign") == 0) {
    1.35 +        else if (bl->mime_type && strcasecmp(bl->mime_type, "application/pEp-sign") == 0) {
    1.36              if (!_sign) {
    1.37                  _sign = bl->value;
    1.38                  _sign_size = bl->size;
     2.1 --- a/test/src/engine_tests/SyncTests.cc	Thu Jun 06 21:47:19 2019 +0200
     2.2 +++ b/test/src/engine_tests/SyncTests.cc	Thu Jun 06 22:20:55 2019 +0200
     2.3 @@ -98,7 +98,7 @@
     2.4      cout << "sending message:\n";
     2.5  
     2.6      for (bloblist_t *b = msg->attachments; b && b->value; b = b->next) {
     2.7 -        if (b->mime_type && strcasecmp(b->mime_type, "application/pEp.sync") == 0) {
     2.8 +        if (b->mime_type && strcasecmp(b->mime_type, "application/pEp-sync") == 0) {
     2.9              assert(msg->from && msg->from->address && msg->from->username);
    2.10              cout << "<!-- " << msg->from->username << " <" << msg->from->address << "> -->\n";
    2.11              char *text = NULL;
     3.1 --- a/test/src/engine_tests/SyncTests.cc.b0rken	Thu Jun 06 21:47:19 2019 +0200
     3.2 +++ b/test/src/engine_tests/SyncTests.cc.b0rken	Thu Jun 06 22:20:55 2019 +0200
     3.3 @@ -95,7 +95,7 @@
     3.4      cout << "sending message:\n";
     3.5  
     3.6      for (bloblist_t *b = msg->attachments; b && b->value; b = b->next) {
     3.7 -        if (b->mime_type && strcasecmp(b->mime_type, "application/pEp.sync") == 0) {
     3.8 +        if (b->mime_type && strcasecmp(b->mime_type, "application/pEp-sync") == 0) {
     3.9              assert(msg->from && msg->from->address && msg->from->username);
    3.10              cout << "<!-- " << msg->from->username << " <" << msg->from->address << "> -->\n";
    3.11              char *text = NULL;