aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-28 22:08:14 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-28 22:25:33 +0200
commit7a9f65dd94b148f7965471a16518e86b02790616 (patch)
treedc7da934653d4ea3e2d887f1b47ced2069bccfdc /src
parent246d20ef231ee6564237b7e492177d9226549df7 (diff)
downloadlibssh-7a9f65dd94b148f7965471a16518e86b02790616.tar.gz
libssh-7a9f65dd94b148f7965471a16518e86b02790616.tar.xz
libssh-7a9f65dd94b148f7965471a16518e86b02790616.zip
pki: Refactor ssh_pki_do_sign().
Diffstat (limited to 'src')
-rw-r--r--src/pki.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/pki.c b/src/pki.c
index f9e129d8..1ad01be3 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -1079,34 +1079,35 @@ ssh_string ssh_pki_do_sign(ssh_session session,
session->next_crypto;
unsigned char hash[SHA_DIGEST_LEN] = {0};
ssh_signature sig;
- ssh_string sig_blob = NULL;
- ssh_string str = NULL;
- SHACTX ctx = NULL;
+ ssh_string sig_blob;
+ ssh_string session_id;
+ SHACTX ctx;
int rc;
if (privkey == NULL || !ssh_key_is_private(privkey)) {
return NULL;
}
- str = ssh_string_new(SHA_DIGEST_LEN);
- if (str == NULL) {
+ session_id = ssh_string_new(SHA_DIGEST_LEN);
+ if (session_id == NULL) {
return NULL;
}
- ssh_string_fill(str, crypto->session_id, SHA_DIGEST_LEN);
+ ssh_string_fill(session_id, crypto->session_id, SHA_DIGEST_LEN);
ctx = sha1_init();
if (ctx == NULL) {
- ssh_string_free(str);
+ ssh_string_free(session_id);
return NULL;
}
- sha1_update(ctx, str, ssh_string_len(str) + 4);
- ssh_string_free(str);
+ sha1_update(ctx, session_id, ssh_string_len(session_id) + 4);
+ ssh_string_free(session_id);
+
sha1_update(ctx, buffer_get_rest(sigbuf), buffer_get_rest_len(sigbuf));
sha1_final(hash, ctx);
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("Hash being signed with dsa", hash, SHA_DIGEST_LEN);
+ ssh_print_hexa("Hash being signed", hash, SHA_DIGEST_LEN);
#endif
sig = pki_do_sign(privkey, hash, SHA_DIGEST_LEN);