← Back to branch summary

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

« back to all changes in this revision

Viewing changes to agent/protect.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:
agent/protect.c
778
778
  unsigned long s2kcount;
779
779
  const unsigned char *iv;
780
780
  const unsigned char *prot_begin;
781
 
  unsigned char *cleartext;
 
781
  unsigned char *cleartext = NULL; /* Just to avoid gcc warning.  */
782
782
  unsigned char *final;
783
783
  size_t finallen;
784
784
  size_t cutoff, cutlen;