Added a protocol field for users to use.

2002-05-30  Not Zed  <NotZed@Ximian.com>

        * camel-cipher-context.h: Added a protocol field for users to use.

        * camel-stream-filter.c (do_read): Sigh, the pre-size is READ_PAD
        not READ_SIZE.  Big difference.
        (READ_PAD): Bumped upto 128 from 64, so we can fit a typical line
        in full.

        * providers/imap/camel-imap-folder.c (get_content): Changed to
        load multipart/signed as an opaque block into the right kind of
        object.

        * camel-multipart.h (struct _CamelMultipart): Removed the boundary
        field.  It wans't actually used anywhere.

        * camel-seekable-substream.c
        (camel_seekable_substream_new_with_seekable_stream_and_bounds):
        Shortened this stupidly long name to just :new(), its the only way
        its ever used.  Fixed all callers.

        * camel-multipart-signed.[ch]: new wrapper for multipart/signed
        types.  We need to treat the entire content as a blob of data for
        transport purposes.  This also cleans up a lot of the sign/verify
        handling.

        * camel-mime-part-utils.c
        (camel_mime_part_construct_content_from_parser): Just call
        camel_multipart_construct_from_parser for multipart parts, also
        use a multipart_signed for multipart/signed types.

        * camel-multipart.c (camel_multipart_construct_from_parser): New
        virtual function for multiparts to buld themselves.
        (construct_from_parser): Implement for normal multiparts.
        (toplevel): Got rid of a warning, it'll never be an abstract
        class.

        * camel-pgp-context.c (pgp_hash_to_id):
        (pgp_id_to_hash): Implement.
        (camel_pgp_context_init): Init the pgp protocol specifier.

        * camel-cipher-context.c (camel_cipher_id_to_hash):
        (camel_cipher_hash_to_id): Util virtual methods to handle the
        cipher id string.

        * camel-mime-filter-canon.[ch]: A new filter, end/start of line
        canonicalisation filter.  Can escape "From " and strip trailing
        whitespace, and canonicalise the end of line to crlf or to lf.

2002-05-29  Not Zed  <NotZed@Ximian.com>

        * camel-multipart.h (struct _CamelMultipart): Removed the
        'parent', nothing used it, anywhere.  Cleaned up some formatting
        slightly.

svn path=/trunk/; revision=17057

1 files changed, 55 insertions, 0 deletions

diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index e6ef1a7820..d1c04b831f 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -43,6 +43,8 @@
 #include <sys/types.h>
 #include <dirent.h>
 
+#include <ctype.h>
+
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
@@ -51,6 +53,8 @@
 #include <termios.h>
 #include <unistd.h>
 
+#include <ctype.h>
+
 #include <iconv.h>
 #include <gal/unicode/gunicode.h>
 #include <gal/util/e-iconv.h>
@@ -76,12 +80,19 @@ static int                  pgp_encrypt (CamelCipherContext *context, gboolean s
 static int                  pgp_decrypt (CamelCipherContext *context, CamelStream *istream,
 					 CamelStream *ostream, CamelException *ex);
 
+static const char *pgp_hash_to_id(CamelCipherContext *context, CamelCipherHash hash);
+static CamelCipherHash pgp_id_to_hash(CamelCipherContext *context, const char *id);
+
 static CamelCipherContextClass *parent_class;
 
 static void
 camel_pgp_context_init (CamelPgpContext *context)
 {
+	CamelCipherContext *ciph = (CamelCipherContext *)context;
+
 	context->priv = g_new0 (struct _CamelPgpContextPrivate, 1);
+
+	ciph->protocol = "application/pgp-encrypted";
 }
 
 static void
@@ -107,6 +118,8 @@ camel_pgp_context_class_init (CamelPgpContextClass *camel_pgp_context_class)
 	camel_cipher_context_class->verify = pgp_verify;
 	camel_cipher_context_class->encrypt = pgp_encrypt;
 	camel_cipher_context_class->decrypt = pgp_decrypt;
+	camel_cipher_context_class->hash_to_id = pgp_hash_to_id;
+	camel_cipher_context_class->id_to_hash = pgp_id_to_hash;
 }
 
 CamelType
@@ -1476,3 +1489,45 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,
 	
 	return -1;
 }
+
+/* this has a 1:1 relationship to CamelCipherHash */
+static char *name_table[] = {
+	"pgp-sha1",		/* we use sha1 as the 'default' */
+	"pgp-md2",
+	"pgp-md5",
+	"pgp-sha1",
+	"pgp-ripemd160",
+};
+
+static const char *pgp_hash_to_id(CamelCipherContext *context, CamelCipherHash hash)
+{
+	/* if we dont know, just use default? */
+	if (hash > sizeof(name_table)/sizeof(name_table[0]))
+		hash = CAMEL_CIPHER_HASH_DEFAULT;
+
+	return name_table[hash];
+}
+
+static CamelCipherHash pgp_id_to_hash(CamelCipherContext *context, const char *id)
+{
+	int i;
+	unsigned char *tmpid, *o;
+	const char *in;
+	unsigned char c;
+
+	if (id == NULL)
+		return CAMEL_CIPHER_HASH_DEFAULT;
+
+	tmpid = alloca(strlen(id)+1);
+	in = id;
+	o = tmpid;
+	while ((c = (unsigned char)*in++))
+		*o++ = tolower(c);
+
+	for (i=1;i<sizeof(name_table)/sizeof(name_table[0]);i++) {
+		if (!strcmp(name_table[i], tmpid))
+			return i;
+	}
+
+	return CAMEL_CIPHER_HASH_DEFAULT;
+}