diff options
| author | NIIBE Yutaka <[email protected]> | 2023-03-20 02:08:51 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-03-20 02:08:51 +0000 |
| commit | 512213d6ed1cf1ff7b2a274f8d0e50326903af96 (patch) | |
| tree | 31929d4a8ecc71c04a86484f2598fd7cf5bedbe1 | |
| parent | tkd: Add RESTART command. (diff) | |
| download | gnupg-512213d6ed1cf1ff7b2a274f8d0e50326903af96.tar.gz gnupg-512213d6ed1cf1ff7b2a274f8d0e50326903af96.zip | |
tkd: Fix PKSIGN.
Clean up confusion of hashing.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | tkd/pkcs11.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tkd/pkcs11.c b/tkd/pkcs11.c index 9f802db14..33c19ecdd 100644 --- a/tkd/pkcs11.c +++ b/tkd/pkcs11.c @@ -920,13 +920,8 @@ do_pksign (struct key *key, int hash_algo, size_t asnlen = sizeof (data); gcry_md_get_asnoid (hash_algo, data, &asnlen); -#if 0 - gcry_md_hash_buffer (hash_algo, data+asnlen, - u_data, u_data_len); -#else /* u_data_len == gcry_md_get_algo_dlen (hash_algo) */ memcpy (data+asnlen, u_data, u_data_len); -#endif data_len = asnlen+gcry_md_get_algo_dlen (hash_algo); } else if (key->key_type == KEY_EC) @@ -953,7 +948,8 @@ do_pksign (struct key *key, int hash_algo, } /* Scute, YKCS11 */ - gcry_md_hash_buffer (hash_algo, data, u_data, u_data_len); + /* u_data_len == gcry_md_get_algo_dlen (hash_algo) */ + memcpy (data, u_data, u_data_len); data_len = gcry_md_get_algo_dlen (hash_algo); } } |