diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-17 00:20:45 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-18 20:34:16 +0200 |
commit | af09313eac20e91e7e70336c3b8a45688a73d146 (patch) | |
tree | 0b731e2b25bb0307af0e47433a3f535451461b36 /include | |
parent | ac41a083efd64d94dfb15845c6c25ba5667ba8b8 (diff) | |
download | libssh-af09313eac20e91e7e70336c3b8a45688a73d146.tar.gz libssh-af09313eac20e91e7e70336c3b8a45688a73d146.tar.xz libssh-af09313eac20e91e7e70336c3b8a45688a73d146.zip |
crypto: rename crypto_struct -> ssh_cipher_struct
Diffstat (limited to 'include')
-rw-r--r-- | include/libssh/crypto.h | 12 | ||||
-rw-r--r-- | include/libssh/libcrypto.h | 2 | ||||
-rw-r--r-- | include/libssh/libgcrypt.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index 5f301ff2..dfdcac90 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -70,7 +70,7 @@ struct ssh_crypto_struct { unsigned char *encryptMAC; unsigned char *decryptMAC; unsigned char hmacbuf[EVP_MAX_MD_SIZE]; - struct crypto_struct *in_cipher, *out_cipher; /* the cipher structures/objects */ + struct ssh_cipher_struct *in_cipher, *out_cipher; /* the cipher structures/objects */ ssh_string server_pubkey; const char *server_pubkey_type; int do_compress_out; /* idem */ @@ -87,7 +87,7 @@ struct ssh_crypto_struct { enum ssh_mac_e mac_type; /* Mac operations to use for key gen */ }; -struct crypto_struct { +struct ssh_cipher_struct { const char *name; /* ssh name of the algorithm */ unsigned int blocksize; /* blocksize of the algo */ unsigned int keylen; /* length of the key structure */ @@ -99,11 +99,11 @@ struct crypto_struct { #endif unsigned int keysize; /* bytes of key used. != keylen */ /* sets the new key for immediate use */ - int (*set_encrypt_key)(struct crypto_struct *cipher, void *key, void *IV); - int (*set_decrypt_key)(struct crypto_struct *cipher, void *key, void *IV); - void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out, + int (*set_encrypt_key)(struct ssh_cipher_struct *cipher, void *key, void *IV); + int (*set_decrypt_key)(struct ssh_cipher_struct *cipher, void *key, void *IV); + void (*cbc_encrypt)(struct ssh_cipher_struct *cipher, void *in, void *out, unsigned long len); - void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out, + void (*cbc_decrypt)(struct ssh_cipher_struct *cipher, void *in, void *out, unsigned long len); }; diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h index f1986602..8ddeac97 100644 --- a/include/libssh/libcrypto.h +++ b/include/libssh/libcrypto.h @@ -72,7 +72,7 @@ SHA256CTX sha256_init(void); void sha256_update(SHA256CTX c, const void *data, unsigned long len); void sha256_final(unsigned char *md, SHA256CTX c); -struct crypto_struct *ssh_get_ciphertab(void); +struct ssh_cipher_struct *ssh_get_ciphertab(void); #endif /* HAVE_LIBCRYPTO */ diff --git a/include/libssh/libgcrypt.h b/include/libssh/libgcrypt.h index 65545555..c4b0dc00 100644 --- a/include/libssh/libgcrypt.h +++ b/include/libssh/libgcrypt.h @@ -62,6 +62,6 @@ typedef gcry_mpi_t bignum; #endif /* HAVE_LIBGCRYPT */ -struct crypto_struct *ssh_get_ciphertab(void); +struct ssh_cipher_struct *ssh_get_ciphertab(void); #endif /* LIBGCRYPT_H_ */ |