diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-06-13 14:47:17 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-06-13 14:47:17 +0200 |
| commit | 2653b31af01a859c00735e34d4ea3999a534b05f (patch) | |
| tree | 32f5c1683f774c15b99b1f8c749db4923e77a5fb /include | |
| parent | a3c28f2558481536c03dcfbc2d3b3a7c925b900f (diff) | |
| download | libssh-2653b31af01a859c00735e34d4ea3999a534b05f.tar.gz libssh-2653b31af01a859c00735e34d4ea3999a534b05f.tar.xz libssh-2653b31af01a859c00735e34d4ea3999a534b05f.zip | |
[crypto] Removed ugly ifdefs on gcrypt/libcrypto
Diffstat (limited to 'include')
| -rw-r--r-- | include/libssh/crypto.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index d5b95b9..60a93f0 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -87,9 +87,9 @@ struct crypto_struct { gcry_cipher_hd_t *key; #elif defined HAVE_LIBCRYPTO void *key; /* a key buffer allocated for the algo */ + void *IV; #endif unsigned int keysize; /* bytes of key used. != keylen */ -#ifdef HAVE_LIBGCRYPT /* 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); @@ -97,15 +97,6 @@ struct crypto_struct { unsigned long len); void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out, unsigned long len); -#elif defined HAVE_LIBCRYPTO - /* sets the new key for immediate use */ - int (*set_encrypt_key)(struct crypto_struct *cipher, void *key); - int (*set_decrypt_key)(struct crypto_struct *cipher, void *key); - void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out, - unsigned long len, void *IV); - void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out, - unsigned long len, void *IV); -#endif }; /* vim: set ts=2 sw=2 et cindent: */ |