adjusted 'encryptMessage' parameters: now also the addressee is given

diff --git a/gpgmeplug/cryptplug.h b/gpgmeplug/cryptplug.h
index 73176fab1ae395acd72f6ff10c3a5c3e2ce6a06c..e809fca1a1414cad5465ad485838ce3813a3bd22 100644 (file)
--- a/gpgmeplug/cryptplug.h
+++ b/gpgmeplug/cryptplug.h
@@ -833,9 +833,9 @@ void appendDirectoryServer( const char* servername, int port,
 /*! \ingroup groupConfigDir
 */
 struct DirectoryServer {
-    const char* servername;
+    char* servername;
     int port;
-    const char* description;
+    char* description;
 };
 
 
@@ -952,7 +952,9 @@ bool storeCertificatesFromMessage( const char* ciphertext );
           \c true, otherwise
           \c false.
 */
-bool encryptMessage( const char* cleartext, const char** ciphertext );
+bool encryptMessage( const char*  cleartext,
+                     const char** ciphertext,
+                     const char*  addressee );
 
 /*! \ingroup groupCryptAct
    \brief Combines the functionality of

diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index b2e61bb0c324bb23c432cefdbbab6ff2499e3ad9..03e1a92fa9b1eb844d320dd35fb5521218f16113 100644 (file)
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -755,34 +755,21 @@ bool signMessage( const char*  cleartext,
   gpgme_data_new ( &sig );
   gpgme_op_sign (ctx, data, sig, GPGME_SIG_MODE_DETACH );
 
-  rData = gpgme_data_release_and_get_mem( data, &rDLen );
   rSig  = gpgme_data_release_and_get_mem( sig,  &rSLen );
+  gpgme_release( data );
 
-  *ciphertext = malloc( rDLen + rSLen + 1000 );
+  *ciphertext = malloc( rSLen + 1 );
   if( *ciphertext ) {
-/*
-    strcpy( (char*)*ciphertext,
-            "Content-Type: multipart/signed;\r\n"
-            "              protocol=\"application/pgp-signature\";\r\n"
-            "              boundary=\"42=.42=.42=.42\"\r\n"
-            "\r\n--42=.42=.42=.42\r\n\r\n" );
-*/
-/*
-    strcpy( (char*)*ciphertext, "--42=.42=.42=.42\r\n"
-            "Content-Type: text/plain; charset=\"iso-8859-1\"\r\n"
-            "Content-Transfer-Encoding: 7bit\r\n\r\n" );
-    strncat((char*)*ciphertext, rData, rDLen );
-    strcat( (char*)*ciphertext,
-            "\r\n\r\n--42=.42=.42=.42\r\n"
-            "Content-Type: application/pgp-signature\r\n\r\n" );
-*/
-    strncpy((char*)*ciphertext, rSig, rSLen );
+    if( rSLen ) {
+      bOk = true;
+      strncpy((char*)*ciphertext, rSig, rSLen );
+    }
     ((char*)(*ciphertext))[rSLen] = 0;
   }
 
   gpgme_release (ctx);
 
-  return true;
+  return bOk;
 }
 
 bool checkMessageSignature( const char* ciphertext, const char**
@@ -793,7 +780,11 @@ bool storeCertificatesFromMessage(
 
 
 bool encryptMessage( const char* cleartext,
-                     const char** ciphertext ){ return true; }
+                     const char** ciphertext,
+                     const char* addressee )
+{
+  return true;
+}
 
 bool encryptAndSignMessage( const char* cleartext,
           const char** ciphertext, const char* certificate,