shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

pki: string_* -> ssh_string_*

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-28 22:51:00 +02:00
parent 7a9f65dd94
commit a060a235a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pki_crypto.c
View File

@@ -377,7 +377,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
} }
rc = buffer_add_ssh_string(buffer, type_s); rc = buffer_add_ssh_string(buffer, type_s);
string_free(type_s); ssh_string_free(type_s);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
@@ -572,7 +572,7 @@ ssh_string pki_signature_to_blob(const ssh_signature sig)
break; break;
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1: case SSH_KEYTYPE_RSA1:
sig_blob = string_copy(sig->rsa_sig); sig_blob = ssh_string_copy(sig->rsa_sig);
break; break;
case SSH_KEYTYPE_ECDSA: case SSH_KEYTYPE_ECDSA:
case SSH_KEYTYPE_UNKNOWN: case SSH_KEYTYPE_UNKNOWN:
@@ -672,7 +672,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
ssh_pki_log("RSA signature len: %lu", (unsigned long)len); ssh_pki_log("RSA signature len: %lu", (unsigned long)len);
ssh_print_hexa("RSA signature", ssh_string_data(sig_blob), len); ssh_print_hexa("RSA signature", ssh_string_data(sig_blob), len);
#endif #endif
sig->rsa_sig = string_copy(sig_blob); sig->rsa_sig = ssh_string_copy(sig_blob);
if (sig->rsa_sig == NULL) { if (sig->rsa_sig == NULL) {
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
@@ -714,7 +714,7 @@ int pki_signature_verify(ssh_session session,
rc = RSA_verify(NID_sha1, rc = RSA_verify(NID_sha1,
hash, hash,
hlen, hlen,
string_data(sig->rsa_sig), ssh_string_data(sig->rsa_sig),
ssh_string_len(sig->rsa_sig), ssh_string_len(sig->rsa_sig),
key->rsa); key->rsa);
if (rc < 0) { if (rc < 0) {