shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix openssl header inclusion

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
include/libssh/crypto.h
View File

@@ -27,6 +27,12 @@
#define _CRYPTO_H_ #define _CRYPTO_H_
#include "config.h" #include "config.h"
#ifdef HAVE_LIBGCRYPT
#include <gcrypt.h>
#endif
#include "libssh/wrapper.h"
#ifdef cbc_encrypt #ifdef cbc_encrypt
#undef cbc_encrypt #undef cbc_encrypt
#endif #endif
@@ -34,11 +40,6 @@
#undef cbc_decrypt #undef cbc_decrypt
#endif #endif
#ifdef HAVE_LIBGCRYPT
#include <gcrypt.h>
#endif
#include "libssh/wrapper.h"
struct ssh_crypto_struct { struct ssh_crypto_struct {
bignum e,f,x,k,y; bignum e,f,x,k,y;
unsigned char session_id[SHA_DIGEST_LEN]; unsigned char session_id[SHA_DIGEST_LEN];

3
libssh/crypt.c
View File

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