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/camel-smime-context.h | 80 +++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 36 deletions(-) (limited to 'camel/camel-smime-context.h') diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h index 940d715d22..a68d5e1646 100644 --- a/camel/camel-smime-context.h +++ b/camel/camel-smime-context.h @@ -1,62 +1,70 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Authors: Jeffrey Stedfast + * Michael Zucchi * - * Copyright 2001 Ximian, Inc. (www.ximian.com) + * Copyright 2002,2003 Ximian, Inc. (www.ximian.com) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * */ -#ifndef CAMEL_SMIME_CONTEXT_H -#define CAMEL_SMIME_CONTEXT_H - -#include -#include -#include +#ifndef __CAMEL_SMIME_CONTEXT_H__ +#define __CAMEL_SMIME_CONTEXT_H__ #ifdef __cplusplus extern "C" { #pragma } #endif /* __cplusplus */ -#define CAMEL_SMIME_CONTEXT_TYPE (camel_smime_context_get_type ()) -#define CAMEL_SMIME_CONTEXT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContext)) -#define CAMEL_SMIME_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContextClass)) -#define CAMEL_IS_SMIME_CONTEXT(o) (CAMEL_CHECK_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE)) +#include + +#define CAMEL_SMIME_CONTEXT_TYPE (camel_smime_context_get_type()) +#define CAMEL_SMIME_CONTEXT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_SMIME_CONTEXT_TYPE, CamelSMIMEContext)) +#define CAMEL_SMIME_CONTEXT_CLASS(k)(CAMEL_CHECK_CLASS_CAST((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMIMEContextClass)) +#define CAMEL_IS_SMIME_CONTEXT(o) (CAMEL_CHECK_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE)) + +typedef enum _camel_smime_sign_t { + CAMEL_SMIME_SIGN_CLEARSIGN, + CAMEL_SMIME_SIGN_ENVELOPED +} camel_smime_sign_t; + +typedef struct _CamelSMIMEContext CamelSMIMEContext; +typedef struct _CamelSMIMEContextClass CamelSMIMEContextClass; + +struct _CamelSMIMEContext { + CamelCipherContext cipher; -typedef struct _CamelSMimeContext { - CamelCMSContext parent_object; - - struct _CamelSMimeContextPrivate *priv; - - char *encryption_key; -} CamelSMimeContext; + struct _CamelSMIMEContextPrivate *priv; +}; -typedef struct _CamelSMimeContextClass { - CamelCMSContextClass parent_class; - -} CamelSMimeContextClass; +struct _CamelSMIMEContextClass { + CamelCipherContextClass cipher_class; +}; +CamelType camel_smime_context_get_type(void); -CamelType camel_smime_context_get_type (void); +CamelCipherContext *camel_smime_context_new(CamelSession *session); -CamelSMimeContext *camel_smime_context_new (CamelSession *session, const char *encryption_key); +/* nick to use for SMIMEEncKeyPrefs attribute for signed data */ +void camel_smime_context_set_encrypt_key(CamelSMIMEContext *context, gboolean use, const char *key); +/* set signing mode, clearsigned multipart/signed or enveloped */ +void camel_smime_context_set_sign_mode(CamelSMIMEContext *context, camel_smime_sign_t type); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* CAMEL_SMIME_CONTEXT_H */ +#endif /* __CAMEL_SMIME_CONTEXT_H__ */ -- cgit v1.2.3