2001-11-22 Marcus Brinkmann <marcus@g10code.de>

	* gpgme.h (gpgme_set_protocol): New prototype.

2001-11-22  Marcus Brinkmann  <marcus@g10code.de>

	* 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.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 419eda8b0d1525767929b01530aab22768838ca0..ed126a845bf759d31ba1c1681024daf48d3db86c 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.h (gpgme_set_protocol): New prototype.
+
 2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine-gpgsm.c (_gpgme_gpgsm_op_decrypt): New function.

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 5ef5aaa38fac0dc2580a019cfd13a97790ae7000..7a0f657dd21090bc5893e643346d9394b55ff8dd 100644 (file)
--- 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 0b0e249d5c5be1158e4fb0014de5a32482695a98..88180c305b61f5edff9079c82cedc1d82b4ad36a 100644 (file)
--- a/gpgmeplug/ChangeLog
+++ b/gpgmeplug/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * gpgmeplug.c: Include config.h only if [HAVE_CONFIG_H].  Do not

diff --git a/gpgmeplug/Makefile.am b/gpgmeplug/Makefile.am
index 81db78470a0339c94ddd0c5d7744edb580e3dcb7..d4c51af39dd1236527abe78e3327e2010b70e693 100644 (file)
--- 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 eac049e6c6c59f9407b19669021c2079a454fc94..05d14385d88fe81d02d5e30409443a989aa8a493 100644 (file)
--- 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 (file)
index 0000000..f618267
--- /dev/null
+++ b/gpgmeplug/gpgsmplug.c
@@ -0,0 +1,2 @@
+#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_CMS
+#include "gpgmeplug.c"