aboutsummaryrefslogtreecommitdiff
path: root/libssh/dh.c
diff options
context:
space:
mode:
Diffstat (limited to 'libssh/dh.c')
-rw-r--r--libssh/dh.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/libssh/dh.c b/libssh/dh.c
index 9b9e129f..e70c9491 100644
--- a/libssh/dh.c
+++ b/libssh/dh.c
@@ -368,7 +368,7 @@ ssh_string make_bignum_string(bignum num) {
bignum make_string_bn(ssh_string string){
bignum bn = NULL;
- unsigned int len = string_len(string);
+ unsigned int len = ssh_string_len(string);
#ifdef DEBUG_CRYPTO
fprintf(stderr, "Importing a %d bits, %d bytes object ...\n",
@@ -498,12 +498,12 @@ int make_sessionid(ssh_session session) {
return rc;
}
- buf = buffer_new();
+ buf = ssh_buffer_new();
if (buf == NULL) {
return rc;
}
- str = string_from_char(session->clientbanner);
+ str = ssh_string_from_char(session->clientbanner);
if (str == NULL) {
goto error;
}
@@ -511,9 +511,9 @@ int make_sessionid(ssh_session session) {
if (buffer_add_ssh_string(buf, str) < 0) {
goto error;
}
- string_free(str);
+ ssh_string_free(str);
- str = string_from_char(session->serverbanner);
+ str = ssh_string_from_char(session->serverbanner);
if (str == NULL) {
goto error;
}
@@ -543,25 +543,25 @@ int make_sessionid(ssh_session session) {
goto error;
}
- len = ntohl(buffer_get_len(client_hash));
+ len = ntohl(ssh_buffer_get_len(client_hash));
if (buffer_add_u32(buf,len) < 0) {
goto error;
}
- if (buffer_add_data(buf, buffer_get(client_hash),
- buffer_get_len(client_hash)) < 0) {
+ if (buffer_add_data(buf, ssh_buffer_get_begin(client_hash),
+ ssh_buffer_get_len(client_hash)) < 0) {
goto error;
}
- len = ntohl(buffer_get_len(server_hash));
+ len = ntohl(ssh_buffer_get_len(server_hash));
if (buffer_add_u32(buf, len) < 0) {
goto error;
}
- if (buffer_add_data(buf, buffer_get(server_hash),
- buffer_get_len(server_hash)) < 0) {
+ if (buffer_add_data(buf, ssh_buffer_get_begin(server_hash),
+ ssh_buffer_get_len(server_hash)) < 0) {
goto error;
}
- len = string_len(session->next_crypto->server_pubkey) + 4;
+ len = ssh_string_len(session->next_crypto->server_pubkey) + 4;
if (buffer_add_data(buf, session->next_crypto->server_pubkey, len) < 0) {
goto error;
}
@@ -571,38 +571,38 @@ int make_sessionid(ssh_session session) {
goto error;
}
- len = string_len(num) + 4;
+ len = ssh_string_len(num) + 4;
if (buffer_add_data(buf, num, len) < 0) {
goto error;
}
- string_free(num);
+ ssh_string_free(num);
num = make_bignum_string(session->next_crypto->f);
if (num == NULL) {
goto error;
}
- len = string_len(num) + 4;
+ len = ssh_string_len(num) + 4;
if (buffer_add_data(buf, num, len) < 0) {
goto error;
}
- string_free(num);
+ ssh_string_free(num);
num = make_bignum_string(session->next_crypto->k);
if (num == NULL) {
goto error;
}
- len = string_len(num) + 4;
+ len = ssh_string_len(num) + 4;
if (buffer_add_data(buf, num, len) < 0) {
goto error;
}
#ifdef DEBUG_CRYPTO
- ssh_print_hexa("hash buffer", buffer_get(buf), buffer_get_len(buf));
+ ssh_print_hexa("hash buffer", ssh_buffer_get_begin(buf), ssh_buffer_get_len(buf));
#endif
- sha1_update(ctx, buffer_get(buf), buffer_get_len(buf));
+ sha1_update(ctx, ssh_buffer_get_begin(buf), ssh_buffer_get_len(buf));
sha1_final(session->next_crypto->session_id, ctx);
#ifdef DEBUG_CRYPTO
@@ -612,15 +612,15 @@ int make_sessionid(ssh_session session) {
rc = SSH_OK;
error:
- buffer_free(buf);
- buffer_free(client_hash);
- buffer_free(server_hash);
+ ssh_buffer_free(buf);
+ ssh_buffer_free(client_hash);
+ ssh_buffer_free(server_hash);
session->in_hashbuf = NULL;
session->out_hashbuf = NULL;
- string_free(str);
- string_free(num);
+ ssh_string_free(str);
+ ssh_string_free(num);
leave_function();
@@ -628,7 +628,7 @@ error:
}
int hashbufout_add_cookie(ssh_session session) {
- session->out_hashbuf = buffer_new();
+ session->out_hashbuf = ssh_buffer_new();
if (session->out_hashbuf == NULL) {
return -1;
}
@@ -656,7 +656,7 @@ int hashbufout_add_cookie(ssh_session session) {
}
int hashbufin_add_cookie(ssh_session session, unsigned char *cookie) {
- session->in_hashbuf = buffer_new();
+ session->in_hashbuf = ssh_buffer_new();
if (session->in_hashbuf == NULL) {
return -1;
}
@@ -684,7 +684,7 @@ static int generate_one_key(ssh_string k,
return -1;
}
- sha1_update(ctx, k, string_len(k) + 4);
+ sha1_update(ctx, k, ssh_string_len(k) + 4);
sha1_update(ctx, session_id, SHA_DIGEST_LEN);
sha1_update(ctx, &letter, 1);
sha1_update(ctx, session_id, SHA_DIGEST_LEN);
@@ -752,7 +752,7 @@ int generate_session_keys(ssh_session session) {
if (ctx == NULL) {
goto error;
}
- sha1_update(ctx, k_string, string_len(k_string) + 4);
+ sha1_update(ctx, k_string, ssh_string_len(k_string) + 4);
sha1_update(ctx, session->next_crypto->session_id, SHA_DIGEST_LEN);
sha1_update(ctx, session->next_crypto->encryptkey, SHA_DIGEST_LEN);
sha1_final(session->next_crypto->encryptkey + SHA_DIGEST_LEN, ctx);
@@ -760,7 +760,7 @@ int generate_session_keys(ssh_session session) {
if (session->next_crypto->in_cipher->keysize > SHA_DIGEST_LEN * 8) {
ctx = sha1_init();
- sha1_update(ctx, k_string, string_len(k_string) + 4);
+ sha1_update(ctx, k_string, ssh_string_len(k_string) + 4);
sha1_update(ctx, session->next_crypto->session_id, SHA_DIGEST_LEN);
sha1_update(ctx, session->next_crypto->decryptkey, SHA_DIGEST_LEN);
sha1_final(session->next_crypto->decryptkey + SHA_DIGEST_LEN, ctx);
@@ -798,7 +798,7 @@ int generate_session_keys(ssh_session session) {
rc = 0;
error:
- string_free(k_string);
+ ssh_string_free(k_string);
leave_function();
return rc;
@@ -851,7 +851,7 @@ int ssh_get_pubkey_hash(ssh_session session, unsigned char **hash) {
pubkey = session->current_crypto->server_pubkey;
- md5_update(ctx, pubkey->string, string_len(pubkey));
+ md5_update(ctx, pubkey->string, ssh_string_len(pubkey));
md5_final(h, ctx);
*hash = h;
@@ -875,7 +875,7 @@ void ssh_clean_pubkey_hash(unsigned char **hash) {
}
ssh_string ssh_get_pubkey(ssh_session session){
- return string_copy(session->current_crypto->server_pubkey);
+ return ssh_string_copy(session->current_crypto->server_pubkey);
}
static int match(const char *group, const char *object){
@@ -976,7 +976,7 @@ int sig_verify(ssh_session session, ssh_public_key pubkey,
}
#elif defined HAVE_LIBCRYPTO
valid = RSA_verify(NID_sha1, hash + 1, SHA_DIGEST_LEN,
- signature->rsa_sign->string, string_len(signature->rsa_sign),
+ signature->rsa_sign->string, ssh_string_len(signature->rsa_sign),
pubkey->rsa_pub);
if (valid == 1) {
return 0;