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

Mark global val_mgr as deprecated and fix uses of it to use namespaced version

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 13:08:41 -07:00
parent 3098dd6fbb
commit 86fdf0eaa9
134 changed files with 1579 additions and 1580 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/file_analysis/analyzer/x509/functions.bif
View file

@ -15,7 +15,7 @@ static zeek::RecordValPtr x509_result_record(uint64_t num, const char* reason, z
{
auto rrecord = zeek::make_intrusive<zeek::RecordVal>(zeek::BifType::Record::X509::Result);
rrecord->Assign(0, val_mgr->Int(num));
rrecord->Assign(0, zeek::val_mgr->Int(num));
rrecord->Assign(1, zeek::make_intrusive<zeek::StringVal>(reason));
if ( chainVector )
rrecord->Assign(2, std::move(chainVector));
@ -193,7 +193,7 @@ function x509_get_certificate_string%(cert: opaque of x509, pem: bool &default=F
auto ext_val = file_analysis::X509::GetExtensionFromBIO(bio);
if ( ! ext_val )
ext_val = val_mgr->EmptyString();
ext_val = zeek::val_mgr->EmptyString();
return ext_val;
%}
@ -624,7 +624,7 @@ function sct_verify%(cert: opaque of x509, logid: string, log_key: string, signa
if ( precert && issuer_key_hash->Len() != 32)
{
reporter->Error("Invalid issuer_key_hash length");
return val_mgr->False();
return zeek::val_mgr->False();
}
std::string data;
@ -648,7 +648,7 @@ function sct_verify%(cert: opaque of x509, logid: string, log_key: string, signa
if ( pos < 0 )
{
reporter->Error("NID_ct_precert_scts not found");
return val_mgr->False();
return zeek::val_mgr->False();
}
#else
int num_ext = X509_get_ext_count(x);
@ -743,7 +743,7 @@ function sct_verify%(cert: opaque of x509, logid: string, log_key: string, signa
EVP_MD_CTX_destroy(mdctx);
EVP_PKEY_free(key);
return val_mgr->Bool(success);
return zeek::val_mgr->Bool(success);
sct_verify_err:
if (mdctx)
@ -752,7 +752,7 @@ sct_verify_err:
EVP_PKEY_free(key);
reporter->Error("%s", errstr.c_str());
return val_mgr->False();
return zeek::val_mgr->False();
%}
@ -903,7 +903,7 @@ function x509_set_certificate_cache%(tbl: string_any_table%) : bool
%{
file_analysis::X509::SetCertificateCache({zeek::NewRef{}, tbl->AsTableVal()});
return val_mgr->True();
return zeek::val_mgr->True();
%}
## This function sets up the callback that is called when an entry is matched against the table set
@ -921,5 +921,5 @@ function x509_set_certificate_cache_hit_callback%(f: string_any_file_hook%) : bo
%{
file_analysis::X509::SetCertificateCacheHitCallback({zeek::NewRef{}, f->AsFunc()});
return val_mgr->True();
return zeek::val_mgr->True();
%}