diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-09-23 23:55:07 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-09-23 23:55:07 +0200 |
commit | 6b0a89a288d2ca41f93178f60266573eddd0db1e (patch) | |
tree | 7b04be6341e6722680aaaedad09a519f441b7325 | |
parent | f84ebc2e2770b16b43c62ecb67cf8d4bd1b99d72 (diff) | |
download | libssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.tar.gz libssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.tar.xz libssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.zip |
Get rid of CRYPTO
-rw-r--r-- | include/libssh/priv.h | 8 | ||||
-rw-r--r-- | include/libssh/session.h | 4 | ||||
-rw-r--r-- | libssh/keys.c | 6 | ||||
-rw-r--r-- | libssh/wrapper.c | 12 |
4 files changed, 14 insertions, 16 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index f1206196..cd43b72e 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -272,7 +272,7 @@ struct ssh_options_struct { }; -typedef struct ssh_crypto_struct { +struct ssh_crypto_struct { bignum e,f,x,k,y; unsigned char session_id[SHA_DIGEST_LEN]; @@ -292,7 +292,7 @@ typedef struct ssh_crypto_struct { int do_compress_in; /* don't set them, set the option instead */ void *compress_out_ctx; /* don't touch it */ void *compress_in_ctx; /* really, don't */ -} CRYPTO; +}; struct ssh_keys_struct { const char *privatekey; @@ -486,8 +486,8 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen); /* wrapper.c */ int crypt_set_algorithms(ssh_session ); int crypt_set_algorithms_server(ssh_session session); -CRYPTO *crypto_new(void); -void crypto_free(CRYPTO *crypto); +struct ssh_crypto_struct *crypto_new(void); +void crypto_free(struct ssh_crypto_struct *crypto); /* crc32.c */ uint32_t ssh_crc32(const char *buf, uint32_t len); diff --git a/include/libssh/session.h b/include/libssh/session.h index 04239a58..41b36d06 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -68,8 +68,8 @@ struct ssh_session_struct { KEX client_kex; ssh_buffer in_hashbuf; ssh_buffer out_hashbuf; - CRYPTO *current_crypto; - CRYPTO *next_crypto; /* next_crypto is going to be used after a SSH2_MSG_NEWKEYS */ + struct ssh_crypto_struct *current_crypto; + struct ssh_crypto_struct *next_crypto; /* next_crypto is going to be used after a SSH2_MSG_NEWKEYS */ ssh_channel channels; /* linked list of channels */ int maxchannel; diff --git a/libssh/keys.c b/libssh/keys.c index 8ffa4394..2fcc6750 100644 --- a/libssh/keys.c +++ b/libssh/keys.c @@ -1168,7 +1168,7 @@ ssh_buffer ssh_userauth_build_digest(ssh_session session, ssh_message msg, char string public key algorithm name string public key to be used for authentication */ - CRYPTO *crypto = session->current_crypto ? session->current_crypto : + struct ssh_crypto_struct *crypto = session->current_crypto ? session->current_crypto : session->next_crypto; ssh_buffer buffer = NULL; ssh_string session_id = NULL; @@ -1220,7 +1220,7 @@ error: * the content of sigbuf */ ssh_string ssh_do_sign(ssh_session session, ssh_buffer sigbuf, ssh_private_key privatekey) { - CRYPTO *crypto = session->current_crypto ? session->current_crypto : + struct ssh_crypto_struct *crypto = session->current_crypto ? session->current_crypto : session->next_crypto; unsigned char hash[SHA_DIGEST_LEN + 1] = {0}; ssh_string session_str = NULL; @@ -1384,7 +1384,7 @@ ssh_string ssh_encrypt_rsa1(ssh_session session, ssh_string data, ssh_public_key /* this function signs the session id */ ssh_string ssh_sign_session_id(ssh_session session, ssh_private_key privatekey) { - CRYPTO *crypto=session->current_crypto ? session->current_crypto : + struct ssh_crypto_struct *crypto=session->current_crypto ? session->current_crypto : session->next_crypto; unsigned char hash[SHA_DIGEST_LEN + 1] = {0}; ssh_string signature = NULL; diff --git a/libssh/wrapper.c b/libssh/wrapper.c index f82ae3e7..f6806057 100644 --- a/libssh/wrapper.c +++ b/libssh/wrapper.c @@ -769,20 +769,18 @@ static void cipher_free(struct crypto_struct *cipher) { SAFE_FREE(cipher); } -CRYPTO *crypto_new(void) { - CRYPTO *crypto; +struct ssh_crypto_struct *crypto_new(void) { + struct ssh_crypto_struct *crypto; - crypto = malloc(sizeof(CRYPTO)); + crypto = malloc(sizeof(struct ssh_crypto_struct)); if (crypto == NULL) { return NULL; } - - memset(crypto, 0, sizeof(CRYPTO)); - + ZERO_STRUCTP(crypto); return crypto; } -void crypto_free(CRYPTO *crypto){ +void crypto_free(struct ssh_crypto_struct *crypto){ if (crypto == NULL) { return; } |