← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnupg2/precise-updates

« back to all changes in this revision

Viewing changes to g10/passphrase.c

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2011-02-13 16:06:41 UTC
  • mto: (1.1.15 upstream) (7.1.6 sid)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: james.westby@ubuntu.com-20110213160641-2vzropar4rtzwybv
Import upstream version 2.0.17

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/passphrase.c
644
644
 
645
645
      /* Divert to the gpg-agent. */
646
646
      pw = passphrase_get (keyid, mode == 2, s2k_cacheid,
647
 
                           (mode == 2 || mode == 4)? opt.passwd_repeat : 0,
 
647
                           (mode == 2 || mode == 4)? opt.passphrase_repeat : 0,
648
648
                           tryagain_text, custdesc, custprompt, canceled);
649
649
      if (*canceled)
650
650
        {