go on...

src/message_api.c

@@ -33,6 +33,61 @@ static char * combine_short_and_long(const message * src)
     return ptext;
 }
 
+static int seperate_short_and_long(const char *src, char **shortmsg, char **longmsg)
+{
+    char *_shortmsg = NULL;
+    char *_longmsg = NULL;
+
+    assert(src);
+    assert(shortmsg);
+    assert(longmsg);
+
+    *shortmsg = NULL;
+    *longmsg = NULL;
+
+    if (strncmp(src, "subject: ", 9) == 0) {
+        char *line_end = strchr(src, '\n');
+        
+        if (line_end == NULL) {
+            _shortmsg = strdup(src + 9);
+            if (_shortmsg == NULL)
+                goto enomem;
+            // _longmsg = NULL;
+        }
+        else {
+            size_t n = line_end - src;
+            if (*(line_end - 1) == '\r')
+                _shortmsg = strndup(src + 9, n - 1);
+            else
+                _shortmsg = strndup(src + 9, n);
+            if (_shortmsg == NULL)
+                goto enomem;
+            _longmsg = strdup(src + n);
+            if (_longmsg == NULL)
+                goto enomem;
+        }
+    }
+    else {
+        _shortmsg = strdup("pEp");
+        if (_shortmsg == NULL)
+            goto enomem;
+        _longmsg = strdup(src);
+        if (_longmsg == NULL)
+            goto enomem;
+    }
+    
+    *shortmsg = _shortmsg;
+    *longmsg = _longmsg;
+
+    return 0;
+
+enomem:
+    free(_shortmsg);
+    free(_longmsg);
+
+    return -1;
+}
+
 static message * clone_to_empty_message(const message * src)
 {
     pEp_identity *from = NULL;
@@ -44,8 +99,6 @@ static message * clone_to_empty_message(const message * src)
     assert(src->from);
     assert(src->to);
 
-    msg->dir = src->dir;
-
     from = identity_dup(src->from);
     if (from == NULL)
         goto enomem;
@@ -60,6 +113,8 @@ static message * clone_to_empty_message(const message * src)
     if (msg == NULL)
         goto enomem;
 
+    msg->dir = src->dir;
+
     if (src->cc) {
         msg->cc = identity_list_dup(src->cc);
         if (msg->cc == NULL)
@@ -373,9 +428,55 @@ DYNAMIC_API PEP_STATUS decrypt_message(
 
     switch (enc_format) {
         case PEP_enc_none:
+            if (src->enc_format == PEP_enc_PEP) {
+                // TODO: implement
+                NOT_IMPLEMENTED
+            }
+
             break;
 
         case PEP_enc_none_MIME:
+            if (src->enc_format == PEP_enc_PEP) {
+                // TODO: implement
+                NOT_IMPLEMENTED
+            }
+
+            char *ctext = src->longmsg;
+            size_t csize = strlen(src->longmsg);
+            char *ptext;
+            size_t psize;
+            stringlist_t *keylist;
+
+            status = decrypt_and_verify(session, ctext, csize, &ptext, &psize,
+                    &keylist);
+            if (ptext == NULL)
+                goto pep_error;
+
+            if (src->enc_format == PEP_enc_MIME_multipart) {
+                if (src->shortmsg == NULL || strcmp(src->shortmsg, "pEp") == 0)
+                {
+                    char * shortmsg;
+                    char * longmsg;
+
+                    int r = seperate_short_and_long(ptext, &shortmsg,
+                            &longmsg);
+                    free(ptext);
+                    if (r == -1)
+                        goto enomem;
+
+                    msg->shortmsg = shortmsg;
+                    msg->longmsg = longmsg;
+                }
+                else {
+                    msg->shortmsg = strdup(src->shortmsg);
+                    if (msg->shortmsg == NULL)
+                        goto enomem;
+                    msg->longmsg = ptext;
+                }
+            }
+            else {
+                
+            }
             break;
 
         default:

src/platform_windows.cpp

@@ -203,9 +203,15 @@ long random(void)
     return (long) (r & ((1<<31)-1));
 }
 
-#ifndef strtok_r
-#define strtok_r(A, B, C) strtok_s((A), (B), (C))
-#endif
+char *strndup(const char *s1, size_t n)
+{
+    char *str = (char *) calloc(n + 1, 1);
+    if (str == NULL)
+        return NULL;
+
+    strncpy(str, s1, n);
+    return str;
+}
 
 } // "C"
 

src/platform_windows.h

@@ -19,11 +19,11 @@ void *dlopen(const char *filename, int flag);
 int dlclose(void *handle);
 void *dlsym(void *handle, const char *symbol);
 
-char *strtok_r(
-        char *restrict str,
-        const char *restrict sep,
-        char **restrict lasts
-    );
+#ifndef strtok_r
+#define strtok_r(A, B, C) strtok_s((A), (B), (C))
+#endif
+
+char *strndup(const char *s1, size_t n);
 
 const char *windoze_local_db(void);
 const char *windoze_system_db(void);