From af5bfdd49ef57839940c31966d46fc8578792711 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 15 Jan 2002 19:53:55 +0000 Subject: 2002-01-15 Marcus Brinkmann * gpgmeplug.c: Renamed to ... * gpgme-openpgp.c: ... this. New file. * gpgsmplug.c: Renamed to ... * gpgme-smime.c: ... this. new file. * Makefile.am: Rewritten to use libtool's module functionality. --- gpgmeplug/ChangeLog | 8 ++++++++ gpgmeplug/Makefile.am | 18 +++++++----------- gpgmeplug/gpgme-smime.c | 37 +++++++++++++++++++++++++++++++++++++ gpgmeplug/gpgsmplug.c | 37 ------------------------------------- 4 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 gpgmeplug/gpgme-smime.c delete mode 100644 gpgmeplug/gpgsmplug.c diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog index 02ab8e4d..ae94e6bd 100644 --- a/gpgmeplug/ChangeLog +++ b/gpgmeplug/ChangeLog @@ -1,3 +1,11 @@ +2002-01-15 Marcus Brinkmann + + * gpgmeplug.c: Renamed to ... + * gpgme-openpgp.c: ... this. New file. + * gpgsmplug.c: Renamed to ... + * gpgme-smime.c: ... this. new file. + * Makefile.am: Rewritten to use libtool's module functionality. + 2001-12-19 Marcus Brinkmann * Makefile.am (lib_LTLIBRARIES): Rename to ... diff --git a/gpgmeplug/Makefile.am b/gpgmeplug/Makefile.am index a55cc24b..3bad5bb8 100644 --- a/gpgmeplug/Makefile.am +++ b/gpgmeplug/Makefile.am @@ -23,18 +23,14 @@ # ## Process this file with automake to produce Makefile.in - INCLUDES = -I$(top_srcdir)/gpgme -libgpgmeplug_la_LIBADD = ../gpgme/libgpgme.la -libgpgsmplug_la_LIBADD = ../gpgme/libgpgme.la - -BUILT_SOURCES = - -noinst_LTLIBRARIES = libgpgmeplug.la libgpgsmplug.la +pkglib_LTLIBRARIES = gpgme-openpgp.la gpgme-smime.la -libgpgmeplug_la_LDFLAGS = -shared -Wl,-soname,libgpgmeplug.so -libgpgsmplug_la_LDFLAGS = -shared -Wl,-soname,libgpgsmplug.so +gpgme_openpgp_la_SOURCES = cryptplug.h gpgmeplug.c +gpgme_openpgp_la_LIBADD = ../gpgme/libgpgme.la +gpgme_openpgp_la_LDFLAGS = -module -avoid-version -libgpgmeplug_la_SOURCES = cryptplug.h gpgmeplug.c -libgpgsmplug_la_SOURCES = cryptplug.h gpgsmplug.c +gpgme_smime_la_SOURCES = cryptplug.h gpgme-smime.c +gpgme_smime_la_LIBADD = ../gpgme/libgpgme.la +gpgme_smime_la_LDFLAGS = -module -avoid-version diff --git a/gpgmeplug/gpgme-smime.c b/gpgmeplug/gpgme-smime.c new file mode 100644 index 00000000..395b9a2d --- /dev/null +++ b/gpgmeplug/gpgme-smime.c @@ -0,0 +1,37 @@ +#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_CMS + +#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/pkcs7-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; name=\"smime.p7s\"" +#define GPGMEPLUG_SIGN_CDISP_CODE "attachment; filename=\"smime.p7s\"" +#define GPGMEPLUG_SIGN_CTENC_CODE "base64" +#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 false +#define GPGMEPLUG_ENC_CTYPE_MAIN "application/pkcs7-mime; smime-type=enveloped-data; name=\"smime.p7m\"" +#define GPGMEPLUG_ENC_CDISP_MAIN "attachment; filename=\"smime.p7m\"" +#define GPGMEPLUG_ENC_CTENC_MAIN "base64" +#define GPGMEPLUG_ENC_CTYPE_VERSION "" +#define GPGMEPLUG_ENC_CDISP_VERSION "" +#define GPGMEPLUG_ENC_CTENC_VERSION "" +#define GPGMEPLUG_ENC_BTEXT_VERSION "" +#define GPGMEPLUG_ENC_CTYPE_CODE "" +#define GPGMEPLUG_ENC_CDISP_CODE "" +#define GPGMEPLUG_ENC_CTENC_CODE "" +#define GPGMEPLUG_ENC_FLAT_PREFIX "" +#define GPGMEPLUG_ENC_FLAT_SEPARATOR "" +#define GPGMEPLUG_ENC_FLAT_POSTFIX "" + +#include "gpgmeplug.c" diff --git a/gpgmeplug/gpgsmplug.c b/gpgmeplug/gpgsmplug.c deleted file mode 100644 index 395b9a2d..00000000 --- a/gpgmeplug/gpgsmplug.c +++ /dev/null @@ -1,37 +0,0 @@ -#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_CMS - -#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/pkcs7-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; name=\"smime.p7s\"" -#define GPGMEPLUG_SIGN_CDISP_CODE "attachment; filename=\"smime.p7s\"" -#define GPGMEPLUG_SIGN_CTENC_CODE "base64" -#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 false -#define GPGMEPLUG_ENC_CTYPE_MAIN "application/pkcs7-mime; smime-type=enveloped-data; name=\"smime.p7m\"" -#define GPGMEPLUG_ENC_CDISP_MAIN "attachment; filename=\"smime.p7m\"" -#define GPGMEPLUG_ENC_CTENC_MAIN "base64" -#define GPGMEPLUG_ENC_CTYPE_VERSION "" -#define GPGMEPLUG_ENC_CDISP_VERSION "" -#define GPGMEPLUG_ENC_CTENC_VERSION "" -#define GPGMEPLUG_ENC_BTEXT_VERSION "" -#define GPGMEPLUG_ENC_CTYPE_CODE "" -#define GPGMEPLUG_ENC_CDISP_CODE "" -#define GPGMEPLUG_ENC_CTENC_CODE "" -#define GPGMEPLUG_ENC_FLAT_PREFIX "" -#define GPGMEPLUG_ENC_FLAT_SEPARATOR "" -#define GPGMEPLUG_ENC_FLAT_POSTFIX "" - -#include "gpgmeplug.c" -- cgit v1.2.3