Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'origin/fastpath'

Browse source
This commit is contained in:
Robin Sommer 2010-12-08 04:01:40 -08:00
commit c690a8b2f3
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -2,6 +2,11 @@
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
1.6-dev.2 Wed Dec 8 03:57:03 PST 2010
- Compatibility fix for OpenSSL 1.0.0 (Christian Kreibich, Gregor
Maier).
1.6-dev.1 Sat Nov 27 12:19:47 PST 2010 1.6-dev.1 Sat Nov 27 12:19:47 PST 2010
- Merge with Subversion repository as of r7098. Incorporated changes: - Merge with Subversion repository as of r7098. Incorporated changes:

2
VERSION
View file

@ -1 +1 @@
1.6-dev.1 1.6-dev.2

6
src/X509.cc
View file

@ -192,7 +192,7 @@ int X509_Cert::verifyChain(Contents_SSL* e, const u_char* data, uint32 len)
// but in chain format). // but in chain format).
// Init the stack. // Init the stack.
STACK_OF(X509)* untrustedCerts = sk_new_null(); STACK_OF(X509)* untrustedCerts = sk_X509_new_null();
if ( ! untrustedCerts ) if ( ! untrustedCerts )
{ {
// Internal error allocating stack of untrusted certs. // Internal error allocating stack of untrusted certs.
@ -233,7 +233,7 @@ int X509_Cert::verifyChain(Contents_SSL* e, const u_char* data, uint32 len)
else else
// The remaining certificates (if any) are put into // The remaining certificates (if any) are put into
// the list of untrusted certificates // the list of untrusted certificates
sk_push(untrustedCerts, (char*) pTemp); sk_X509_push(untrustedCerts, pTemp);
tempLength += certLength + 3; tempLength += certLength + 3;
} }
@ -259,7 +259,7 @@ int X509_Cert::verifyChain(Contents_SSL* e, const u_char* data, uint32 len)
// Free the stack, incuding. contents. // Free the stack, incuding. contents.
// FIXME: could this break Bro's memory tracking? // FIXME: could this break Bro's memory tracking?
sk_pop_free(untrustedCerts, free); sk_X509_pop_free(untrustedCerts, X509_free);
return ret; return ret;
} }

6
src/ssl-analyzer.pac
View file

@ -370,7 +370,7 @@ refine analyzer SSLAnalyzer += {
STACK_OF(X509)* untrusted_certs = 0; STACK_OF(X509)* untrusted_certs = 0;
if ( certificates->size() > 1 ) if ( certificates->size() > 1 )
{ {
untrusted_certs = sk_new_null(); untrusted_certs = sk_X509_new_null();
if ( ! untrusted_certs ) if ( ! untrusted_certs )
{ {
// X509_V_ERR_OUT_OF_MEM; // X509_V_ERR_OUT_OF_MEM;
@ -393,7 +393,7 @@ refine analyzer SSLAnalyzer += {
return false; return false;
} }
sk_push(untrusted_certs, (char*) pTemp); sk_X509_push(untrusted_certs, pTemp);
} }
} }
@ -405,7 +405,7 @@ refine analyzer SSLAnalyzer += {
certificate_error(csc.error); certificate_error(csc.error);
X509_STORE_CTX_cleanup(&csc); X509_STORE_CTX_cleanup(&csc);
sk_pop_free(untrusted_certs, free_X509); sk_X509_pop_free(untrusted_certs, X509_free);
} }
X509_free(pCert); X509_free(pCert);