[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/lib
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-02-19 22:04:31
Message-ID: 20040219220431.E773A9192 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Split exportJob() into {public,secret}KeyExportJob(). for the latter, we will need to \
run gpg(sm) ourselves.


  M +9 -1      cryptplugwrapper.cpp   1.7
  M +4 -1      cryptplugwrapper.h   1.5
  M +2 -1      kleo/cryptobackend.h   1.6


--- kdepim/certmanager/lib/kleo/cryptobackend.h  #1.5:1.6
@@ -68,5 +68,6 @@ namespace Kleo {
     virtual KeyGenerationJob  * keyGenerationJob() const = 0;
     virtual ImportJob         * importJob() const = 0;
-    virtual ExportJob         * exportJob( bool armor=false ) const = 0;
+    virtual ExportJob         * publicKeyExportJob( bool armor=false ) const = 0;
+    virtual ExportJob         * secretKeyExportJob( bool armor=false ) const = 0;
     virtual DownloadJob       * downloadJob( bool armor=false ) const = 0;
     virtual DeleteJob         * deleteJob() const = 0;

--- kdepim/certmanager/lib/cryptplugwrapper.h  #1.4:1.5
@@ -1539,6 +1539,8 @@ public:
     Kleo::VerifyOpaqueJob * verifyOpaqueJob( bool textmode=false ) const;
     Kleo::KeyGenerationJob * keyGenerationJob() const;
+
     Kleo::ImportJob * importJob() const;
-    Kleo::ExportJob * exportJob( bool armor=false ) const;
+    Kleo::ExportJob * publicKeyExportJob( bool armor=false ) const;
+    Kleo::ExportJob * secretKeyExportJob( bool armor=false ) const;
     Kleo::DownloadJob * downloadJob( bool armor=false ) const;
     Kleo::DeleteJob * deleteJob() const;

--- kdepim/certmanager/lib/cryptplugwrapper.cpp  #1.6:1.7
@@ -1482,5 +1482,5 @@ Kleo::ImportJob * CryptPlugWrapper::impo
 }
 
-Kleo::ExportJob * CryptPlugWrapper::exportJob( bool armor ) const {
+Kleo::ExportJob * CryptPlugWrapper::publicKeyExportJob( bool armor ) const {
   if ( !_cp )
     return 0;
@@ -1494,4 +1494,12 @@ Kleo::ExportJob * CryptPlugWrapper::expo
 }
 
+Kleo::ExportJob * CryptPlugWrapper::secretKeyExportJob( bool armor ) const {
+  if ( !_cp || _cp->mProtocol != GpgME::Context::CMS ) // fixme: add support for \
gpg, too +    return 0;
+
+  // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
+  return 0;//new Kleo::GpgSMSecretKeyExportJob( armor );
+}
+
 Kleo::DownloadJob * CryptPlugWrapper::downloadJob( bool armor ) const {
   if ( !_cp )


[prev in list] [next in list] [prev in thread] [next in thread]