Removed.

2003-07-08  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-pgp-mime.[c,h]: Removed.

svn path=/trunk/; revision=21760

4 files changed, 2 insertions, 200 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index b8d6bfa1f6..7a0afe7e8b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,7 @@
 2003-07-08  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* camel-pgp-mime.[c,h]: Removed.
+
 	* camel-iconv.c: Updated (new copy/paste from e-iconv).
 
 	* camel-block-file.c (camel_block_file_get_block): Use
diff --git a/camel/Makefile.am b/camel/Makefile.am
index ae53085715..98d3a3b388 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -77,7 +77,6 @@ libcamel_la_SOURCES = 				\
 	camel-object.c				\
 	camel-operation.c			\
 	camel-partition-table.c			\
-	camel-pgp-mime.c			\
 	camel-smime-context.c			\
 	camel-smime-utils.c			\
 	camel-provider.c			\
@@ -179,7 +178,6 @@ libcamelinclude_HEADERS =			\
 	camel-object.h				\
 	camel-operation.h			\
 	camel-partition-table.h			\
-	camel-pgp-mime.h			\
 	camel-smime-context.h			\
 	camel-smime-utils.h			\
 	camel-provider.h			\
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
deleted file mode 100644
index 43562495d0..0000000000
--- a/camel/camel-pgp-mime.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 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.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "camel-pgp-mime.h"
-#include "camel-mime-message.h"
-
-
-/**
- * camel_pgp_mime_is_rfc2015_signed:
- * @mime_part: MIME part
- *
- * Checks that this part is a multipart/signed part following the
- * rfc2015 and/or rfc3156 PGP/MIME specifications.
- *
- * Returns %TRUE if this looks to be a valid PGP/MIME multipart/signed
- * part or %FALSE otherwise.
- **/
-gboolean
-camel_pgp_mime_is_rfc2015_signed (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	const char *param, *micalg;
-#endif
-	int nparts;
-	
-	/* check that we have a multipart/signed */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "signed"))
-		return FALSE;
-	
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	/* check that we have a protocol param with the value: "application/pgp-signature" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || strcasecmp (param, "application/pgp-signature"))
-		return FALSE;
-	
-	/* check that we have a micalg parameter */
-	micalg = header_content_type_param (type, "micalg");
-	if (!micalg)
-		return FALSE;
-#endif /* ENABLE_PEDANTIC_PGPMIME */
-	
-	/* check that we have exactly 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts != 2)
-		return FALSE;
-	
-	/* The first part may be of any type except for 
-	 * application/pgp-signature - check it. */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	/* The second part should be application/pgp-signature. */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	return TRUE;
-}
-
-
-/**
- * camel_pgp_mime_is_rfc2015_encrypted:
- * @mime_part: MIME part
- *
- * Checks that this part is a multipart/encrypted part following the
- * rfc2015 and/or rfc3156 PGP/MIME specifications.
- *
- * Returns %TRUE if this looks to be a valid PGP/MIME
- * multipart/encrypted part or %FALSE otherwise.
- **/
-gboolean
-camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	const char *param;
-#endif
-	int nparts;
-	
-	/* check that we have a multipart/encrypted */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "encrypted"))
-		return FALSE;
-	
-#ifdef ENABLE_PEDANTIC_PGPMIME
-	/* check that we have a protocol param with the value: "application/pgp-encrypted" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || strcasecmp (param, "application/pgp-encrypted"))
-		return FALSE;
-#endif /* ENABLE_PEDANTIC_PGPMIME */
-	
-	/* check that we have at least 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts < 2)
-		return FALSE;
-	
-	/* The first part should be application/pgp-encrypted */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-encrypted"))
-		return FALSE;
-	
-	/* The second part should be application/octet-stream - this
-           is the one we care most about */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "octet-stream"))
-		return FALSE;
-	
-	return TRUE;
-}
diff --git a/camel/camel-pgp-mime.h b/camel/camel-pgp-mime.h
deleted file mode 100644
index 61d1478928..0000000000
--- a/camel/camel-pgp-mime.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 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.
- *
- */
-
-
-#ifndef __CAMEL_PGP_MIME_H__
-#define __CAMEL_PGP_MIME_H__
-
-#include <glib.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-gboolean camel_pgp_mime_is_rfc2015_signed (CamelMimePart *part);
-gboolean camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *part);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CAMEL_PGP_MIME_H__ */