summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-09-23 23:55:07 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-09-23 23:55:07 +0200
commit6b0a89a288d2ca41f93178f60266573eddd0db1e (patch)
tree7b04be6341e6722680aaaedad09a519f441b7325 /include
parentf84ebc2e2770b16b43c62ecb67cf8d4bd1b99d72 (diff)
downloadlibssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.tar.gz
libssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.tar.xz
libssh-6b0a89a288d2ca41f93178f60266573eddd0db1e.zip
Get rid of CRYPTO
Diffstat (limited to 'include')
-rw-r--r--include/libssh/priv.h8
-rw-r--r--include/libssh/session.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index f120619..cd43b72 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 04239a5..41b36d0 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;