~ubuntu-branches/ubuntu/raring/gnupg2/raring-proposed

« back to all changes in this revision

Viewing changes to g10/mainproc.c

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2009-09-07 20:38:23 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20090907203823-d7hsk7lnfqoc4yom
Tags: 2.0.13-1
* New upstream release.
* debian/control: Depend instead of Recommend gnupg-agent. (Closes:
  #538947)

Show diffs side-by-side

added added

removed removed

Lines of Context:
586
586
        write_status( STATUS_DECRYPTION_FAILED );
587
587
    }
588
588
    else {
 
589
        if (gpg_err_code (result) == GPG_ERR_BAD_KEY
 
590
            && *c->dek->s2k_cacheid != '\0')
 
591
          {
 
592
            log_debug(_("cleared passphrase cached with ID: %s\n"),
 
593
                      c->dek->s2k_cacheid);
 
594
            passphrase_clear_cache (NULL, c->dek->s2k_cacheid, 0);
 
595
          }
589
596
        write_status( STATUS_DECRYPTION_FAILED );
590
597
        log_error(_("decryption failed: %s\n"), g10_errstr(result));
591
598
        /* Hmmm: does this work when we have encrypted using multiple