interface change: signMessage() and encryptMessage() now return an additional 'cipher...

diff --git a/gpgmeplug/cryptplug.h b/gpgmeplug/cryptplug.h
index e3aea6ca1b07cd4cfcdc37f48a75d2ef437538b4..c390b6e6968062476e92085e90fa4123fc87e532 100644 (file)
--- a/gpgmeplug/cryptplug.h
+++ b/gpgmeplug/cryptplug.h
@@ -1386,7 +1386,12 @@ struct StructuringInfo {
 /*! \ingroup groupSignAct
    \brief Signs a message \c cleartext and returns
           in \c *ciphertext the signature data bloc that
-          is to be added to the message.
+          is to be added to the message. The length returned
+          in \c *cipherLen tells you the size (==amount of bytes)
+          of the ciphertext, if the structuring information
+          would return with contentTEncCode set to "base64"
+          the ciphertext might contain a char 0x00
+          and has to be converted into base64 before sending.
 
    The signature role is specified by \c certificate.
    If \c certificate is \c NULL, the default certificate is used.
@@ -1416,6 +1421,7 @@ struct StructuringInfo {
 */
 bool signMessage( const char*  cleartext,
                   const char** ciphertext,
+                  const size_t* cipherLen,
                   const char*  certificate,
                   struct StructuringInfo* structuring );
 
@@ -1477,6 +1483,12 @@ bool findCertificates( const char* addressee, char** certificates );
           \c cleartext according to the \c addressee and
           the current settings (algorithm, etc.) and
           returns the encoded data bloc in \c *ciphertext.
+          The length returned in \c *cipherLen tells you the
+          size (==amount of bytes) of the ciphertext, if the
+          structuring information would return with
+          contentTEncCode set to "base64" the ciphertext
+          might contain a char 0x00 and has to be converted
+          into base64 before sending.
 
    If the message could be encrypted, the function returns
           \c true, otherwise
@@ -1501,6 +1513,7 @@ bool findCertificates( const char* addressee, char** certificates );
 */
 bool encryptMessage( const char*  cleartext,
                      const char** ciphertext,
+                     const size_t* cipherLen,
                      const char*  addressee,
                      struct StructuringInfo* structuring );
 

diff --git a/gpgmeplug/gpgme-openpgp.c b/gpgmeplug/gpgme-openpgp.c
index dce22bea90862c6caef69390515e20347a276672..042a11dc9f39069b7b8aea713fe24d703cc79ede 100644 (file)
--- a/gpgmeplug/gpgme-openpgp.c
+++ b/gpgmeplug/gpgme-openpgp.c
@@ -16,6 +16,7 @@
 #define GPGMEPLUG_SIGN_FLAT_PREFIX       ""
 #define GPGMEPLUG_SIGN_FLAT_SEPARATOR    ""
 #define GPGMEPLUG_SIGN_FLAT_POSTFIX      ""
+#define __GPGMEPLUG_SIGNATURE_CODE_IS_BINARY true
 
 #define GPGMEPLUG_ENC_INCLUDE_CLEARTEXT  false
 #define GPGMEPLUG_ENC_MAKE_MIME_OBJECT   true
@@ -33,5 +34,6 @@
 #define GPGMEPLUG_ENC_FLAT_PREFIX        ""
 #define GPGMEPLUG_ENC_FLAT_SEPARATOR     ""
 #define GPGMEPLUG_ENC_FLAT_POSTFIX       ""
+#define __GPGMEPLUG_ENCRYPTED_CODE_IS_BINARY false
 
 #include "gpgmeplug.c"

diff --git a/gpgmeplug/gpgme-smime.c b/gpgmeplug/gpgme-smime.c
index 088c8d535ef79e35dde7e1ed19c56031d2d61fd3..70fff085eb689ed3539cdea86a61715c3cf40f92 100644 (file)
--- a/gpgmeplug/gpgme-smime.c
+++ b/gpgmeplug/gpgme-smime.c
@@ -16,6 +16,7 @@
 #define GPGMEPLUG_SIGN_FLAT_PREFIX       ""
 #define GPGMEPLUG_SIGN_FLAT_SEPARATOR    ""
 #define GPGMEPLUG_SIGN_FLAT_POSTFIX      ""
+#define __GPGMEPLUG_SIGNATURE_CODE_IS_BINARY true
 
 #define GPGMEPLUG_ENC_INCLUDE_CLEARTEXT  false
 #define GPGMEPLUG_ENC_MAKE_MIME_OBJECT   true
@@ -33,5 +34,6 @@
 #define GPGMEPLUG_ENC_FLAT_PREFIX        ""
 #define GPGMEPLUG_ENC_FLAT_SEPARATOR     ""
 #define GPGMEPLUG_ENC_FLAT_POSTFIX       ""
+#define __GPGMEPLUG_ENCRYPTED_CODE_IS_BINARY true
 
 #include "gpgmeplug.c"

diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 5b856e8c38801c774f58f9f76e034c9aef0307c2..333ddf8199f6ea88e8347be4dc92d741a29060da 100644 (file)
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -79,6 +79,7 @@
 #define GPGMEPLUG_SIGN_FLAT_PREFIX       ""
 #define GPGMEPLUG_SIGN_FLAT_SEPARATOR    ""
 #define GPGMEPLUG_SIGN_FLAT_POSTFIX      ""
+#define __GPGMEPLUG_SIGNATURE_CODE_IS_BINARY false
 #endif
 // definitions for encoding
 #ifndef GPGMEPLUG_ENC_MAKE_MIME_OBJECT
@@ -98,6 +99,7 @@
 #define GPGMEPLUG_ENC_FLAT_PREFIX        ""
 #define GPGMEPLUG_ENC_FLAT_SEPARATOR     ""
 #define GPGMEPLUG_ENC_FLAT_POSTFIX       ""
+#define __GPGMEPLUG_ENCRYPTED_CODE_IS_BINARY false
 #endif
 // Note: The following specification will result in
 //       function encryptAndSignMessage() producing
@@ -860,15 +862,15 @@ void storeNewCharPtr( char** dest, const char* src )
 
 bool signMessage( const char*  cleartext,
                   const char** ciphertext,
+                  const size_t* cipherLen,
                   const char*  certificate,
                   struct StructuringInfo* structuring )
 {
   GpgmeCtx ctx;
   GpgmeError err;
   GpgmeData data,  sig;
-  size_t rSLen = 0;
-  char*  rSig  = 0;
-  bool   bOk   = false;
+  char* rSig  = 0;
+  bool  bOk   = false;
   int sendCerts = 1;
 
   init_StructuringInfo( structuring );
@@ -879,8 +881,8 @@ bool signMessage( const char*  cleartext,
   err = gpgme_new (&ctx);
   gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
 
-  gpgme_set_armor (ctx, 1);
-  gpgme_set_textmode (ctx, 1);
+  gpgme_set_armor (ctx, __GPGMEPLUG_SIGNATURE_CODE_IS_BINARY ? 0 : 1);
+//  gpgme_set_textmode (ctx, 1);
 
   switch ( config.sendCertificates ) {
     case SendCert_undef:
@@ -912,16 +914,20 @@ bool signMessage( const char*  cleartext,
   err = gpgme_op_sign (ctx, data, sig, GPGME_SIG_MODE_DETACH );
 
   if (!err) {
-    rSig  = gpgme_data_release_and_get_mem( sig,  &rSLen );
-    *ciphertext = malloc( rSLen + 1 );
-    if( *ciphertext ) {
-      if( rSLen ) {
-        bOk = true;
-        strncpy((char*)*ciphertext, rSig, rSLen );
+    if( __GPGMEPLUG_SIGNATURE_CODE_IS_BINARY )
+      *ciphertext = gpgme_data_release_and_get_mem( sig, (size_t*)cipherLen );
+    else {
+      rSig = gpgme_data_release_and_get_mem( sig, (size_t*)cipherLen );
+      *ciphertext = malloc( *cipherLen + 1 );
+      if( *ciphertext ) {
+        if( *cipherLen ) {
+          bOk = true;
+          strncpy((char*)*ciphertext, rSig, *cipherLen );
+        }
+        ((char*)(*ciphertext))[*cipherLen] = '\0';
       }
-      ((char*)(*ciphertext))[rSLen] = '\0';
+      free( rSig );
     }
-    free( rSig );
   }
   else {
     gpgme_data_release( sig );
@@ -1238,6 +1244,7 @@ bool findCertificates( const char* addressee, char** certificates )
 
 bool encryptMessage( const char*  cleartext,
                      const char** ciphertext,
+                     const size_t* cipherLen,
                      const char*  certificate,
                      struct StructuringInfo* structuring )
 {
@@ -1245,7 +1252,6 @@ bool encryptMessage( const char*  cleartext,
   GpgmeError err;
   GpgmeData gCiphertext, gPlaintext;
   GpgmeRecipients rset;
-  size_t rCLen = 0;
   char*  rCiph = 0;
   bool   bOk   = false;
 
@@ -1254,8 +1260,8 @@ bool encryptMessage( const char*  cleartext,
   gpgme_new (&ctx);
   gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
 
-  gpgme_set_armor (ctx, 1);
-  gpgme_set_textmode (ctx, 1);
+  gpgme_set_armor (ctx, __GPGMEPLUG_ENCRYPTED_CODE_IS_BINARY ? 0 : 1);
+//  gpgme_set_textmode (ctx, 1);
 
   gpgme_data_new_from_mem (&gPlaintext, cleartext,
                             1+strlen( cleartext ), 1 );
@@ -1308,16 +1314,20 @@ bool encryptMessage( const char*  cleartext,
   gpgme_data_release (gPlaintext);
 
   if( !err ) {
-    rCiph = gpgme_data_release_and_get_mem( gCiphertext,  &rCLen );
-    *ciphertext = malloc( rCLen + 1 );
-    if( *ciphertext ) {
-      if( rCLen ) {
-        bOk = true;
-        strncpy((char*)*ciphertext, rCiph, rCLen );
+    if( __GPGMEPLUG_ENCRYPTED_CODE_IS_BINARY )
+      *ciphertext = gpgme_data_release_and_get_mem( gCiphertext, (size_t*)cipherLen );
+    else {
+      rCiph = gpgme_data_release_and_get_mem( gCiphertext, (size_t*)cipherLen );
+      *ciphertext = malloc( *cipherLen + 1 );
+      if( *ciphertext ) {
+        if( *cipherLen ) {
+          bOk = true;
+          strncpy((char*)*ciphertext, rCiph, *cipherLen );
+        }
+        ((char*)(*ciphertext))[*cipherLen] = 0;
       }
-      ((char*)(*ciphertext))[rCLen] = 0;
+      free( rCiph );
     }
-    free( rCiph );
   }
   else {
     gpgme_data_release ( gCiphertext );