diff --git a/src/File.cc b/src/File.cc index 437370205a..674d096fb2 100644 --- a/src/File.cc +++ b/src/File.cc @@ -663,7 +663,7 @@ void BroFile::InitEncrypt(const char* keyfile) unsigned char secret[EVP_PKEY_size(pub_key)]; unsigned char* psecret = secret; - unsigned long secret_len; + unsigned int secret_len; int iv_len = EVP_CIPHER_iv_length(cipher_type); unsigned char iv[iv_len]; diff --git a/src/RemoteSerializer.h b/src/RemoteSerializer.h index 31ee7e9143..f849a6a2b5 100644 --- a/src/RemoteSerializer.h +++ b/src/RemoteSerializer.h @@ -324,6 +324,7 @@ private: PeerID current_id; char current_msgtype; ChunkedIO::Chunk* current_args; + double last_flush; id_list sync_ids; diff --git a/src/Serializer.cc b/src/Serializer.cc index a29cb93b77..d38e8b3976 100644 --- a/src/Serializer.cc +++ b/src/Serializer.cc @@ -1145,7 +1145,7 @@ Packet* Packet::Unserialize(UnserialInfo* info) if ( ! info->s->Read((char**) &tag, 0, "tag") ) return 0; - u_char* pkt; + char* pkt; int caplen; if ( ! info->s->Read((char**) &pkt, &caplen, "data") ) { @@ -1155,7 +1155,7 @@ Packet* Packet::Unserialize(UnserialInfo* info) hdr->caplen = uint32(caplen); p->hdr = hdr; - p->pkt = pkt; + p->pkt = (u_char*) pkt; p->tag = tag; p->hdr_size = get_link_header_size(p->link_type); diff --git a/src/Sessions.cc b/src/Sessions.cc index 3825f35f62..1d2604b8db 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -1052,7 +1052,7 @@ Connection* NetSessions::NewConn(HashKey* k, double t, const ConnID* id, int flags = 0; // Hmm... This is not great. - TransportProto tproto; + TransportProto tproto = TRANSPORT_UNKNOWN; switch ( proto ) { case IPPROTO_ICMP: tproto = TRANSPORT_ICMP; diff --git a/src/Val.cc b/src/Val.cc index 43288e99e2..6a844c5df2 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -2497,7 +2497,7 @@ bool TableVal::DoSerialize(SerialInfo* info) const IterCookie* c; TableEntryVal* v; // current value bool did_index; // already wrote the val's index - }* state; + }* state = 0; PDict(TableEntryVal)* tbl = const_cast(this)->AsNonConstTable(); diff --git a/src/nb_dns.c b/src/nb_dns.c index 6f42004dd0..475ba3b8b0 100644 --- a/src/nb_dns.c +++ b/src/nb_dns.c @@ -434,7 +434,7 @@ nb_dns_activity(struct nb_dns_info *nd, struct nb_dns_result *nr, char *errstr) register char **ap, **hap; register u_int16_t id; register const u_char *rdata; - register u_int32_t rttl; + register u_int32_t rttl = 0; // make compiler happy. register struct hostent *he; register size_t rdlen; ns_msg handle; diff --git a/src/ssl-analyzer.pac b/src/ssl-analyzer.pac index 232bb30ab4..6471d9c4a4 100644 --- a/src/ssl-analyzer.pac +++ b/src/ssl-analyzer.pac @@ -268,21 +268,21 @@ refine connection SSL_Conn += { int num_ext = X509_get_ext_count(pTemp); for ( int k = 0; k < num_ext; ++k ) { - char *pBuffer = 0; + unsigned char *pBuffer = 0; int length = 0; X509_EXTENSION* ex = X509_get_ext(pTemp, k); if (ex) { ASN1_STRING *pString = X509_EXTENSION_get_data(ex); - length = ASN1_STRING_to_UTF8((unsigned char**)&pBuffer, pString); + length = ASN1_STRING_to_UTF8(&pBuffer, pString); //i2t_ASN1_OBJECT(&pBuffer, length, obj) // -1 indicates an error. if ( length < 0 ) continue; - StringVal* value = new StringVal(length, pBuffer); + StringVal* value = new StringVal(length, (char*)pBuffer); BifEvent::generate_x509_extension(bro_analyzer(), bro_analyzer()->Conn(), value); OPENSSL_free(pBuffer);