diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-03 21:03:22 +0100 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-03 21:03:22 +0100 |
commit | c0e091a52f8521d0cdcb9c22b4caa88bbe40e604 (patch) | |
tree | 6e17fd5222e40b3a40e7612f1164ea646913b361 /include/libssh/crypto.h | |
parent | cce34a61760cd03091e47c98ae8f7cfef5dd716c (diff) | |
download | libssh-c0e091a52f8521d0cdcb9c22b4caa88bbe40e604.tar.gz libssh-c0e091a52f8521d0cdcb9c22b4caa88bbe40e604.tar.xz libssh-c0e091a52f8521d0cdcb9c22b4caa88bbe40e604.zip |
Fix openssl header inclusion
caused cbc_encrypt to be redefined by an openssl
macro
Diffstat (limited to 'include/libssh/crypto.h')
-rw-r--r-- | include/libssh/crypto.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index d838f24..00bb1c9 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -27,6 +27,12 @@ #define _CRYPTO_H_ #include "config.h" + +#ifdef HAVE_LIBGCRYPT +#include <gcrypt.h> +#endif +#include "libssh/wrapper.h" + #ifdef cbc_encrypt #undef cbc_encrypt #endif @@ -34,11 +40,6 @@ #undef cbc_decrypt #endif -#ifdef HAVE_LIBGCRYPT -#include <gcrypt.h> -#endif -#include "libssh/wrapper.h" - struct ssh_crypto_struct { bignum e,f,x,k,y; unsigned char session_id[SHA_DIGEST_LEN]; |