aboutsummaryrefslogtreecommitdiff
path: root/src/pki.c
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-05-02 18:31:06 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-05-13 16:37:51 +0200
commitdb51fa1bc1ba757cef128268f1885934afc670e5 (patch)
treed9dc66a41edc9a3592a75f9f819600b6acb15ed0 /src/pki.c
parentd923dc39c19a443d2d8bc1aae688b2066b6faa6c (diff)
downloadlibssh-db51fa1bc1ba757cef128268f1885934afc670e5.tar.gz
libssh-db51fa1bc1ba757cef128268f1885934afc670e5.tar.xz
libssh-db51fa1bc1ba757cef128268f1885934afc670e5.zip
pki: Use pki_sign_data() and pki_verify_data_signature()
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/pki.c')
-rw-r--r--src/pki.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/src/pki.c b/src/pki.c
index a8da2b93..d43dddad 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -2112,9 +2112,6 @@ ssh_signature pki_do_sign(const ssh_key privkey,
size_t input_len,
enum ssh_digest_e hash_type)
{
- unsigned char hash[SHA512_DIGEST_LEN] = {0};
- uint32_t hlen = 0;
-
if (privkey == NULL || input == NULL) {
SSH_LOG(SSH_LOG_TRACE, "Bad parameter provided to "
"pki_do_sign()");
@@ -2127,34 +2124,7 @@ ssh_signature pki_do_sign(const ssh_key privkey,
return pki_do_sign_hash(privkey, input, input_len, SSH_DIGEST_AUTO);
}
- switch (hash_type) {
- case SSH_DIGEST_SHA256:
- sha256(input, input_len, hash);
- hlen = SHA256_DIGEST_LEN;
- break;
- case SSH_DIGEST_SHA384:
- sha384(input, input_len, hash);
- hlen = SHA384_DIGEST_LEN;
- break;
- case SSH_DIGEST_SHA512:
- sha512(input, input_len, hash);
- hlen = SHA512_DIGEST_LEN;
- break;
- case SSH_DIGEST_AUTO:
- case SSH_DIGEST_SHA1:
- sha1(input, input_len, hash);
- hlen = SHA_DIGEST_LEN;
- break;
- default:
- SSH_LOG(SSH_LOG_TRACE, "Unknown hash algorithm for type: %d",
- hash_type);
- goto error;
- }
-
- return pki_do_sign_hash(privkey, hash, hlen, hash_type);
-
-error:
- return NULL;
+ return pki_sign_data(privkey, hash_type, input, input_len);
}
/*