diff options
| author | Werner Koch <[email protected]> | 2003-10-09 15:08:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-10-09 15:08:12 +0000 |
| commit | f633ef17dc34d0ab103e57c78121f11982fd75e4 (patch) | |
| tree | a3a5f28f447c993dddc531be71d1ed4e74986974 /g10/sign.c | |
| parent | * cardglue.c (pin_cb): Detect whether an admin or regular PIN is (diff) | |
| download | gnupg-f633ef17dc34d0ab103e57c78121f11982fd75e4.tar.gz gnupg-f633ef17dc34d0ab103e57c78121f11982fd75e4.zip | |
* ccid-driver.c (ccid_transceive): Add T=1 chaining for sending.
* sign.c (do_sign) [!ENABLE_CARD_SUPPORT]: Return an error for
card keys.
* cardglue.c (agent_scd_pkdecrypt): Implemented.
* pubkey-enc.c (get_it) [ENABLE_CARD_SUPPORT]: Divert decryption
to card
Diffstat (limited to 'g10/sign.c')
| -rw-r--r-- | g10/sign.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/sign.c b/g10/sign.c index 9826c2abf..3bfe602b2 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -306,9 +306,9 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig, sig->digest_algo = digest_algo; sig->digest_start[0] = dp[0]; sig->digest_start[1] = dp[1]; -#ifdef ENABLE_CARD_SUPPORT if (sk->is_protected && sk->protect.s2k.mode == 1002) { +#ifdef ENABLE_CARD_SUPPORT unsigned char *rbuf; size_t rbuflen; char *snbuf; @@ -327,9 +327,11 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig, mpi_set_buffer (sig->data[0], rbuf, rbuflen, 0); xfree (rbuf); } +#else + return G10ERR_UNSUPPORTED; +#endif /* ENABLE_CARD_SUPPORT */ } else -#endif /* ENABLE_CARD_SUPPORT */ { frame = encode_md_value( sk->pubkey_algo, md, digest_algo, mpi_get_nbits(sk->skey[0]), 0 ); |