← Back to branch summary

~noskcaj/ubuntu/wily/gpgme1.0/merge

« back to all changes in this revision

Viewing changes to src/op-support.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-10-31 10:54:12 UTC
  • mfrom: (13.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20141031105412-76uoahn8g7rp0f4z
Tags: 1.5.1-6ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/rules: Switch back to using /usr/bin/gpg and add back gnupg
    build dependency, as we don't install gnupg2 by default. 
  - debian/control: Depends on "gnupg | gnupg2" rather than gnupg2,
    default to the old version since the new one depends on gpg-agent,
    pinentry-gtk2, and a bunch of other packages we don't need/want in
    the default installation
* Dropped changes:
  - debian/patches/CVE-2014-3564.patch: upstream
  - debian/patches/test_engine_ignore_filename.diff: upstream
  - debian/rules: Fix build failure by running the tests without
    parallelization: handled in Debian by using newer automake

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/op-support.c
266
266
    case 12:
267
267
      inv_key->reason = gpg_error (GPG_ERR_MISSING_ISSUER_CERT);
268
268
      break;
 
269
 
 
270
    case 13:
 
271
      inv_key->reason = gpg_error (252); /*GPG_ERR_KEY_DISABLED*/
 
272
      break;
 
273
 
 
274
    case 14:
 
275
      inv_key->reason = gpg_error (GPG_ERR_INV_USER_ID);
 
276
      break;
269
277
    }
270
278
 
271
279
  while (*tail && *tail == ' ')