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

simplify some code

Browse source
This commit is contained in:
Liang Zhu 2015-08-18 16:00:55 -07:00
parent adbc0b1eaf
commit ce47024dd9
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/file_analysis/analyzer/ocsp/OCSP.cc
View file

@ -413,9 +413,7 @@ RecordVal *file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val)
OCSP_RESPID *resp_id = NULL; OCSP_RESPID *resp_id = NULL;
OCSP_SINGLERESP *single_resp = NULL; OCSP_SINGLERESP *single_resp = NULL;
OCSP_REVOKEDINFO *revoked_info = NULL; OCSP_REVOKEDINFO *revoked_info = NULL;
OCSP_CERTSTATUS *cert_status = NULL;
//OCSP_CERTSTATUS *cst = NULL;
//OCSP_REVOKEDINFO *rev = NULL;
RecordVal *ocsp_resp_record = NULL; RecordVal *ocsp_resp_record = NULL;
VectorVal *all_resp_bro = NULL; VectorVal *all_resp_bro = NULL;
@ -496,24 +494,22 @@ RecordVal *file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val)
ocsp_fill_cert_id(cert_id, single_resp_bro); ocsp_fill_cert_id(cert_id, single_resp_bro);
//certStatus //certStatus
string cert_status_str = OCSP_cert_status_str(single_resp->certStatus->type); cert_status = single_resp->certStatus;
string revoke_reason = ""; std::string cert_status_str = OCSP_cert_status_str(cert_status->type);
string revoke_time = ""; std::string revoke_reason = "";
std::string revoke_time = "";
//add revocation time and reason if it is revoked //add revocation time and reason if it is revoked
if (single_resp->certStatus->type == V_OCSP_CERTSTATUS_REVOKED) if (cert_status->type == V_OCSP_CERTSTATUS_REVOKED)
{ {
revoked_info = single_resp->certStatus->value.revoked; revoked_info = cert_status->value.revoked;
len = -1; len = -1;
len = ASN1_GENERALIZEDTIME_to_cstr(buf, buf_len, (void *)(revoked_info->revocationTime)); len = ASN1_GENERALIZEDTIME_to_cstr(buf, buf_len, (void *)(revoked_info->revocationTime));
if (len > 0) if (len > 0)
revoke_time.assign((const char *)buf, len); revoke_time.assign((const char *)buf, len);
if (revoked_info->revocationReason) if (revoked_info->revocationReason)
{ revoke_reason = OCSP_crl_reason_str(ASN1_ENUMERATED_get(revoked_info->revocationReason));
long l = ASN1_ENUMERATED_get(revoked_info->revocationReason);
revoke_reason = OCSP_crl_reason_str(l);
}
} }
if (revoke_time.length() > 0) if (revoke_time.length() > 0)
cert_status_str += " " + revoke_time; cert_status_str += " " + revoke_time;