From a311c98821c648c55db9a37353101c30519a2ef5 Mon Sep 17 00:00:00 2001 From: Karl-Heinz Zimmer Date: Sun, 25 Nov 2001 03:37:13 +0000 Subject: [PATCH] adjusted 'encryptMessage' parameters: now also the addressee is given --- trunk/gpgmeplug/cryptplug.h | 8 +++++--- trunk/gpgmeplug/gpgmeplug.c | 33 ++++++++++++--------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/trunk/gpgmeplug/cryptplug.h b/trunk/gpgmeplug/cryptplug.h index 73176fa..e809fca 100644 --- a/trunk/gpgmeplug/cryptplug.h +++ b/trunk/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/trunk/gpgmeplug/gpgmeplug.c b/trunk/gpgmeplug/gpgmeplug.c index b2e61bb..03e1a92 100644 --- a/trunk/gpgmeplug/gpgmeplug.c +++ b/trunk/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, -- 2.26.2