← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnupg2/lucid-updates

« back to all changes in this revision

Viewing changes to sm/sign.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2009-11-07 13:12:03 UTC
  • mfrom: (1.1.13 upstream) (7.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091107131203-vgyndyfgtwch7v61
Tags: 2.0.13-1ubuntu1
https://launchpad.net/bugs/477491
* Merge with Debian testing (lp: #477491). Remaining changes:
  - Build-depend on libreadline-dev instead of libreadline5-dev.
  - debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
  - debian/rules: Call dh_installudev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sm/sign.c
372
372
      if (!cert)
373
373
        {
374
374
          log_error ("no default signer found\n");
 
375
          gpgsm_status2 (ctrl, STATUS_INV_SGNR, 
 
376
                         get_inv_recpsgnr_code (GPG_ERR_NO_SECKEY), NULL);
375
377
          rc = gpg_error (GPG_ERR_GENERAL);
376
378
          goto leave;
377
379
        }
382
384
      if (!rc)
383
385
        rc = gpgsm_validate_chain (ctrl, cert, "", NULL, 0, NULL, 0, NULL);
384
386
      if (rc)
385
 
        goto leave;
 
387
        {
 
388
          char *tmpfpr;
 
389
 
 
390
          tmpfpr = gpgsm_get_fingerprint_hexstring (cert, 0);
 
391
          gpgsm_status2 (ctrl, STATUS_INV_SGNR, 
 
392
                         get_inv_recpsgnr_code (rc), tmpfpr, NULL);
 
393
          xfree (tmpfpr);
 
394
          goto leave;
 
395
        }
386
396
 
387
397
      /* That one is fine - create signerlist. */
388
398
      signerlist = xtrycalloc (1, sizeof *signerlist);
403
413
    log_info ("user requested hash algorithm %d\n", opt.forced_digest_algo);
404
414
  for (i=0, cl=signerlist; cl; cl = cl->next, i++)
405
415
    {
406
 
      const char *oid = ksba_cert_get_digest_algo (cl->cert);
 
416
      const char *oid;
407
417
 
408
418
      if (opt.forced_digest_algo)
409
419
        {