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

extract most specific common name from certificates

Browse source
This commit is contained in:
Johanna Amann 2015-03-03 16:09:54 -08:00
parent 6fa03abdbc
commit 252d57fd2c
2 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/base/init-bare.bro
View file

@ -2778,6 +2778,7 @@ export {
serial: string; ##< Serial number. serial: string; ##< Serial number.
subject: string; ##< Subject. subject: string; ##< Subject.
issuer: string; ##< Issuer. issuer: string; ##< Issuer.
cn: string &optional; ##< Last (most specific) common name.
not_valid_before: time; ##< Timestamp before when certificate is not valid. not_valid_before: time; ##< Timestamp before when certificate is not valid.
not_valid_after: time; ##< Timestamp after when certificate is not valid. not_valid_after: time; ##< Timestamp after when certificate is not valid.
key_alg: string; ##< Name of the key algorithm key_alg: string; ##< Name of the key algorithm

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

@ -104,13 +104,34 @@ RecordVal* file_analysis::X509::ParseCertificate(X509Val* cert_val)
len = BIO_gets(bio, buf, sizeof(buf)); len = BIO_gets(bio, buf, sizeof(buf));
pX509Cert->Assign(2, new StringVal(len, buf)); pX509Cert->Assign(2, new StringVal(len, buf));
BIO_reset(bio); BIO_reset(bio);
X509_NAME *subject_name = X509_get_subject_name(ssl_cert);
// extract the most specific (last) common name from the subject
int namepos = -1;
for ( ;; )
{
int j = X509_NAME_get_index_by_NID(subject_name, NID_commonName, namepos);
if ( j == -1 )
break;
namepos = j;
}
if ( namepos != -1 )
{
// we found a common name
ASN1_STRING_print(bio, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subject_name, namepos)));
len = BIO_gets(bio, buf, sizeof(buf));
pX509Cert->Assign(4, new StringVal(len, buf));
BIO_reset(bio);
}
X509_NAME_print_ex(bio, X509_get_issuer_name(ssl_cert), 0, XN_FLAG_RFC2253); X509_NAME_print_ex(bio, X509_get_issuer_name(ssl_cert), 0, XN_FLAG_RFC2253);
len = BIO_gets(bio, buf, sizeof(buf)); len = BIO_gets(bio, buf, sizeof(buf));
pX509Cert->Assign(3, new StringVal(len, buf)); pX509Cert->Assign(3, new StringVal(len, buf));
BIO_free(bio); BIO_free(bio);
pX509Cert->Assign(4, new Val(GetTimeFromAsn1(X509_get_notBefore(ssl_cert)), TYPE_TIME)); pX509Cert->Assign(5, new Val(GetTimeFromAsn1(X509_get_notBefore(ssl_cert)), TYPE_TIME));
pX509Cert->Assign(5, new Val(GetTimeFromAsn1(X509_get_notAfter(ssl_cert)), TYPE_TIME)); pX509Cert->Assign(6, new Val(GetTimeFromAsn1(X509_get_notAfter(ssl_cert)), TYPE_TIME));
// we only read 255 bytes because byte 256 is always 0. // we only read 255 bytes because byte 256 is always 0.
// if the string is longer than 255, that will be our null-termination, // if the string is longer than 255, that will be our null-termination,
@ -118,28 +139,28 @@ RecordVal* file_analysis::X509::ParseCertificate(X509Val* cert_val)
if ( ! i2t_ASN1_OBJECT(buf, 255, ssl_cert->cert_info->key->algor->algorithm) ) if ( ! i2t_ASN1_OBJECT(buf, 255, ssl_cert->cert_info->key->algor->algorithm) )
buf[0] = 0; buf[0] = 0;
pX509Cert->Assign(6, new StringVal(buf)); pX509Cert->Assign(7, new StringVal(buf));
if ( ! i2t_ASN1_OBJECT(buf, 255, ssl_cert->sig_alg->algorithm) ) if ( ! i2t_ASN1_OBJECT(buf, 255, ssl_cert->sig_alg->algorithm) )
buf[0] = 0; buf[0] = 0;
pX509Cert->Assign(7, new StringVal(buf)); pX509Cert->Assign(8, new StringVal(buf));
// Things we can do when we have the key... // Things we can do when we have the key...
EVP_PKEY *pkey = X509_extract_key(ssl_cert); EVP_PKEY *pkey = X509_extract_key(ssl_cert);
if ( pkey != NULL ) if ( pkey != NULL )
{ {
if ( pkey->type == EVP_PKEY_DSA ) if ( pkey->type == EVP_PKEY_DSA )
pX509Cert->Assign(8, new StringVal("dsa")); pX509Cert->Assign(9, new StringVal("dsa"));
else if ( pkey->type == EVP_PKEY_RSA ) else if ( pkey->type == EVP_PKEY_RSA )
{ {
pX509Cert->Assign(8, new StringVal("rsa")); pX509Cert->Assign(9, new StringVal("rsa"));
char *exponent = BN_bn2dec(pkey->pkey.rsa->e); char *exponent = BN_bn2dec(pkey->pkey.rsa->e);
if ( exponent != NULL ) if ( exponent != NULL )
{ {
pX509Cert->Assign(10, new StringVal(exponent)); pX509Cert->Assign(11, new StringVal(exponent));
OPENSSL_free(exponent); OPENSSL_free(exponent);
exponent = NULL; exponent = NULL;
} }
@ -147,14 +168,14 @@ RecordVal* file_analysis::X509::ParseCertificate(X509Val* cert_val)
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
else if ( pkey->type == EVP_PKEY_EC ) else if ( pkey->type == EVP_PKEY_EC )
{ {
pX509Cert->Assign(8, new StringVal("ecdsa")); pX509Cert->Assign(9, new StringVal("ecdsa"));
pX509Cert->Assign(11, KeyCurve(pkey)); pX509Cert->Assign(12, KeyCurve(pkey));
} }
#endif #endif
unsigned int length = KeyLength(pkey); unsigned int length = KeyLength(pkey);
if ( length > 0 ) if ( length > 0 )
pX509Cert->Assign(9, new Val(length, TYPE_COUNT)); pX509Cert->Assign(10, new Val(length, TYPE_COUNT));
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
} }