diff options
| author | Justus Winter <[email protected]> | 2015-12-04 14:19:07 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-05-24 15:01:48 +0000 |
| commit | 3ac1a9d3a018816233a855faff059b4e0657a0f1 (patch) | |
| tree | 21505b72fe2daf560ec214120612bd2286611fe7 /common/ssh-utils.h | |
| parent | Register DCO for William L. Thomson Jr. (diff) | |
| download | gnupg-3ac1a9d3a018816233a855faff059b4e0657a0f1.tar.gz gnupg-3ac1a9d3a018816233a855faff059b4e0657a0f1.zip | |
common: Support different digest algorithms for ssh fingerprints.
* common/ssh-utils.c (get_fingerprint): Add and honor 'algo' parameter.
(ssh_get_fingerprint{,_string}): Likewise.
* common/ssh-utils.h (ssh_get_fingerprint{,_string}): Update prototypes.
* common/t-ssh-utils.c (main): Adapt accordingly.
* agent/command-ssh.c (agent_raw_key_from_file): Likewise.
(ssh_identity_register): Likewise.
* agent/command.c (do_one_keyinfo): Likewise.
* agent/findkey.c (modify_description): Likewise.
--
This lays the foundation to support other algorithms.
GnuPG-bug-id: 2106
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'common/ssh-utils.h')
| -rw-r--r-- | common/ssh-utils.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/ssh-utils.h b/common/ssh-utils.h index 36d38a3fa..53d9f550c 100644 --- a/common/ssh-utils.h +++ b/common/ssh-utils.h @@ -31,9 +31,11 @@ #define GNUPG_COMMON_SSH_UTILS_H -gpg_error_t ssh_get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len); +gpg_error_t ssh_get_fingerprint (gcry_sexp_t key, int algo, + void **r_fpr, size_t *r_len); -gpg_error_t ssh_get_fingerprint_string (gcry_sexp_t key, char **r_fprstr); +gpg_error_t ssh_get_fingerprint_string (gcry_sexp_t key, int algo, + char **r_fprstr); #endif /*GNUPG_COMMON_SSH_UTILS_H*/ |