Have additional secretOnly parameter at the findCertificates() function to allow...

diff --git a/trunk/gpgmeplug/cryptplug.h b/trunk/gpgmeplug/cryptplug.h
index 03b1715b996b1e9d090283d1aef83ad240529c3e..95b9433c7600959c06b3a4f8b6159654c7ffb222 100644 (file)
--- a/trunk/gpgmeplug/cryptplug.h
+++ b/trunk/gpgmeplug/cryptplug.h
@@ -1577,8 +1577,9 @@ bool storeCertificatesFromMessage( const char* ciphertext );
 
    NOTE: The \c certificate parameter must point to an allready allocated
    block of memory which is large enough to hold the complete list.
+   If secretOnly is true, only secret keys are returned.
 */
-bool findCertificates( const char* addressee, char** certificates );
+bool findCertificates( const char* addressee, char** certificates, bool secretOnly );
 
 /*! \ingroup groupCryptAct
    \brief Encrypts an email message in

diff --git a/trunk/gpgmeplug/gpgmeplug.c b/trunk/gpgmeplug/gpgmeplug.c
index 02a6222f6a6df4ef0e7831156a444f142f002ea7..d94ab10be92ff7fe16d3d44a969f56192ddc143b 100644 (file)
--- a/trunk/gpgmeplug/gpgmeplug.c
+++ b/trunk/gpgmeplug/gpgmeplug.c
@@ -1512,7 +1512,7 @@ bool encryptMessage( const char*  cleartext,
   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" );
+      "/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=DÃ?sseldorf,C=DE" );
 
     fputs( "\nGPGSMPLUG encryptMessage() using test key of Aegypten Project\n", stderr );
   }
@@ -2300,8 +2300,9 @@ void endListCertificates( struct CertIterator* it )
   '\1' separated list.
   NOTE: The certificate parameter must point to an allready allocated
   block of memory which is large enough to hold the complete list.
+  If secretOnly is true, only secret keys are returned.
 */
-bool findCertificates( const char* addressee, char** certificates )
+bool findCertificates( const char* addressee, char** certificates, bool secretOnly )
 {
   GpgmeCtx ctx;
   GpgmeError err;
@@ -2317,7 +2318,7 @@ bool findCertificates( const char* addressee, char** certificates )
   gpgme_new (&ctx);
   gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
 
-  err = gpgme_op_keylist_start(ctx, addressee, 0);
+  err = gpgme_op_keylist_start(ctx, addressee, secretOnly ? 1 : 0);
   while( GPGME_No_Error == err ) {
     err = gpgme_op_keylist_next(ctx, &rKey);
     if( GPGME_No_Error == err ) {