← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-proposed

« back to all changes in this revision

Viewing changes to g10/seckey-cert.c

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/seckey-cert.c
83
83
                                 &sk->protect.s2k, mode,
84
84
                                 tryagain_text, canceled );
85
85
        if (!dek && canceled && *canceled)
86
 
            return G10ERR_GENERAL;
 
86
            return GPG_ERR_CANCELED;
87
87
 
88
88
 
89
89
        err = openpgp_cipher_open (&cipher_hd, sk->protect.algo,