From 52759f2d4018b8ff0ce173aa1237b08783f1424c Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 30 Oct 2003 04:58:33 +0000 Subject: Added a note about api inconsistencies. 2003-10-30 Not Zed * camel-cipher-context.h: Added a note about api inconsistencies. 2003-10-30 Not Zed * camel-multipart-encrypted.c (camel_multipart_encrypted_decrypt): fix for cipher_decrypt changes. * camel-gpg-context.c, camel-cipher-context.c: moved all the init code to the end to save having to keep forward declarations around. (camel_cipher_decrypt): changed to take mimepart input and return a mimepart. (gpg_decrypt): fix for changed args. 2003-10-29 Not Zed * camel-smime-context.[ch]: replaced entirely with a new implementation which inherits from camel-cipher-context, and add to build. * camel-multipart-encrypted.c (camel_multipart_encrypted_encrypt): fix for cipher_encrypt api changes. (camel_multipart_encrypted_decrypt): use g_ascii_strcasecmp. * camel-gpg-context.c (gpg_encrypt): Fix to handle input/output as parts not streams * camel-cipher-context.c (camel_cipher_encrypt): change to take mimeparts rather than streams as input/output. And remove the 'sign' argument, it is implied if userid is supplied. 2003-10-28 Not Zed * tests/smime/pgp.c (main): fix for ciphercontext api changes. * camel-multipart-signed.c (camel_multipart_signed_verify): pass in the part to cipher_verify directly. (camel_multipart_signed_sign): let the cipher context setup the part details. * camel-gpg-context.c (gpg_sign): put the signature stream into a mimepart, with appropriate headers/encoding. (swrite): write out a mimepart rather than a stream. (gpg_verify): handle changed args. * camel-cipher-context.c (camel_cipher_sign): write the signature to a mimepart rather than a simple stream. (camel_cipher_verify): take the signature as a mimepart not a stream. 2003-10-22 Not Zed * camel-utf8.c (camel_ucs2_utf8, camel_utf8_ucs2): helpers for ucs2 stuff. ucs2 is 16 bit truncated unicode. svn path=/trunk/; revision=23127 --- camel/tests/smime/pgp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'camel/tests') diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c index 1075f218ad..2c8de8ccd1 100644 --- a/camel/tests/smime/pgp.c +++ b/camel/tests/smime/pgp.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "camel-test.h" #include "session.h" @@ -120,6 +121,7 @@ int main (int argc, char **argv) CamelException *ex; CamelCipherValidity *valid; CamelStream *stream1, *stream2, *stream3; + struct _CamelMimePart *sigpart; GPtrArray *recipients; GByteArray *buf; char *before, *after; @@ -154,11 +156,10 @@ int main (int argc, char **argv) camel_stream_write (stream1, "Hello, I am a test stream.\n", 27); camel_stream_reset (stream1); - stream2 = camel_stream_mem_new (); - + sigpart = camel_mime_part_new(); + camel_test_push ("PGP signing"); - camel_cipher_sign (ctx, "no.user@no.domain", CAMEL_CIPHER_HASH_SHA1, - stream1, stream2, ex); + camel_cipher_sign (ctx, "no.user@no.domain", CAMEL_CIPHER_HASH_SHA1, stream1, sigpart, ex); check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex)); camel_test_pull (); @@ -166,15 +167,14 @@ int main (int argc, char **argv) camel_test_push ("PGP verify"); camel_stream_reset (stream1); - camel_stream_reset (stream2); - valid = camel_cipher_verify (ctx, CAMEL_CIPHER_HASH_SHA1, stream1, stream2, ex); + valid = camel_cipher_verify (ctx, CAMEL_CIPHER_HASH_SHA1, stream1, sigpart, ex); check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex)); check_msg (camel_cipher_validity_get_valid (valid), "%s", camel_cipher_validity_get_description (valid)); camel_cipher_validity_free (valid); camel_test_pull (); - camel_object_unref (CAMEL_OBJECT (stream1)); - camel_object_unref (CAMEL_OBJECT (stream2)); + camel_object_unref(stream1); + camel_object_unref(sigpart); stream1 = camel_stream_mem_new (); stream2 = camel_stream_mem_new (); -- cgit v1.2.3