diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-crypto.c | 162 | ||||
| -rw-r--r-- | mail/mail-crypto.h | 18 |
3 files changed, 4 insertions, 180 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index de0a213e33..e2ffa2d445 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2003-07-28 Jeffrey Stedfast <fejj@ximian.com> + + * mail-crypto.c: Removed smime functions as they were stale. + 2003-07-25 Jeffrey Stedfast <fejj@ximian.com> * message-browser.c (message_browser_new): Handle our own Delete diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index 68f91b35de..c77bc14425 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -50,165 +50,3 @@ mail_crypto_get_pgp_cipher_context (EAccount *account) return cipher; } - - -/** - * mail_crypto_smime_sign: - * @message: MIME message to sign - * @userid: userid to sign with - * @signing_time: Include signing time - * @detached: create detached signature - * @ex: exception which will be set if there are any errors. - * - * Returns a S/MIME message in compliance with rfc2633. Returns %NULL - * on failure and @ex will be set. - **/ -CamelMimeMessage * -mail_crypto_smime_sign (CamelMimeMessage *message, const char *userid, - gboolean signing_time, gboolean detached, - CamelException *ex) -{ - CamelSMimeContext *context = NULL; - CamelMimeMessage *mesg = NULL; - -#ifdef HAVE_NSS - context = camel_smime_context_new (session, NULL); -#endif - - if (context) { - mesg = camel_cms_sign (CAMEL_CMS_CONTEXT (context), message, - userid, signing_time, detached, ex); - camel_object_unref (context); - } else - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not create a S/MIME signature context.")); - - return mesg; -} - - -/** - * mail_crypto_smime_certsonly: - * @message: MIME message - * @userid: userid - * @recipients: recipients - * @ex: exception - * - * Returns a S/MIME message. - **/ -CamelMimeMessage * -mail_crypto_smime_certsonly (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex) -{ - CamelSMimeContext *context = NULL; - CamelMimeMessage *mesg = NULL; - -#ifdef HAVE_NSS - context = camel_smime_context_new (session, NULL); -#endif - - if (context) { - mesg = camel_cms_certsonly (CAMEL_CMS_CONTEXT (context), message, - userid, recipients, ex); - camel_object_unref (context); - } else - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not create a S/MIME certsonly context.")); - - return mesg; -} - - -/** - * mail_crypto_smime_encrypt: - * @message: MIME message - * @userid: userid - * @recipients: recipients - * @ex: exception - * - * Returns a S/MIME message. - **/ -CamelMimeMessage * -mail_crypto_smime_encrypt (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex) -{ - CamelSMimeContext *context = NULL; - CamelMimeMessage *mesg = NULL; - -#ifdef HAVE_NSS - context = camel_smime_context_new (session, NULL); -#endif - - if (context) { - mesg = camel_cms_encrypt (CAMEL_CMS_CONTEXT (context), message, - userid, recipients, ex); - camel_object_unref (context); - } else - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not create a S/MIME encryption context.")); - - return mesg; -} - - -/** - * mail_crypto_smime_envelope: - * @message: MIME message - * @userid: userid - * @recipients: recipients - * @ex: exception - * - * Returns a S/MIME message. - **/ -CamelMimeMessage * -mail_crypto_smime_envelope (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex) -{ - CamelSMimeContext *context = NULL; - CamelMimeMessage *mesg = NULL; - -#ifdef HAVE_NSS - context = camel_smime_context_new (session, NULL); -#endif - - if (context) { - mesg = camel_cms_envelope (CAMEL_CMS_CONTEXT (context), message, - userid, recipients, ex); - camel_object_unref (context); - } else - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not create a S/MIME envelope context.")); - - return mesg; -} - - -/** - * mail_crypto_smime_decode: - * @message: MIME message - * @info: pointer to a CamelCMSValidityInfo structure (or %NULL) - * @ex: exception - * - * Returns a decoded S/MIME message. - **/ -CamelMimeMessage * -mail_crypto_smime_decode (CamelMimeMessage *message, CamelCMSValidityInfo **info, - CamelException *ex) -{ - CamelSMimeContext *context = NULL; - CamelMimeMessage *mesg = NULL; - -#ifdef HAVE_NSS - context = camel_smime_context_new (session, NULL); -#endif - - if (context) { - mesg = camel_cms_decode (CAMEL_CMS_CONTEXT (context), - message, info, ex); - camel_object_unref (context); - } else - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not create a S/MIME decode context.")); - - return mesg; -} diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index 7212d2cb3c..a881dba53a 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -36,24 +36,6 @@ extern "C" { /* PGP/MIME convenience wrappers */ CamelCipherContext *mail_crypto_get_pgp_cipher_context (EAccount *account); - -/* S/MIME v3 convenience wrappers */ -CamelMimeMessage *mail_crypto_smime_sign (CamelMimeMessage *message, const char *userid, - gboolean signing_time, gboolean detached, - CamelException *ex); - -CamelMimeMessage *mail_crypto_smime_certsonly (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex); - -CamelMimeMessage *mail_crypto_smime_encrypt (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex); - -CamelMimeMessage *mail_crypto_smime_envelope (CamelMimeMessage *message, const char *userid, - GPtrArray *recipients, CamelException *ex); - -CamelMimeMessage *mail_crypto_smime_decode (CamelMimeMessage *message, - CamelCMSValidityInfo **info, CamelException *ex); - #ifdef __cplusplus } #endif /* __cplusplus */ |