remove buggy pgp plaintext code

[claws.git] / src / pgptext.c

diff --git a/src/pgptext.c b/src/pgptext.c
index f1001fb7dc50e1d5dcc320856a5f95ceccd71b64..53a1f08c6017dad066568d8b277d9354636c1306 100644 (file)
--- a/src/pgptext.c
+++ b/src/pgptext.c
@@ -69,6 +69,19 @@ struct passphrase_cb_info_s {
     int did_it;
 };
 
+/* stolen from rfc2015.c */
+static int
+gpg_name_cmp(const char *a, const char *b)
+{
+    for( ; *a && *b; a++, b++) {
+        if(*a != *b
+           && toupper(*(unsigned char *)a) != toupper(*(unsigned char *)b))
+            return 1;
+    }
+
+    return *a != *b;
+}
+
 static const char *
 passphrase_cb (void *opaque, const char *desc, void *r_hd)
 {
@@ -82,14 +95,14 @@ passphrase_cb (void *opaque, const char *desc, void *r_hd)
     }
 
     gpgmegtk_set_passphrase_grab (prefs_common.passphrase_grab);
-    g_message ("%% requesting passphrase for `%s': ", desc );
+    debug_print ("requesting passphrase for `%s': ", desc);
     pass = gpgmegtk_passphrase_mbox (desc);
     if (!pass) {
-        g_message ("%% cancel passphrase entry");
+        debug_print ("cancel passphrase entry\n");
         gpgme_cancel (ctx);
     }
     else
-        g_message ("%% sending passphrase");
+        debug_print ("sending passphrase\n");
 
     return pass;
 }
@@ -106,21 +119,21 @@ pgptext_decrypt (MimeInfo *partinfo, FILE *fp)
 
     err = gpgme_new (&ctx);
     if (err) {
-        g_message ("gpgme_new failed: %s", gpgme_strerror (err));
+        debug_print ("gpgme_new failed: %s\n", gpgme_strerror (err));
         goto leave;
     }
 
     err = gpgme_data_new_from_filepart (&cipher, NULL, fp,
                                        partinfo->fpos, partinfo->size);
     if (err) {
-        g_message ("gpgme_data_new_from_filepart failed: %s",
-                   gpgme_strerror (err));
+        debug_print ("gpgme_data_new_from_filepart failed: %s\n",
+                     gpgme_strerror (err));
         goto leave;
     }
 
     err = gpgme_data_new (&plain);
     if (err) {
-        g_message ("gpgme_new failed: %s", gpgme_strerror (err));
+        debug_print ("gpgme_new failed: %s\n", gpgme_strerror (err));
         goto leave;
     }
 
@@ -134,12 +147,12 @@ pgptext_decrypt (MimeInfo *partinfo, FILE *fp)
 leave:
     gpgme_data_release (cipher);
     if (err) {
-        g_warning ("** decryption failed: %s", gpgme_strerror (err));
+        debug_print ("decryption failed: %s\n", gpgme_strerror (err));
         gpgme_data_release (plain);
         plain = NULL;
     }
     else
-        g_message ("** decryption succeeded");
+        debug_print ("decryption succeeded\n");
 
     gpgme_release (ctx);
     return plain;
@@ -165,7 +178,7 @@ headerp(char *p, char **names)
     c = *p2;
     *p2 = 0;
     for(i = 0 ; names[i] != NULL; i++) {
-        if(!name_cmp (names[i], p))
+        if(!gpg_name_cmp (names[i], p))
             break;
     }
     *p2 = c;
@@ -292,7 +305,7 @@ void pgptext_decrypt_message (MsgInfo *msginfo, MimeInfo *mimeinfo, FILE *fp)
 
     g_return_if_fail (mimeinfo->mime_type == MIME_TEXT);
 
-    g_message ("** text/plain with pgptext encountered");
+    debug_print ("text/plain with pgptext encountered\n");
 
     partinfo = procmime_scan_message(msginfo);
                
@@ -337,7 +350,7 @@ void pgptext_decrypt_message (MsgInfo *msginfo, MimeInfo *mimeinfo, FILE *fp)
                
     err = gpgme_data_rewind (plain);
     if (err)
-        g_message ("** gpgme_data_rewind failed: %s", gpgme_strerror (err));
+        debug_print ("gpgme_data_rewind failed: %s\n", gpgme_strerror (err));
 
                /* insert blank line to avoid some trouble... */
                fputs ("\n", dstfp);
@@ -347,7 +360,7 @@ void pgptext_decrypt_message (MsgInfo *msginfo, MimeInfo *mimeinfo, FILE *fp)
     }
 
     if (err != GPGME_EOF) {
-        g_warning ("** gpgme_data_read failed: %s", gpgme_strerror (err));
+        debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
     }
 
     fclose (dstfp);