Finish rename from prior commit

1 files changed, 0 insertions, 763 deletions

diff --git a/libkdenetwork/gpgmepp/context.cpp b/libkdenetwork/gpgmepp/context.cpp
deleted file mode 100644
index 547adde95..000000000
--- a/libkdenetwork/gpgmepp/context.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-/* context.cpp - wraps a gpgme key context
-   Copyright (C) 2003 Klar�lvdalens Datakonsult AB
-
-   This file is part of GPGME++.
-
-   GPGME++ is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   GPGME++ is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GPGME++; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gpgmepp/context.h>
-#include <gpgmepp/eventloopinteractor.h>
-#include <gpgmepp/trustitem.h>
-#include <gpgmepp/keylistresult.h>
-#include <gpgmepp/keygenerationresult.h>
-#include <gpgmepp/importresult.h>
-#include <gpgmepp/decryptionresult.h>
-#include <gpgmepp/verificationresult.h>
-#include <gpgmepp/signingresult.h>
-#include <gpgmepp/encryptionresult.h>
-#include <gpgmepp/engineinfo.h>
-
-#include "callbacks.h"
-#include "data_p.h"
-#include "context_p.h"
-#include "util.h"
-
-#include <gpgme.h>
-#include <gpg-error.h>
-
-//#include <string>
-//using std::string;
-#include <istream>
-#ifndef NDEBUG
-#include <iostream>
-using std::cerr;
-using std::endl;
-#endif
-
-#include <cassert>
-
-namespace GpgME {
-
-  void initializeLibrary() {
-    gpgme_check_version( 0 );
-  }
-
-  const char * Error::source() const {
-    return gpgme_strsource( (gpgme_error_t)mErr );
-  }
-
-  const char * Error::asString() const {
-    return gpgme_strerror( (gpgme_error_t)mErr );
-  }
-
-  int Error::code() const {
-    return gpgme_err_code( mErr );
-  }
-
-  int Error::sourceID() const {
-    return gpgme_err_source( mErr );
-  }
-
-  bool Error::isCanceled() const {
-    return code() == GPG_ERR_CANCELED;
-  }
-
-  std::ostream & operator<<( std::ostream & os, Error err ) {
-      return os << "GpgME::Error(" << err.operator int() << " (" << err.asString() << "))";
-  }
-
-  Context::Context( gpgme_ctx_t ctx ) {
-    d = new Private( ctx );
-  }
-
-  Context::~Context() {
-    delete d; d = 0;
-  }
-
-  Context * Context::createForProtocol( Protocol proto ) {
-    gpgme_ctx_t ctx = 0;
-    if ( gpgme_new ( &ctx ) != 0 )
-      return 0;
-
-    switch ( proto ) {
-    case OpenPGP:
-      if ( gpgme_set_protocol( ctx, GPGME_PROTOCOL_OpenPGP ) != 0 ) {
-	gpgme_release( ctx );
-	return 0;
-      }
-      break;
-    case CMS:
-      if ( gpgme_set_protocol( ctx, GPGME_PROTOCOL_CMS ) != 0 ) {
-	gpgme_release( ctx );
-	return 0;
-      }
-      break;
-    default:
-      return 0;
-    }
-
-    return new Context( ctx );
-  }
-
-  //
-  //
-  // Context attributes:
-  //
-  //
-
-  Context::Protocol Context::protocol() const {
-    gpgme_protocol_t p = gpgme_get_protocol( d->ctx );
-    switch ( p ) {
-    case GPGME_PROTOCOL_OpenPGP: return OpenPGP;
-    case GPGME_PROTOCOL_CMS:     return CMS;
-    default:                     return Unknown;
-    }
-  }
-
-
-  void Context::setArmor( bool useArmor ) {
-    gpgme_set_armor( d->ctx, int( useArmor ) );
-  }
-  bool Context::armor() const {
-    return gpgme_get_armor( d->ctx );
-  }
-
-  void Context::setTextMode( bool useTextMode ) {
-    gpgme_set_textmode( d->ctx, int( useTextMode ) );
-  }
-  bool Context::textMode() const {
-    return gpgme_get_textmode( d->ctx );
-  }
-
-  void Context::setIncludeCertificates( int which ) {
-    if ( which == DefaultCertificates ) {
-#ifdef HAVE_GPGME_INCLUDE_CERTS_DEFAULT
-      which = GPGME_INCLUDE_CERTS_DEFAULT;
-#else
-      which = 1;
-#endif
-    }
-    gpgme_set_include_certs( d->ctx, which );
-  }
-
-  int Context::includeCertificates() const {
-    return gpgme_get_include_certs( d->ctx );
-  }
-
-  void Context::setKeyListMode( unsigned int mode ) {
-    gpgme_set_keylist_mode( d->ctx, add_to_gpgme_keylist_mode_t( 0, mode ) );
-  }
-
-  void Context::addKeyListMode( unsigned int mode ) {
-    const unsigned int cur = gpgme_get_keylist_mode( d->ctx );
-    gpgme_set_keylist_mode( d->ctx, add_to_gpgme_keylist_mode_t( cur, mode ) );
-  }
-
-
-  unsigned int Context::keyListMode() const {
-    return convert_from_gpgme_keylist_mode_t( gpgme_get_keylist_mode( d->ctx ) );
-  }
-
-  void Context::setProgressProvider( ProgressProvider * provider ) {
-    gpgme_set_progress_cb( d->ctx, provider ? &progress_callback : 0, provider );
-  }
-  ProgressProvider * Context::progressProvider() const {
-    void * pp = 0;
-    gpgme_progress_cb_t pcb = &progress_callback;
-    gpgme_get_progress_cb( d->ctx, &pcb, &pp );
-    return static_cast<ProgressProvider*>( pp );
-  }
-
-  void Context::setPassphraseProvider( PassphraseProvider * provider ) {
-    gpgme_set_passphrase_cb( d->ctx, provider ? &passphrase_callback : 0, provider );
-  }
-
-  PassphraseProvider * Context::passphraseProvider() const {
-    void * pp = 0;
-    gpgme_passphrase_cb_t pcb = &passphrase_callback;
-    gpgme_get_passphrase_cb( d->ctx, &pcb, &pp );
-    return static_cast<PassphraseProvider*>( pp );
-  }
-
-  void Context::setManagedByEventLoopInteractor( bool manage ) {
-    if ( !EventLoopInteractor::instance() ) {
-#ifndef NDEBUG
-      cerr << "Context::setManagedByEventLoopInteractor(): "
-	      "You must create an instance of EventLoopInteractor "
-	      "before using anything that needs one." << endl;
-#endif
-      return;
-    }
-    if ( manage )
-      EventLoopInteractor::instance()->manage( this );
-    else
-      EventLoopInteractor::instance()->unmanage( this );
-  }
-  bool Context::managedByEventLoopInteractor() const {
-    return d->iocbs != 0;
-  }
-
-
-  void Context::installIOCallbacks( gpgme_io_cbs * iocbs ) {
-    if ( !iocbs ) {
-      uninstallIOCallbacks();
-      return;
-    }
-    gpgme_set_io_cbs( d->ctx, iocbs );
-    delete d->iocbs; d->iocbs = iocbs;
-  }
-
-  void Context::uninstallIOCallbacks() {
-    static gpgme_io_cbs noiocbs = { 0, 0, 0, 0, 0 };
-    // io.add == 0 means disable io callbacks:
-    gpgme_set_io_cbs( d->ctx, &noiocbs );
-    delete d->iocbs; d->iocbs = 0;
-  }
-
-  Error Context::setLocale( int cat, const char * val ) {
-    return d->lasterr = gpgme_set_locale( d->ctx, cat, val );
-  }
-
-  //
-  //
-  // Key Management
-  //
-  //
-
-  Error Context::startKeyListing( const char * pattern, bool secretOnly ) {
-    d->lastop = Private::KeyList;
-    return d->lasterr = gpgme_op_keylist_start( d->ctx, pattern, int( secretOnly ) );
-  }
-
-  Error Context::startKeyListing( const char * patterns[], bool secretOnly ) {
-    d->lastop = Private::KeyList;
-    return d->lasterr = gpgme_op_keylist_ext_start( d->ctx, patterns, int( secretOnly ), 0 );
-  }
-
-  Key Context::nextKey( GpgME::Error & e ) {
-    d->lastop = Private::KeyList;
-    gpgme_key_t key;
-    e = d->lasterr = gpgme_op_keylist_next( d->ctx, &key );
-    return Key( key, false, keyListMode() );
-  }
-
-  KeyListResult Context::endKeyListing() {
-    d->lasterr = gpgme_op_keylist_end( d->ctx );
-    return keyListResult();
-  }
-
-  KeyListResult Context::keyListResult() const {
-    return KeyListResult( d->ctx, d->lasterr );
-  }
-
-  Key Context::key( const char * fingerprint, GpgME::Error & e , bool secret /*, bool forceUpdate*/ ) {
-    d->lastop = Private::KeyList;
-    gpgme_key_t key;
-    e = d->lasterr = gpgme_get_key( d->ctx, fingerprint, &key, int( secret )/*, int( forceUpdate )*/ );
-    return Key( key, false, keyListMode() );
-  }
-
-  KeyGenerationResult Context::generateKey( const char * parameters, Data & pubKey ) {
-    d->lastop = Private::KeyGen;
-    Data::Private * dp = pubKey.impl();
-    d->lasterr = gpgme_op_genkey( d->ctx, parameters, dp ? dp->data : 0, 0 );
-    return KeyGenerationResult( d->ctx, d->lasterr );
-  }
-
-  Error Context::startKeyGeneration( const char * parameters, Data & pubKey ) {
-    d->lastop = Private::KeyGen;
-    Data::Private * dp = pubKey.impl();
-    return d->lasterr = gpgme_op_genkey_start( d->ctx, parameters, dp ? dp->data : 0, 0 );
-  }
-
-  KeyGenerationResult Context::keyGenerationResult() const {
-    if ( d->lastop & Private::KeyGen )
-      return KeyGenerationResult( d->ctx, d->lasterr );
-    else
-      return KeyGenerationResult();
-  }
-
-  Error Context::exportPublicKeys( const char * pattern, Data & keyData ) {
-    d->lastop = Private::Export;
-    Data::Private * dp = keyData.impl();
-    return d->lasterr = gpgme_op_export( d->ctx, pattern, 0, dp ? dp->data : 0 );
-  }
-
-  Error Context::exportPublicKeys( const char * patterns[], Data & keyData ) {
-    d->lastop = Private::Export;
-    Data::Private * dp = keyData.impl();
-    return d->lasterr = gpgme_op_export_ext( d->ctx, patterns, 0, dp ? dp->data : 0 );
-  }
-
-  Error Context::startPublicKeyExport( const char * pattern, Data & keyData ) {
-    d->lastop = Private::Export;
-    Data::Private * dp = keyData.impl();
-    return d->lasterr = gpgme_op_export_start( d->ctx, pattern, 0, dp ? dp->data : 0 );
-  }
-
-  Error Context::startPublicKeyExport( const char * patterns[], Data & keyData ) {
-    d->lastop = Private::Export;
-    Data::Private * dp = keyData.impl();
-    return d->lasterr = gpgme_op_export_ext_start( d->ctx, patterns, 0, dp ? dp->data : 0 );
-  }
-
-
-  ImportResult Context::importKeys( const Data & data ) {
-    d->lastop = Private::Import;
-    Data::Private * dp = data.impl();
-    d->lasterr = gpgme_op_import( d->ctx, dp ? dp->data : 0 );
-    return ImportResult( d->ctx, d->lasterr );
-  }
-
-  Error Context::startKeyImport( const Data & data ) {
-    d->lastop = Private::Import;
-    Data::Private * dp = data.impl();
-    return d->lasterr = gpgme_op_import_start( d->ctx, dp ? dp->data : 0 );
-  }
-
-  ImportResult Context::importResult() const {
-    if ( d->lastop & Private::Import )
-      return ImportResult( d->ctx, d->lasterr );
-    else
-      return ImportResult();
-  }
-
-  Error Context::deleteKey( const Key & key, bool allowSecretKeyDeletion ) {
-    d->lastop = Private::Delete;
-    return d->lasterr = gpgme_op_delete( d->ctx, key.impl(), int( allowSecretKeyDeletion ) );
-  }
-
-  Error Context::startKeyDeletion( const Key & key, bool allowSecretKeyDeletion ) {
-    d->lastop = Private::Delete;
-    return d->lasterr = gpgme_op_delete_start( d->ctx, key.impl(), int( allowSecretKeyDeletion ) );
-  }
-
-  Error Context::startTrustItemListing( const char * pattern, int maxLevel ) {
-    d->lastop = Private::TrustList;
-    return d->lasterr = gpgme_op_trustlist_start( d->ctx, pattern, maxLevel );
-  }
-
-  TrustItem Context::nextTrustItem( Error & e ) {
-    gpgme_trust_item_t ti = 0;
-    e = d->lasterr = gpgme_op_trustlist_next( d->ctx, &ti );
-    return ti;
-  }
-
-  Error Context::endTrustItemListing() {
-    return d->lasterr = gpgme_op_trustlist_end( d->ctx );
-  }
-
-  DecryptionResult Context::decrypt( const Data & cipherText, Data & plainText ) {
-    d->lastop = Private::Decrypt;
-    Data::Private * cdp = cipherText.impl();
-    Data::Private * pdp = plainText.impl();
-    d->lasterr = gpgme_op_decrypt( d->ctx, cdp ? cdp->data : 0, pdp ? pdp->data : 0 );
-    return DecryptionResult( d->ctx, d->lasterr );
-  }
-
-  Error Context::startDecryption( const Data & cipherText, Data & plainText ) {
-    d->lastop = Private::Decrypt;
-    Data::Private * cdp = cipherText.impl();
-    Data::Private * pdp = plainText.impl();
-    return d->lasterr = gpgme_op_decrypt_start( d->ctx, cdp ? cdp->data : 0, pdp ? pdp->data : 0 );
-  }
-
-  DecryptionResult Context::decryptionResult() const {
-    if ( d->lastop & Private::Decrypt )
-      return DecryptionResult( d->ctx, d->lasterr );
-    else
-      return DecryptionResult();
-  }
-
-
-
-  VerificationResult Context::verifyDetachedSignature( const Data & signature, const Data & signedText ) {
-    d->lastop = Private::Verify;
-    Data::Private * sdp = signature.impl();
-    Data::Private * tdp = signedText.impl();
-    d->lasterr = gpgme_op_verify( d->ctx, sdp ? sdp->data : 0, tdp ? tdp->data : 0, 0 );
-    return VerificationResult( d->ctx, d->lasterr );
-  }
-
-  VerificationResult Context::verifyOpaqueSignature( const Data & signedData, Data & plainText ) {
-    d->lastop = Private::Verify;
-    Data::Private * sdp = signedData.impl();
-    Data::Private * pdp = plainText.impl();
-    d->lasterr = gpgme_op_verify( d->ctx, sdp ? sdp->data : 0, 0, pdp ? pdp->data : 0 );
-    return VerificationResult( d->ctx, d->lasterr );
-  }
-
-  Error Context::startDetachedSignatureVerification( const Data & signature, const Data & signedText ) {
-    d->lastop = Private::Verify;
-    Data::Private * sdp = signature.impl();
-    Data::Private * tdp = signedText.impl();
-    return d->lasterr = gpgme_op_verify_start( d->ctx, sdp ? sdp->data : 0, tdp ? tdp->data : 0, 0 );
-  }
-
-  Error Context::startOpaqueSignatureVerification( const Data & signedData, Data & plainText ) {
-    d->lastop = Private::Verify;
-    Data::Private * sdp = signedData.impl();
-    Data::Private * pdp = plainText.impl();
-    return d->lasterr = gpgme_op_verify_start( d->ctx, sdp ? sdp->data : 0, 0, pdp ? pdp->data : 0 );
-  }
-
-  VerificationResult Context::verificationResult() const {
-    if ( d->lastop & Private::Verify )
-      return VerificationResult( d->ctx, d->lasterr );
-    else
-      return VerificationResult();
-  }
-
-
-  std::pair<DecryptionResult,VerificationResult> Context::decryptAndVerify( const Data & cipherText, Data & plainText ) {
-    d->lastop = Private::DecryptAndVerify;
-    Data::Private * cdp = cipherText.impl();
-    Data::Private * pdp = plainText.impl();
-    d->lasterr = gpgme_op_decrypt_verify( d->ctx, cdp ? cdp->data : 0, pdp ? pdp->data : 0 );
-    return std::make_pair( DecryptionResult( d->ctx, d->lasterr ),
-			   VerificationResult( d->ctx, d->lasterr ) );
-  }
-
-  Error Context::startCombinedDecryptionAndVerification( const Data & cipherText, Data & plainText ) {
-    d->lastop = Private::DecryptAndVerify;
-    Data::Private * cdp = cipherText.impl();
-    Data::Private * pdp = plainText.impl();
-    return d->lasterr = gpgme_op_decrypt_verify_start( d->ctx, cdp ? cdp->data : 0, pdp ? pdp->data : 0 );
-  }
-
-#ifdef HAVE_GPGME_OP_GETAUDITLOG
-  unsigned int to_auditlog_flags( unsigned int flags ) {
-      unsigned int result = 0;
-      if ( flags & Context::HtmlAuditLog )
-          result |= GPGME_AUDITLOG_HTML;
-      if ( flags & Context::AuditLogWithHelp )
-          result |= GPGME_AUDITLOG_WITH_HELP;
-      return result;
-  }
-#endif // HAVE_GPGME_OP_GETAUDITLOG
-
-
-  Error Context::startGetAuditLog( Data & output, unsigned int flags ) {
-    d->lastop = Private::GetAuditLog;
-#ifdef HAVE_GPGME_OP_GETAUDITLOG
-    Data::Private * const odp = output.impl();
-    return Error( d->lasterr = gpgme_op_getauditlog_start( d->ctx, odp ? odp->data : 0, to_auditlog_flags( flags ) ) );
-#else
-    (void)output; (void)flags;
-    return Error( d->lasterr = gpg_error( GPG_ERR_NOT_IMPLEMENTED ) );
-#endif
-  }
-
-  Error Context::getAuditLog( Data & output, unsigned int flags ) {
-    d->lastop = Private::GetAuditLog;
-#ifdef HAVE_GPGME_OP_GETAUDITLOG
-    Data::Private * const odp = output.impl();
-    return Error( d->lasterr = gpgme_op_getauditlog( d->ctx, odp ? odp->data : 0, to_auditlog_flags( flags ) ) );
-#else
-    (void)output; (void)flags;
-    return Error( d->lasterr = gpg_error( GPG_ERR_NOT_IMPLEMENTED ) );
-#endif
-  }
-
-  void Context::clearSigningKeys() {
-    gpgme_signers_clear( d->ctx );
-  }
-
-  Error Context::addSigningKey( const Key & key ) {
-    return d->lasterr = gpgme_signers_add( d->ctx, key.impl() );
-  }
-
-  Key Context::signingKey( unsigned int idx ) const {
-    gpgme_key_t key = gpgme_signers_enum( d->ctx, idx );
-    return Key( key, false, keyListMode() );
-  }
-
-
-  static gpgme_sig_mode_t sigmode2sigmode( Context::SignatureMode mode ) {
-    switch ( mode ) {
-    default:
-    case Context::Normal:      return GPGME_SIG_MODE_NORMAL;
-    case Context::Detached:    return GPGME_SIG_MODE_DETACH;
-    case Context::Clearsigned: return GPGME_SIG_MODE_CLEAR;
-    }
-  }
-
-  SigningResult Context::sign( const Data & plainText, Data & signature, SignatureMode mode ) {
-    d->lastop = Private::Sign;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * sdp = signature.impl();
-    d->lasterr = gpgme_op_sign( d->ctx, pdp ? pdp->data : 0, sdp ? sdp->data : 0, sigmode2sigmode( mode ) );
-    return SigningResult( d->ctx, d->lasterr );
-  }
-
-
-  Error Context::startSigning( const Data & plainText, Data & signature, SignatureMode mode ) {
-    d->lastop = Private::Sign;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * sdp = signature.impl();
-    return d->lasterr = gpgme_op_sign_start( d->ctx, pdp ? pdp->data : 0, sdp ? sdp->data : 0, sigmode2sigmode( mode ) );
-  }
-
-  SigningResult Context::signingResult() const {
-    if ( d->lastop & Private::Sign )
-      return SigningResult( d->ctx, d->lasterr );
-    else
-      return SigningResult();
-  }
-
-
-  EncryptionResult Context::encrypt( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ) {
-    d->lastop = Private::Encrypt;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * cdp = cipherText.impl();
-    gpgme_key_t * keys = new gpgme_key_t[ recipients.size() + 1 ];
-    gpgme_key_t * keys_it = keys;
-    for ( std::vector<Key>::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
-      if ( it->impl() )
-	*keys_it++ = it->impl();
-    *keys_it++ = 0;
-    d->lasterr = gpgme_op_encrypt( d->ctx, keys,
-				   flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
-				   pdp ? pdp->data : 0, cdp ? cdp->data : 0 );
-    delete[] keys;
-    return EncryptionResult( d->ctx, d->lasterr );
-  }
-
-  Error Context::encryptSymmetrically( const Data & plainText, Data & cipherText ) {
-    d->lastop = Private::Encrypt;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * cdp = cipherText.impl();
-    return d->lasterr = gpgme_op_encrypt( d->ctx, 0, (gpgme_encrypt_flags_t)0,
-					  pdp ? pdp->data : 0, cdp ? cdp->data : 0 );
-  }
-
-  Error Context::startEncryption( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ) {
-    d->lastop = Private::Encrypt;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * cdp = cipherText.impl();
-    gpgme_key_t * keys = new gpgme_key_t[ recipients.size() + 1 ];
-    gpgme_key_t * keys_it = keys;
-    for ( std::vector<Key>::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
-      if ( it->impl() )
-	*keys_it++ = it->impl();
-    *keys_it++ = 0;
-    d->lasterr = gpgme_op_encrypt_start( d->ctx, keys,
-					 flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
-					 pdp ? pdp->data : 0, cdp ? cdp->data : 0 );
-    delete[] keys;
-    return d->lasterr;
-  }
-
-  EncryptionResult Context::encryptionResult() const {
-    if ( d->lastop & Private::Encrypt )
-      return EncryptionResult( d->ctx, d->lasterr );
-    else
-      return EncryptionResult();
-  }
-
-  std::pair<SigningResult,EncryptionResult> Context::signAndEncrypt( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ) {
-    d->lastop = Private::SignAndEncrypt;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * cdp = cipherText.impl();
-    gpgme_key_t * keys = new gpgme_key_t[ recipients.size() + 1 ];
-    gpgme_key_t * keys_it = keys;
-    for ( std::vector<Key>::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
-      if ( it->impl() )
-	*keys_it++ = it->impl();
-    *keys_it++ = 0;
-    d->lasterr = gpgme_op_encrypt_sign( d->ctx, keys,
-					flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
-					pdp ? pdp->data : 0, cdp ? cdp->data : 0 );
-    delete[] keys;
-    return std::make_pair( SigningResult( d->ctx, d->lasterr ),
-			   EncryptionResult( d->ctx, d->lasterr ) );
-  }
-
-  Error Context::startCombinedSigningAndEncryption( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ) {
-    d->lastop = Private::SignAndEncrypt;
-    Data::Private * pdp = plainText.impl();
-    Data::Private * cdp = cipherText.impl();
-    gpgme_key_t * keys = new gpgme_key_t[ recipients.size() + 1 ];
-    gpgme_key_t * keys_it = keys;
-    for ( std::vector<Key>::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
-      if ( it->impl() )
-	*keys_it++ = it->impl();
-    *keys_it++ = 0;
-    d->lasterr = gpgme_op_encrypt_sign_start( d->ctx, keys,
-					      flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
-					      pdp ? pdp->data : 0, cdp ? cdp->data : 0 );
-    delete[] keys;
-    return d->lasterr;
-  }
-
-
-  Error Context::cancelPendingOperation() {
-#ifdef HAVE_GPGME_CANCEL
-    return gpgme_cancel( d->ctx );
-#else
-    return 0;
-#endif
-  }
-
-  bool Context::poll() {
-    gpgme_error_t e = GPG_ERR_NO_ERROR;
-    const bool finished = gpgme_wait( d->ctx, &e, 0 );
-    if ( finished )
-      d->lasterr = e;
-    return finished;
-  }
-
-  Error Context::wait() {
-    gpgme_error_t e = GPG_ERR_NO_ERROR;
-    gpgme_wait( d->ctx, &e, 1 );
-    return d->lasterr = e;
-  }
-
-  Error Context::lastError() const {
-    return d->lasterr;
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::Protocol proto ) {
-      os << "GpgME::Context::Protocol(";
-      switch ( proto ) {
-      case Context::OpenPGP:
-          os << "OpenPGP";
-          break;
-      case Context::CMS:
-          os << "CMS";
-          break;
-      default:
-      case Context::Unknown:
-          os << "Unknown";
-          break;
-      }
-      return os << ')';
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl ) {
-      os << "GpgME::Context::CertificateInclusion(" << static_cast<int>( incl );
-      switch ( incl ) {
-      case Context::DefaultCertificates:
-          os << "(DefaultCertificates)";
-          break;
-      case Context::AllCertificatesExceptRoot:
-          os << "(AllCertificatesExceptRoot)";
-          break;
-      case Context::AllCertificates:
-          os << "(AllCertificates)";
-          break;
-      case Context::NoCertificates:
-          os << "(NoCertificates)";
-          break;
-      case Context::OnlySenderCertificate:
-          os << "(OnlySenderCertificate)";
-          break;
-      }
-      return os << ')';
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode ) {
-      os << "GpgME::Context::KeyListMode(";
-#define CHECK( x ) if ( !(mode & (Context::x)) ) {} else do { os << #x " "; } while (0)
-      CHECK( Local );
-      CHECK( Extern );
-      CHECK( Signatures );
-      CHECK( Validate );
-#undef CHECK
-      return os << ')';
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode ) {
-      os << "GpgME::Context::SignatureMode(";
-      switch ( mode ) {
-#define CHECK( x ) case Context::x: os << #x; break
-          CHECK( Normal );
-          CHECK( Detached );
-          CHECK( Clearsigned );
-#undef CHECK
-      default:
-          os << "???" "(" << static_cast<int>( mode ) << ')';
-          break;
-      }
-      return os << ')';
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags ) {
-      os << "GpgME::Context::EncryptionFlags(";
-#define CHECK( x ) if ( !(flags & (Context::x)) ) {} else do { os << #x " "; } while (0) 
-     CHECK( AlwaysTrust );
-#undef CHECK
-      return os << ')';
-  }
-
-  std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags ) {
-      os << "GpgME::Context::AuditLogFlags(";
-#define CHECK( x ) if ( !(flags & (Context::x)) ) {} else do { os << #x " "; } while (0)
-      CHECK( HtmlAuditLog );
-      CHECK( AuditLogWithHelp );
-#undef CHECK
-      return os << ')';
-  }
-
-
-
-} // namespace GpgME
-
-GpgME::Error GpgME::setDefaultLocale( int cat, const char * val ) {
-  return gpgme_set_locale( 0, cat, val );
-}
-
-GpgME::EngineInfo GpgME::engineInfo( Context::Protocol proto ) {
-  gpgme_engine_info_t ei = 0;
-  if ( gpgme_get_engine_info( &ei ) )
-    return EngineInfo();
-
-  gpgme_protocol_t p = proto == Context::CMS ? GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP ;
-
-  for ( gpgme_engine_info_t i = ei ; i ; i = i->next )
-    if ( i->protocol == p )
-      return EngineInfo( i );
-
-  return EngineInfo();
-}
-
-GpgME::Error GpgME::checkEngine( Context::Protocol proto ) {
-  gpgme_protocol_t p = proto == Context::CMS ? GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP ;
-
-  return gpgme_engine_check_version( p );
-}
-
-static const unsigned long supported_features = 0
-#ifdef HAVE_GPGME_KEYLIST_MODE_VALIDATE
-    | GpgME::ValidatingKeylistModeFeature
-#endif
-#ifdef HAVE_GPGME_CANCEL
-    | GpgME::CancelOperationFeature
-#endif
-#ifdef HAVE_GPGME_WRONG_KEY_USAGE
-    | GpgME::WrongKeyUsageFeature
-#endif
-#ifdef HAVE_GPGME_OP_GETAUDITLOG
-    | GpgME::AuditLogFeature
-#endif
-    ;
-
-bool GpgME::hasFeature( unsigned long features ) {
-    return features == ( features & supported_features );
-}