Fix openssl header inclusion

caused cbc_encrypt to be redefined by an openssl
macro
This commit is contained in:
Aris Adamantiadis
2009-11-03 21:03:22 +01:00
parent cce34a6176
commit c0e091a52f
2 changed files with 7 additions and 7 deletions

View File

@@ -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];

View File

@@ -37,10 +37,9 @@
#endif
#include "libssh/priv.h"
#include "libssh/crypto.h"
#include "libssh/session.h"
#include "libssh/wrapper.h"
#include "libssh/crypto.h"
uint32_t packet_decrypt_len(ssh_session session, char *crypted){
uint32_t decrypted;