2001-11-22 Marcus Brinkmann <[email protected]>

	* gpgme.h (gpgme_set_protocol): New prototype.

2001-11-22  Marcus Brinkmann  <[email protected]>

	* Makefile.am (libgpgsmplug_la_LIBADD): New variable.
	(libgpgsmplug_la_LDFLAGS): Likewise.
	(libgpgsmplug_la_SOURCES): Likewise.
	(lib_LTLIBRARIES): Add libgpgsmplug.la.
	(INCLUDES): Include the local gpgme.h.

	* gpgmeplug.c (signMessage): Set protocol.
	(GPGMEPLUG_PROTOCOL) [!GPGMEPLUG_PROTOCOL]: Set
	GPGMEPLUG_PROTOCOL.
	* gpgsmplug.c: New file.

6 files changed, 32 insertions, 2 deletions

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 419eda8b..ed126a84 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,9 @@
 2001-11-22  Marcus Brinkmann  <[email protected]>
 
+	* gpgme.h (gpgme_set_protocol): New prototype.
+
+2001-11-22  Marcus Brinkmann  <[email protected]>
+
 	* engine-gpgsm.c (_gpgme_gpgsm_op_decrypt): New function.
 	(_gpgme_gpgsm_op_import): Likewise.
 
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 5ef5aaa3..7a0f657d 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -173,6 +173,7 @@ void       gpgme_cancel (GpgmeCtx c);
 GpgmeCtx   gpgme_wait (GpgmeCtx c, int hang);
 
 char *gpgme_get_notation (GpgmeCtx c);
+GpgmeError gpgme_set_protocol (GpgmeCtx c, GpgmeProtocol prot);
 void gpgme_set_armor (GpgmeCtx c, int yes);
 int  gpgme_get_armor (GpgmeCtx c);
 void gpgme_set_textmode (GpgmeCtx c, int yes);
diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog
index 0b0e249d..88180c30 100644
--- a/gpgmeplug/ChangeLog
+++ b/gpgmeplug/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-22  Marcus Brinkmann  <[email protected]>
+
+	* Makefile.am (libgpgsmplug_la_LIBADD): New variable.
+	(libgpgsmplug_la_LDFLAGS): Likewise.
+	(libgpgsmplug_la_SOURCES): Likewise.
+	(lib_LTLIBRARIES): Add libgpgsmplug.la.
+	(INCLUDES): Include the local gpgme.h.
+
+	* gpgmeplug.c (signMessage): Set protocol.
+	(GPGMEPLUG_PROTOCOL) [!GPGMEPLUG_PROTOCOL]: Set
+	GPGMEPLUG_PROTOCOL.
+	* gpgsmplug.c: New file.
+
 2001-11-21  Marcus Brinkmann  <[email protected]>
 
 	* gpgmeplug.c: Include config.h only if [HAVE_CONFIG_H].  Do not
diff --git a/gpgmeplug/Makefile.am b/gpgmeplug/Makefile.am
index 81db7847..d4c51af3 100644
--- a/gpgmeplug/Makefile.am
+++ b/gpgmeplug/Makefile.am
@@ -24,22 +24,28 @@
 ## Process this file with automake to produce Makefile.in
 
 
-INCLUDES = -I.. -I../gpgme -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/gpgme
 
 #LDADD = ../gpgme/libgpgme.la
 libgpgmeplug_la_LIBADD = ../gpgme/libgpgme.la
+libgpgsmplug_la_LIBADD = ../gpgme/libgpgme.la
 
 BUILT_SOURCES =
 
 #noinst_LIBRARIES = libgpgmeplug.a
 #noinst_LTLIBRARIES = libgpgmeplug.la
 
-lib_LTLIBRARIES = libgpgmeplug.la
+lib_LTLIBRARIES = libgpgmeplug.la libgpgsmplug.la
 
 
 libgpgmeplug_la_LDFLAGS = -shared -Wl,-soname,libgpgmeplug.so
+libgpgsmplug_la_LDFLAGS = -shared -Wl,-soname,libgpgsmplug.so
 
 libgpgmeplug_la_SOURCES = gpgme.h \
 	cryptplug.h \
 	gpgmeplug.c
 
+libgpgsmplug_la_SOURCES = gpgme.h \
+	cryptplug.h \
+	gpgmeplug.c
+
diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index eac049e6..05d14385 100644
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -52,6 +52,9 @@
 #include <errno.h>
 
 #include "gpgme.h"
+#ifndef GPGMEPLUG_PROTOCOL
+#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_OpenPGP
+#endif
 
 #include "cryptplug.h"
 
@@ -719,6 +722,7 @@ bool signMessage( const char*  cleartext,
     return false;
 
   gpgme_new (&ctx);
+  gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
 
 
 
diff --git a/gpgmeplug/gpgsmplug.c b/gpgmeplug/gpgsmplug.c
new file mode 100644
index 00000000..f618267a
--- /dev/null
+++ b/gpgmeplug/gpgsmplug.c
@@ -0,0 +1,2 @@
+#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_CMS
+#include "gpgmeplug.c"