← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gnupg2/karmic-security

« back to all changes in this revision

Viewing changes to agent/pkdecrypt.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-08-04 12:27:49 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090804122749-q0j52zp6xmzvyall
Tags: 2.0.12-0ubuntu1
* New upstream release.
* Add 01-scd-pw2.patch, 03-opgp-writekey.patch, and 06-opgp-sign3072.patch
  from https://bugs.g10code.com/gnupg/issue1094 to make OpenPGP 2.0
  smartcards work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/pkdecrypt.c
66
66
    }
67
67
  rc = agent_key_from_file (ctrl, desc_text,
68
68
                            ctrl->keygrip, &shadow_info,
69
 
                            CACHE_MODE_NORMAL, &s_skey);
 
69
                            CACHE_MODE_NORMAL, NULL, &s_skey);
70
70
  if (rc)
71
71
    {
72
 
      log_error ("failed to read the secret key\n");
 
72
      if (gpg_err_code (rc) == GPG_ERR_ENOENT)
 
73
        rc = gpg_error (GPG_ERR_NO_SECKEY);
 
74
      else
 
75
        log_error ("failed to read the secret key\n");
73
76
      goto leave;
74
77
    }
75
78