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

Replace errors when parsing x509 certs with weirds (as requested by Seth).

Browse source 
The one I did not replace is a malloc issue which I think really should
raise an error.
This commit is contained in:
Bernhard Amann 2014-05-14 15:53:26 -07:00
parent 5bd0c3fcaf
commit 746c073729
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/file_analysis/analyzer/x509/X509.cc
View file

@ -46,7 +46,7 @@ bool file_analysis::X509::EndOfFile()
::X509* ssl_cert = d2i_X509(NULL, &cert_char, cert_data.size()); ::X509* ssl_cert = d2i_X509(NULL, &cert_char, cert_data.size());
if ( ! ssl_cert ) if ( ! ssl_cert )
{ {
reporter->Error("Could not parse X509 certificate (fuid %s)", GetFile()->GetID().c_str()); reporter->Weird(fmt("Could not parse X509 certificate (fuid %s)", GetFile()->GetID().c_str()));
return false; return false;
} }
@ -171,7 +171,7 @@ StringVal* file_analysis::X509::GetExtensionFromBIO(BIO* bio)
{ {
char tmp[120]; char tmp[120];
ERR_error_string_n(ERR_get_error(), tmp, sizeof(tmp)); ERR_error_string_n(ERR_get_error(), tmp, sizeof(tmp));
reporter->Error("X509::GetExtensionFromBIO: %s", tmp); reporter->Weird(fmt("X509::GetExtensionFromBIO: %s", tmp));
BIO_free_all(bio); BIO_free_all(bio);
return 0; return 0;
} }
@ -279,7 +279,7 @@ void file_analysis::X509::ParseBasicConstraints(X509_EXTENSION* ex)
} }
else else
reporter->Error("Certificate with invalid BasicConstraint. fuid %s", GetFile()->GetID().c_str()); reporter->Weird(fmt("Certificate with invalid BasicConstraint. fuid %s", GetFile()->GetID().c_str()));
} }
void file_analysis::X509::ParseSAN(X509_EXTENSION* ext) void file_analysis::X509::ParseSAN(X509_EXTENSION* ext)
@ -289,7 +289,7 @@ void file_analysis::X509::ParseSAN(X509_EXTENSION* ext)
GENERAL_NAMES *altname = (GENERAL_NAMES*)X509V3_EXT_d2i(ext); GENERAL_NAMES *altname = (GENERAL_NAMES*)X509V3_EXT_d2i(ext);
if ( ! altname ) if ( ! altname )
{ {
reporter->Error("Could not parse subject alternative names. fuid %s", GetFile()->GetID().c_str()); reporter->Weird(fmt("Could not parse subject alternative names. fuid %s", GetFile()->GetID().c_str()));
return; return;
} }
@ -309,7 +309,7 @@ void file_analysis::X509::ParseSAN(X509_EXTENSION* ext)
{ {
if ( ASN1_STRING_type(gen->d.ia5) != V_ASN1_IA5STRING ) if ( ASN1_STRING_type(gen->d.ia5) != V_ASN1_IA5STRING )
{ {
reporter->Error("DNS-field does not contain an IA5String. fuid %s", GetFile()->GetID().c_str()); reporter->Weird(fmt("DNS-field does not contain an IA5String. fuid %s", GetFile()->GetID().c_str()));
continue; continue;
} }
@ -356,7 +356,7 @@ void file_analysis::X509::ParseSAN(X509_EXTENSION* ext)
else else
{ {
reporter->Error("Weird IP address length %d in subject alternative name. fuid %s", gen->d.ip->length, GetFile()->GetID().c_str()); reporter->Weird(fmt("Weird IP address length %d in subject alternative name. fuid %s", gen->d.ip->length, GetFile()->GetID().c_str()));
continue; continue;
} }
} }