mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-20 01:02:44 +02:00
agent: Clean up the API of agent_pkdecrypt.
* agent/agent.h (agent_pkdecrypt): Use gpg_error_t type. * agent/pkdecrypt.c (agent_pkdecrypt): Use gpg_error_t type. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
cbb0e069f5
commit
9beab36dfa
|
@ -514,7 +514,7 @@ gpg_error_t agent_pksign (ctrl_t ctrl, const char *cache_nonce,
|
||||||
membuf_t *outbuf, cache_mode_t cache_mode);
|
membuf_t *outbuf, cache_mode_t cache_mode);
|
||||||
|
|
||||||
/*-- pkdecrypt.c --*/
|
/*-- pkdecrypt.c --*/
|
||||||
int agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
gpg_error_t agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
const unsigned char *ciphertext, size_t ciphertextlen,
|
const unsigned char *ciphertext, size_t ciphertextlen,
|
||||||
membuf_t *outbuf, int *r_padding);
|
membuf_t *outbuf, int *r_padding);
|
||||||
|
|
||||||
|
|
|
@ -33,14 +33,14 @@
|
||||||
Try to get the key from CTRL and write the decoded stuff back to
|
Try to get the key from CTRL and write the decoded stuff back to
|
||||||
OUTFP. The padding information is stored at R_PADDING with -1
|
OUTFP. The padding information is stored at R_PADDING with -1
|
||||||
for not known. */
|
for not known. */
|
||||||
int
|
gpg_error_t
|
||||||
agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
const unsigned char *ciphertext, size_t ciphertextlen,
|
const unsigned char *ciphertext, size_t ciphertextlen,
|
||||||
membuf_t *outbuf, int *r_padding)
|
membuf_t *outbuf, int *r_padding)
|
||||||
{
|
{
|
||||||
gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL;
|
gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL;
|
||||||
unsigned char *shadow_info = NULL;
|
unsigned char *shadow_info = NULL;
|
||||||
int rc;
|
gpg_error_t err = 0;
|
||||||
char *buf = NULL;
|
char *buf = NULL;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
|
@ -49,15 +49,15 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
if (!ctrl->have_keygrip)
|
if (!ctrl->have_keygrip)
|
||||||
{
|
{
|
||||||
log_error ("speculative decryption not yet supported\n");
|
log_error ("speculative decryption not yet supported\n");
|
||||||
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
err = gpg_error (GPG_ERR_NO_SECKEY);
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = gcry_sexp_sscan (&s_cipher, NULL, (char*)ciphertext, ciphertextlen);
|
err = gcry_sexp_sscan (&s_cipher, NULL, (char*)ciphertext, ciphertextlen);
|
||||||
if (rc)
|
if (err)
|
||||||
{
|
{
|
||||||
log_error ("failed to convert ciphertext: %s\n", gpg_strerror (rc));
|
log_error ("failed to convert ciphertext: %s\n", gpg_strerror (err));
|
||||||
rc = gpg_error (GPG_ERR_INV_DATA);
|
err = gpg_error (GPG_ERR_INV_DATA);
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,12 +66,12 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
log_printhex (ctrl->keygrip, 20, "keygrip:");
|
log_printhex (ctrl->keygrip, 20, "keygrip:");
|
||||||
log_printhex (ciphertext, ciphertextlen, "cipher: ");
|
log_printhex (ciphertext, ciphertextlen, "cipher: ");
|
||||||
}
|
}
|
||||||
rc = agent_key_from_file (ctrl, NULL, desc_text,
|
err = agent_key_from_file (ctrl, NULL, desc_text,
|
||||||
ctrl->keygrip, &shadow_info,
|
ctrl->keygrip, &shadow_info,
|
||||||
CACHE_MODE_NORMAL, NULL, &s_skey, NULL);
|
CACHE_MODE_NORMAL, NULL, &s_skey, NULL);
|
||||||
if (rc)
|
if (err)
|
||||||
{
|
{
|
||||||
if (gpg_err_code (rc) != GPG_ERR_NO_SECKEY)
|
if (gpg_err_code (err) != GPG_ERR_NO_SECKEY)
|
||||||
log_error ("failed to read the secret key\n");
|
log_error ("failed to read the secret key\n");
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
@ -81,15 +81,15 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
|
|
||||||
if (!gcry_sexp_canon_len (ciphertext, ciphertextlen, NULL, NULL))
|
if (!gcry_sexp_canon_len (ciphertext, ciphertextlen, NULL, NULL))
|
||||||
{
|
{
|
||||||
rc = gpg_error (GPG_ERR_INV_SEXP);
|
err = gpg_error (GPG_ERR_INV_SEXP);
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = divert_pkdecrypt (ctrl, desc_text, ctrl->keygrip, ciphertext,
|
err = divert_pkdecrypt (ctrl, desc_text, ctrl->keygrip, ciphertext,
|
||||||
shadow_info, &buf, &len, r_padding);
|
shadow_info, &buf, &len, r_padding);
|
||||||
if (rc)
|
if (err)
|
||||||
{
|
{
|
||||||
log_error ("smartcard decryption failed: %s\n", gpg_strerror (rc));
|
log_error ("smartcard decryption failed: %s\n", gpg_strerror (err));
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,10 +105,10 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
/* gcry_sexp_dump (s_skey); */
|
/* gcry_sexp_dump (s_skey); */
|
||||||
/* } */
|
/* } */
|
||||||
|
|
||||||
rc = gcry_pk_decrypt (&s_plain, s_cipher, s_skey);
|
err = gcry_pk_decrypt (&s_plain, s_cipher, s_skey);
|
||||||
if (rc)
|
if (err)
|
||||||
{
|
{
|
||||||
log_error ("decryption failed: %s\n", gpg_strerror (rc));
|
log_error ("decryption failed: %s\n", gpg_strerror (err));
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -141,5 +141,5 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
|
||||||
gcry_sexp_release (s_cipher);
|
gcry_sexp_release (s_cipher);
|
||||||
xfree (buf);
|
xfree (buf);
|
||||||
xfree (shadow_info);
|
xfree (shadow_info);
|
||||||
return rc;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user