2002-01-16 Marcus Brinkmann <marcus@g10code.de>

	* gpgme-openpgp.c: New file.
	* Makefile.am (gpgme_openpgp_la_SOURCES): Replace gpgmeplug.c with
	gpgme-openpgp.c.

diff --git a/trunk/gpgmeplug/ChangeLog b/trunk/gpgmeplug/ChangeLog
index ae94e6bdb82f02c4ce7c18dc8716f98b17196773..fec6126955d13a15958e04b8cbd8ca39a376f1c2 100644 (file)
--- a/trunk/gpgmeplug/ChangeLog
+++ b/trunk/gpgmeplug/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-16  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme-openpgp.c: New file.
+       * Makefile.am (gpgme_openpgp_la_SOURCES): Replace gpgmeplug.c with
+       gpgme-openpgp.c.
+
 2002-01-15  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgmeplug.c: Renamed to ...

diff --git a/trunk/gpgmeplug/Makefile.am b/trunk/gpgmeplug/Makefile.am
index 54f4c3e49384a586ef790c43a0e69b656ffd31dc..bb28d05a6a30f45a03db761a180cdfff32258422 100644 (file)
--- a/trunk/gpgmeplug/Makefile.am
+++ b/trunk/gpgmeplug/Makefile.am
@@ -28,7 +28,7 @@ INCLUDES = -I$(top_srcdir)/gpgme
 
 pkglib_LTLIBRARIES = gpgme-openpgp.la gpgme-smime.la
 
-gpgme_openpgp_la_SOURCES = cryptplug.h gpgmeplug.c
+gpgme_openpgp_la_SOURCES = cryptplug.h gpgme-openpgp.c
 gpgme_openpgp_la_LIBADD = ../gpgme/libgpgme.la
 gpgme_openpgp_la_LDFLAGS = -module -avoid-version
 

diff --git a/trunk/gpgmeplug/gpgme-openpgp.c b/trunk/gpgmeplug/gpgme-openpgp.c
new file mode 100644 (file)
index 0000000..dce22be
--- /dev/null
+++ b/trunk/gpgmeplug/gpgme-openpgp.c
@@ -0,0 +1,37 @@
+#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_OpenPGP
+
+#define GPGMEPLUG_SIGN_INCLUDE_CLEARTEXT true
+#define GPGMEPLUG_SIGN_MAKE_MIME_OBJECT  true
+#define GPGMEPLUG_SIGN_MAKE_MULTI_MIME   true
+#define GPGMEPLUG_SIGN_CTYPE_MAIN        "multipart/signed;protocol=application/pgp-signature;micalg=pgp-sha1"
+#define GPGMEPLUG_SIGN_CDISP_MAIN        ""
+#define GPGMEPLUG_SIGN_CTENC_MAIN        ""
+#define GPGMEPLUG_SIGN_CTYPE_VERSION     ""
+#define GPGMEPLUG_SIGN_CDISP_VERSION     ""
+#define GPGMEPLUG_SIGN_CTENC_VERSION     ""
+#define GPGMEPLUG_SIGN_BTEXT_VERSION     ""
+#define GPGMEPLUG_SIGN_CTYPE_CODE        "application/pgp-signature"
+#define GPGMEPLUG_SIGN_CDISP_CODE        ""
+#define GPGMEPLUG_SIGN_CTENC_CODE        ""
+#define GPGMEPLUG_SIGN_FLAT_PREFIX       ""
+#define GPGMEPLUG_SIGN_FLAT_SEPARATOR    ""
+#define GPGMEPLUG_SIGN_FLAT_POSTFIX      ""
+
+#define GPGMEPLUG_ENC_INCLUDE_CLEARTEXT  false
+#define GPGMEPLUG_ENC_MAKE_MIME_OBJECT   true
+#define GPGMEPLUG_ENC_MAKE_MULTI_MIME    true
+#define GPGMEPLUG_ENC_CTYPE_MAIN         "multipart/encrypted; protocol=application/pgp-encrypted"
+#define GPGMEPLUG_ENC_CDISP_MAIN         ""
+#define GPGMEPLUG_ENC_CTENC_MAIN         ""
+#define GPGMEPLUG_ENC_CTYPE_VERSION      "application/pgp-encrypted"
+#define GPGMEPLUG_ENC_CDISP_VERSION      "attachment"
+#define GPGMEPLUG_ENC_CTENC_VERSION      ""
+#define GPGMEPLUG_ENC_BTEXT_VERSION      "Version: 1"
+#define GPGMEPLUG_ENC_CTYPE_CODE         "application/octet-stream"
+#define GPGMEPLUG_ENC_CDISP_CODE         "inline; filename=\"msg.asc\""
+#define GPGMEPLUG_ENC_CTENC_CODE         ""
+#define GPGMEPLUG_ENC_FLAT_PREFIX        ""
+#define GPGMEPLUG_ENC_FLAT_SEPARATOR     ""
+#define GPGMEPLUG_ENC_FLAT_POSTFIX       ""
+
+#include "gpgmeplug.c"