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, 48 insertions, 0 deletions

diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 9234b18988..227b2dfc2a 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -950,4 +950,52 @@ smime_decode (CamelCMSContext *ctx, CamelMimeMessage *message,
 	return mesg;
 }
 
+#if 0
+
+/* Ugh, so smime context inherets from cms context, not cipher context
+   this needs to be fixed ... */
+
+/* this has a 1:1 relationship to CamelCipherHash */
+static char **name_table[] = {
+	"sha1",		/* we use sha1 as the 'default' */
+	NULL,
+	"md5",
+	"sha1",
+	NULL,
+};
+
+static const char *smime_hash_to_id(CamelCipherContext *context, CamelCipherHash hash)
+{
+	/* if we dont know, just use default? */
+	if (hash > sizeof(name_table)/sizeof(name_table[0])
+	    || name_table[hash] == NULL;
+		hash = CAMEL_CIPHER_HASH_DEFAULT;
+
+	return name_table[hash];
+}
+
+static CamelCipherHash smime_id_to_hash(CamelCipherContext *context, const char *id)
+{
+	int i;
+	unsigned char *tmpid, *o, *in;
+	unsigned char c;
+
+	if (id == NULL)
+		return CAMEL_CIPHER_HASH_DEFAULT;
+
+	tmpid = alloca(strlen(id)+1);
+	in = id;
+	o = tmpid;
+	while ((c = *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;
+}
+#endif
+
 #endif /* HAVE_NSS */