aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/Makefile.am2
-rw-r--r--camel/camel-pgp-context.c44
-rw-r--r--camel/camel-pgp-context.h8
-rw-r--r--camel/camel-pgp-mime.c4
-rw-r--r--camel/tests/Makefile.am2
-rw-r--r--camel/tests/smime/.cvsignore4
-rw-r--r--camel/tests/smime/Makefile.am22
-rw-r--r--camel/tests/smime/README2
-rw-r--r--camel/tests/smime/pgp.c110
10 files changed, 182 insertions, 28 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1e91d7fee5..3cd2dbf8fd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-06 Jeffrey Stedfast <fejj@ximian.com>
+
+ * Makefile.am: Added camel-pgp-context.[c,h] to the build. Also
+ added tests/smime/pgp.c and Makefile.am
+
+ * tests/smime/pgp.c: New test suite for PGP functions.
+
+ * camel-pgp-context.c: Various fixes to get it to build.
+
2001-04-07 Peter Williams <peterw@ximian.com>
* providers/imap/camel-imap-utils.c (imap_parse_string_generic): It
@@ -69,7 +78,8 @@
2001-04-02 Jeffrey Stedfast <fejj@ximian.com>
- * camel-pgp-context.c (camel_pgp_sign): mutex lock & unlock the context.
+ * camel-pgp-context.c (camel_pgp_sign): mutex lock & unlock the
+ context.
(camel_pgp_clearsign): Same.
(camel_pgp_verify): Same.
(camel_pgp_encrypt): Same.
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 71b1cb9ad6..96a1748fc0 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -53,6 +53,7 @@ libcamel_la_SOURCES = \
camel-multipart.c \
camel-object.c \
camel-operation.c \
+ camel-pgp-context.c \
camel-provider.c \
camel-remote-store.c \
camel-sasl.c \
@@ -125,6 +126,7 @@ libcamelinclude_HEADERS = \
camel-multipart.h \
camel-object.h \
camel-operation.h \
+ camel-pgp-context.h \
camel-provider.h \
camel-remote-store.h \
camel-sasl.h \
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index 05e5a190d5..4dad8909b9 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -26,6 +26,9 @@
#include "camel-pgp-context.h"
+#include "camel-stream-fs.h"
+#include "camel-stream-mem.h"
+
#include <gtk/gtk.h> /* for _() macro */
#include <stdio.h>
@@ -87,8 +90,6 @@ camel_pgp_context_finalise (CamelObject *o)
CamelPgpContext *context = (CamelPgpContext *)o;
camel_object_unref (CAMEL_OBJECT (context->priv->session));
- if (context->istream)
- camel_object_unref (CAMEL_OBJECT (context->priv->istream));
g_free (context->priv->path);
@@ -193,7 +194,7 @@ pgp_get_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
/* Use the userid as a key if possible, else be generic and use the type */
passphrase = camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_ASK,
- prompt, TRUE, NULL, userid ? userid : type,
+ prompt, TRUE, NULL, userid ? userid : (char *) type,
NULL);
g_free (prompt);
@@ -203,13 +204,13 @@ pgp_get_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
static void
pgp_forget_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
{
- const char *type;
+ const char *type = NULL;
if (!userid)
type = pgp_get_type_as_string (pgp_type);
camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_TELL,
- NULL, FALSE, NULL, userid ? userid : type,
+ NULL, FALSE, NULL, userid ? userid : (char *) type,
NULL);
}
@@ -291,7 +292,7 @@ crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int
(pipe (op_fds) < 0 ) ||
(pipe (diag_fds) < 0 )) {
*diagnostics = g_strdup_printf ("Couldn't create pipe to %s: "
- "%s", pgp_path,
+ "%s", path,
g_strerror (errno));
return 0;
}
@@ -526,7 +527,7 @@ camel_pgp_sign (CamelPgpContext *context, const char *userid, CamelPgpHashType h
goto exception;
}
- passphrase = pgp_get_passphrase (context->priv->session, context->priv->type, userid);
+ passphrase = pgp_get_passphrase (context->priv->session, context->priv->type, (char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
_("No password provided."));
@@ -644,7 +645,7 @@ camel_pgp_sign (CamelPgpContext *context, const char *userid, CamelPgpHashType h
"%s", diagnostics);
g_free (diagnostics);
g_free (ciphertext);
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type, (char *) userid);
PGP_UNLOCK(context);
@@ -665,7 +666,7 @@ camel_pgp_sign (CamelPgpContext *context, const char *userid, CamelPgpHashType h
g_byte_array_free (plaintext, TRUE);
if (passphrase) {
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type, (char *) userid);
g_free (passphrase);
}
@@ -718,7 +719,7 @@ camel_pgp_clearsign (CamelPgpContext *context, const char *userid, CamelPgpHashT
goto exception;
}
- passphrase = pgp_get_passphrase (context->priv->session, context->priv->type, userid);
+ passphrase = pgp_get_passphrase (context->priv->session, context->priv->type, (char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
_("No password provided."));
@@ -835,7 +836,7 @@ camel_pgp_clearsign (CamelPgpContext *context, const char *userid, CamelPgpHashT
"%s", diagnostics);
g_free (diagnostics);
g_free (ciphertext);
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type, (char *) userid);
}
g_free (diagnostics);
@@ -852,7 +853,7 @@ camel_pgp_clearsign (CamelPgpContext *context, const char *userid, CamelPgpHashT
g_byte_array_free (plaintext, TRUE);
if (passphrase) {
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type, (char *) userid);
g_free (passphrase);
}
@@ -925,7 +926,7 @@ camel_pgp_verify (CamelPgpContext *context, CamelStream *istream,
if (!plaintext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No plaintext to clearsign."));
+ _("No plaintext to verify."));
goto exception;
}
@@ -1086,7 +1087,7 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
CamelStream *istream, CamelStream *ostream, CamelException *ex)
{
GPtrArray *recipient_list = NULL;
- GByteArray *ciphertext;
+ GByteArray *plaintext;
CamelStream *stream;
GPtrArray *argv;
int retval, r;
@@ -1113,7 +1114,8 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
if (sign) {
/* we only need a passphrase if we intend on signing */
- passphrase = pgp_get_passphrase (context->priv->session, context->priv->type, userid);
+ passphrase = pgp_get_passphrase (context->priv->session, context->priv->type,
+ (char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
_("No password provided."));
@@ -1148,7 +1150,6 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
recipient = recipients->pdata[r];
buf = g_strdup_printf ("-r %s", recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "gpg");
@@ -1185,7 +1186,6 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
recipient = recipients->pdata[r];
buf = g_strdup_printf ("-r %s", recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "pgpe");
@@ -1217,7 +1217,6 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
recipient = recipients->pdata[r];
buf = g_strdup (recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "pgp");
@@ -1254,7 +1253,7 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
&ciphertext, NULL,
&diagnostics);
- g_ptr_array_free (plaintext, TRUE);
+ g_byte_array_free (plaintext, TRUE);
/* free the temp recipient list */
if (recipient_list) {
@@ -1272,7 +1271,8 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
g_free (diagnostics);
g_free (ciphertext);
if (sign)
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type,
+ (char *) userid);
PGP_UNLOCK(context);
@@ -1294,7 +1294,7 @@ camel_pgp_encrypt (CamelPgpContext *context, gboolean sign, const char *userid,
if (sign) {
g_free (passphrase);
- pgp_forget_passphrase (context->priv->session, context->priv->type, userid);
+ pgp_forget_passphrase (context->priv->session, context->priv->type, (char *) userid);
}
PGP_UNLOCK(context);
@@ -1325,7 +1325,7 @@ camel_pgp_decrypt (CamelPgpContext *context, CamelStream *istream,
char *plaintext = NULL;
int plainlen;
char *diagnostics = NULL;
- char *passphrase;
+ char *passphrase = NULL;
int passwd_fds[2];
char passwd_fd[32];
int retval, i;
diff --git a/camel/camel-pgp-context.h b/camel/camel-pgp-context.h
index df3da0467e..239d15bf3e 100644
--- a/camel/camel-pgp-context.h
+++ b/camel/camel-pgp-context.h
@@ -68,6 +68,12 @@ typedef struct _CamelPgpContext {
} CamelPgpContext;
+typedef struct _CamelPgpContextClass {
+ CamelObjectClass parent_class;
+
+} CamelPgpContextClass;
+
+typedef struct _CamelPgpValidity CamelPgpValidity;
CamelType camel_pgp_context_get_type (void);
@@ -91,8 +97,6 @@ int camel_pgp_decrypt (CamelPgpContext *context, CamelStream *istr
CamelException *ex);
/* CamelPgpValidity utility functions */
-typedef struct _CamelPgpValidity CamelPgpValidity;
-
CamelPgpValidity *camel_pgp_validity_new (void);
void camel_pgp_validity_init (CamelPgpValidity *validity);
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index 6d256ba0b2..72f29248a7 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -255,8 +255,8 @@ camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, c
g_slist_free (encodings);
/* construct the pgp-signature mime part */
- d(fprintf (stderr, "signature:\n%*.s\n", CAMEL_STREAM_MEM (sigstream)->buf->len,
- CAMEL_STREAM_MEM (sigstream)->buf->data));
+ d(fprintf (stderr, "signature:\n%*.s\n", CAMEL_STREAM_MEM (sigstream)->buffer->len,
+ CAMEL_STREAM_MEM (sigstream)->buffer->data));
signed_part = camel_mime_part_new ();
camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (signed_part), sigstream);
camel_object_unref (CAMEL_OBJECT (sigstream));
diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am
index 6125c6b134..1d24ebd0ac 100644
--- a/camel/tests/Makefile.am
+++ b/camel/tests/Makefile.am
@@ -1,3 +1,3 @@
SUBDIRS = lib \
- message folder stream misc
+ message folder stream smime misc
diff --git a/camel/tests/smime/.cvsignore b/camel/tests/smime/.cvsignore
new file mode 100644
index 0000000000..9dffc98fae
--- /dev/null
+++ b/camel/tests/smime/.cvsignore
@@ -0,0 +1,4 @@
+.deps
+.libs
+Makefile*
+pgp
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
new file mode 100644
index 0000000000..8c6ead5418
--- /dev/null
+++ b/camel/tests/smime/Makefile.am
@@ -0,0 +1,22 @@
+
+INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
+ -I$(includedir) \
+ -I$(top_srcdir)/camel/tests/lib \
+ -DG_LOG_DOMAIN=\"evolution-tests\"
+
+LDADD = \
+ $(top_builddir)/camel/libcamel.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/libibex/libibex.la \
+ $(GNOME_LIBDIR) \
+ $(top_builddir)/camel/tests/lib/libcameltest.a \
+ $(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS) \
+ $(BONOBO_GNOME_LIBS)
+
+check_PROGRAMS = \
+ pgp
+
+TESTS = pgp
+
+
+
diff --git a/camel/tests/smime/README b/camel/tests/smime/README
new file mode 100644
index 0000000000..baad91ba00
--- /dev/null
+++ b/camel/tests/smime/README
@@ -0,0 +1,2 @@
+pgp PGP test suite
+
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
new file mode 100644
index 0000000000..86e419e680
--- /dev/null
+++ b/camel/tests/smime/pgp.c
@@ -0,0 +1,110 @@
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <camel/camel-pgp-context.h>
+#include <camel/camel-stream-mem.h>
+
+#include "camel-test.h"
+
+/* god, who designed this horrid interface */
+static gpointer auth_callback (CamelAuthCallbackMode mode,
+ char *data, gboolean secret,
+ CamelService *service, char *item,
+ CamelException *ex)
+{
+ return g_strdup ("PGP/MIME is rfc2015, now go and read it.");
+}
+
+int main (int argc, char **argv)
+{
+ CamelSession *session;
+ CamelPgpContext *ctx;
+ CamelException *ex;
+ CamelPgpValidity *valid;
+ CamelStream *stream1, *stream2, *stream3;
+ GPtrArray *recipients;
+ GByteArray *buf;
+ char *before, *after;
+
+ camel_test_init (argc, argv);
+
+ ex = camel_exception_new ();
+
+ /* clear out any camel-test data */
+ system("/bin/rm -rf /tmp/camel-test");
+
+ session = camel_session_new ("/tmp/camel-test",
+ auth_callback, NULL, NULL);
+
+ ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg");
+
+ camel_test_start ("Test of PGP functions");
+
+ stream1 = camel_stream_mem_new ();
+ camel_stream_write (stream1, "Hello, I am a test stream.", 25);
+ camel_stream_reset (stream1);
+
+ stream2 = camel_stream_mem_new ();
+
+ camel_test_push ("PGP signing");
+ camel_pgp_sign (ctx, "pgp-mime@xtorshun.org", CAMEL_PGP_HASH_TYPE_SHA1,
+ stream1, stream2, ex);
+ check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));
+ camel_test_pull ();
+
+ camel_exception_clear (ex);
+
+ camel_test_push ("PGP verify");
+ camel_stream_reset (stream1);
+ camel_stream_reset (stream2);
+ valid = camel_pgp_verify (ctx, stream1, stream2, ex);
+ check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));
+ check_msg (camel_pgp_validity_get_valid (valid), "%s", camel_pgp_validity_get_description (valid));
+ camel_pgp_validity_free (valid);
+ camel_test_pull ();
+
+ camel_object_unref (CAMEL_OBJECT (stream1));
+ camel_object_unref (CAMEL_OBJECT (stream2));
+
+ stream1 = camel_stream_mem_new ();
+ stream2 = camel_stream_mem_new ();
+ stream3 = camel_stream_mem_new ();
+
+ camel_stream_write (stream1, "Hello, I am a test of encryption/decryption.", 44);
+ camel_stream_reset (stream1);
+
+ camel_exception_clear (ex);
+
+ camel_test_push ("PGP encrypt");
+ recipients = g_ptr_array_new ();
+ g_ptr_array_add (recipients, "pgp-mime@xtorshun.org");
+ camel_pgp_encrypt (ctx, FALSE, "pgp-mime@xtorshun.org", recipients,
+ stream1, stream2, ex);
+ check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));
+ g_ptr_array_free (recipients, TRUE);
+ camel_test_pull ();
+
+ camel_stream_reset (stream2);
+ camel_exception_clear (ex);
+
+ camel_test_push ("PGP decrypt");
+ camel_pgp_decrypt (ctx, stream2, stream3, ex);
+ check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));
+ buf = CAMEL_STREAM_MEM (stream1)->buffer;
+ before = g_strndup (buf->data, buf->len);
+ buf = CAMEL_STREAM_MEM (stream3)->buffer;
+ after = g_strndup (buf->data, buf->len);
+ check_msg (string_equal (before, after), "before = '%s', after = '%s'", before, after);
+ g_free (before);
+ g_free (after);
+ camel_test_pull ();
+
+ camel_object_unref (CAMEL_OBJECT (ctx));
+ camel_object_unref (CAMEL_OBJECT (session));
+
+ camel_test_end ();
+
+ return 0;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 16:15:14 +0800