From 44023ddfb2f536732c28f9abfe5e20fe9bf092b0 Mon Sep 17 00:00:00 2001
From: Karl-Heinz Zimmer <khz@kde.org>
Date: Tue, 18 Dec 2001 21:11:03 +0000
Subject: [PATCH] corrected specification of Aegypten test key in encrypt()
 function

---
 gpgmeplug/gpgmeplug.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 73a47040..35c723c0 100644
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -928,20 +928,24 @@ bool encryptMessage( const char* cleartext,
   gpgme_recipients_new (&rset);
 
 
-if( GPGMEPLUG_PROTOCOL == GPGME_PROTOCOL_CMS )
-{
-  gpgme_recipients_add_name (rset, "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE");
-fputs( "GPGSMPLUG encryptMessage() using test key of Aegypten Project\n", stderr );
-}
-else
-{
-  gpgme_recipients_add_name (rset, addressee);
-fprintf( stderr, "GPGMEPLUG encryptMessage() using addressee %s\n", addressee );
-}
-fflush( stderr );
+  if( GPGMEPLUG_PROTOCOL == GPGME_PROTOCOL_CMS )
+  {
+    gpgme_recipients_add_name_with_validity (rset, 
+      "/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE",
+      GPGME_VALIDITY_FULL );
+    fputs( "\nGPGSMPLUG encryptMessage() using test key of Aegypten Project\n", stderr );
+  }
+  else
+  {
+    gpgme_recipients_add_name (rset, addressee);
+    fprintf( stderr, "\nGPGMEPLUG encryptMessage() using addressee %s\n", addressee );
+  }
 
 
   err = gpgme_op_encrypt (ctx, rset, gPlaintext, gCiphertext );
+  if( err )
+    fprintf( stderr, "gpgme_op_encrypt() returned this error code:  %i\n\n", err );
+
   gpgme_recipients_release (rset);
   gpgme_data_release (gPlaintext);
 
@@ -967,6 +971,8 @@ fflush( stderr );
 
   gpgme_release (ctx);
 
+  fflush( stderr );
+
   return bOk;
 }