aboutsummaryrefslogtreecommitdiffstats
path: root/gpgmeplug
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2001-11-22 18:48:53 +0000
committerMarcus Brinkmann <[email protected]>2001-11-22 18:48:53 +0000
commit8993173dfbe433113380783ca286aa825d0bbf0f (patch)
tree4314cb39a8bd6cdae5acf56410073ffc4dd6bc2c /gpgmeplug
parentremoved stupid C bug (malloc of strlen(..) instead of 1+strlen) (diff)
downloadgpgme-8993173dfbe433113380783ca286aa825d0bbf0f.tar.gz
gpgme-8993173dfbe433113380783ca286aa825d0bbf0f.zip
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.
Diffstat (limited to '')
-rw-r--r--gpgmeplug/ChangeLog13
-rw-r--r--gpgmeplug/Makefile.am10
-rw-r--r--gpgmeplug/gpgmeplug.c4
-rw-r--r--gpgmeplug/gpgsmplug.c2
4 files changed, 27 insertions, 2 deletions
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"