Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge with origin/topic/cmake-port.

Browse source 
Needed to readd the broctl/broccoli/binpac submodules manually, as
git seemed to get confused by the existing directories.
This commit is contained in:
Robin Sommer 2010-11-24 21:02:08 -08:00
parent c1768336c4
commit 610d081c4b
125 changed files with 2304 additions and 7592 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/File.h
View file

@ -10,7 +10,6 @@
#include "Obj.h"
#include "Attr.h"
#ifdef USE_OPENSSL
# ifdef NEED_KRB5_H
# include <krb5.h>
# endif // NEED_KRB5_H
@ -19,7 +18,6 @@ extern "C" {
# include "openssl/pem.h"
# include "openssl/err.h"
}
#endif
class BroType;
class RotateTimer;
@ -149,13 +147,11 @@ protected:
static double default_rotation_interval;
static double default_rotation_size;
#ifdef USE_OPENSSL
EVP_PKEY* pub_key;
EVP_CIPHER_CTX* cipher_ctx;
static const int MIN_BUFFER_SIZE = 1024;
unsigned char* cipher_buffer;
#endif
};