Updated. (decode_pgp): Get rid of #ifdef PGP_PROGRAM's and handle

2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>

	* mail-format.c: Updated.
	(decode_pgp): Get rid of #ifdef PGP_PROGRAM's and handle
	appropriately.
	(handle_multipart_signed): Same.
	(handle_multipart_encrypted): Same.

	* Makefile.am: Added openpgp-utils.[c,h] to the build.

	* openpgp-utils.c: New source file containing all of the pgp
	interface code.

	* mail-crypto.c: Removed all of the openpgp funtions as they are
	being moved to a new file.
	(mail_crypto_is_rfc2015_signed): Renamed.
	(mail_crypto_is_rfc2015_encrypted): Renamed.

svn path=/trunk/; revision=7320

1 files changed, 3 insertions, 33 deletions

diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index 250f46c022..189679257f 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -25,46 +25,16 @@
 
 #include <gnome.h>
 #include <camel/camel.h>
+#include "openpgp-utils.h"
 
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus }*/
 
-typedef enum {
-	PGP_HASH_TYPE_NONE,
-	PGP_HASH_TYPE_MD5,
-	PGP_HASH_TYPE_SHA1
-} PgpHashType;
+gboolean mail_crypto_is_rfc2015_signed (CamelMimePart *part);
 
-char *mail_crypto_openpgp_decrypt (const char *ciphertext,
-				   int cipherlen,
-				   int *outlen,
-				   CamelException *ex);
-
-char *mail_crypto_openpgp_encrypt (const char *in, int inlen,
-				   const GPtrArray *recipients,
-				   gboolean sign,
-				   const char *userid,
-				   CamelException *ex);
-
-char *mail_crypto_openpgp_clearsign (const char *plaintext,
-				     const char *userid,
-				     PgpHashType hash,
-				     CamelException *ex);
-
-char *mail_crypto_openpgp_sign (const char *in, int inlen,
-				const char *userid,
-				PgpHashType hash,
-				CamelException *ex);
-
-gboolean mail_crypto_openpgp_verify (const char *in, int inlen,
-				     const char *sigin, int siglen,
-				     CamelException *ex);
-
-gboolean is_rfc2015_signed (CamelMimePart *part);
-
-gboolean is_rfc2015_encrypted (CamelMimePart *part);
+gboolean mail_crypto_is_rfc2015_encrypted (CamelMimePart *part);
 
 void pgp_mime_part_sign (CamelMimePart **mime_part,
 			 const gchar *userid,