Ignored leaks update - using simplier patterns.

1 files changed, 23 insertions, 77 deletions

diff --git a/security/nss/tests/memleak/ignored b/security/nss/tests/memleak/ignored
index c2bfbcf46..18fa17e14 100644
--- a/security/nss/tests/memleak/ignored
+++ b/security/nss/tests/memleak/ignored
@@ -1,110 +1,56 @@
 #169313
-*/main/NSS_Initialize/*/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/secmod_ModuleInit/builtinsC_Initialize/NSSCKFWC_Initialize/nssCKFWInstance_Create/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/**
-*/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/secmod_ModuleInit/builtinsC_Initialize/NSSCKFWC_Initialize/nssCKFWInstance_Create/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/**
-*/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/secmod_ModuleInit/builtinsC_Initialize/NSSCKFWC_Initialize/nssCKFWInstance_Create/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/PR_CallOnce/myOnceFunction/PR_NewLock/PR_Calloc/calloc
+**/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/secmod_ModuleInit/builtinsC_Initialize/NSSCKFWC_Initialize/nssCKFWInstance_Create/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/**
 
 #308275
 **/NSSCKFWC_FindObjects/nssCKFWFindObjects_Next/nssCKFWObject_Create/nssCKFWInstance_CreateMutex/nssCKFWMutex_Create/PR_NewLock/**
 
 #367374
-*/main/PR_Init/_PR_ImplicitInitialization/**
-*/main/PR_Init/_PR_InitCMon/ExpandMonitorCache/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitCMon/PR_NewLock/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitLinker/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitTPD/PR_Calloc/calloc
-*/main/PR_Init/_PR_UnixInit/PR_NewLock/PR_Calloc/calloc
-*/main/PR_Init/_PR_UnixInit/PR_NewMonitor/PR_Calloc/calloc
-*/main/PR_Init/nspr_InitializePRErrorTable/PR_ErrorInstallTable/PR_Malloc
-*/main/_PR_InitStuff/PR_ErrorInstallTable
-*/main/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/calloc
-*/main/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/calloc
-*/main/_PR_InitStuff/_PR_InitCMon/PR_NewLock/calloc
-*/main/_PR_InitStuff/_PR_InitLinker/calloc
-*/main/_PR_InitStuff/_PR_InitTPD/calloc
-*/main/_PR_UnixInit/PR_NewLock/calloc
-*/main/_PR_UnixInit/PR_NewMonitor/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitCMon/ExpandMonitorCache/PR_NewMonitor/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitCMon/PR_NewLock/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitLinker/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitLinker/malloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitTPD/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_InitZones/pr_FindSymbolInProg/dlopen@@GLIBC_2.1/**
-*/main/PR_Init/_PR_InitStuff/_PR_UnixInit/PR_NewLock/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/_PR_UnixInit/PR_NewMonitor/PR_Calloc/calloc
-*/main/PR_Init/_PR_InitStuff/nspr_InitializePRErrorTable/PR_ErrorInstallTable/PR_Malloc/malloc
-*/main/PR_Init/_PR_InitLinker/_strdup
-ocspclnt/main/PR_GetSpecialFD/_PR_ImplicitInitialization/**
+**/PR_ErrorInstallTable**
+**/_PR_ImplicitInitialization/**
+**/_PR_InitCMon/ExpandMonitorCache/**
+**/_PR_InitCMon/PR_NewLock/**
+**/_PR_InitLinker/**
+**/_PR_InitTPD/**
+**/_PR_InitZones/pr_FindSymbolInProg/**
+**/_PR_UnixInit/PR_NewLock/**
+**/_PR_UnixInit/PR_NewMonitor/**
 
 #367376
-selfserv/main/launch_threads/PR_CreateThread/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
-selfserv/main/launch_threads/PR_CreateThread/_PR_CreateThread/PR_Calloc/calloc
-selfserv/main/launch_threads/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
-selfserv/main/PR_CreateThread/_PR_CreateThread/calloc
-strsclnt/main/client_main/launch_thread/PR_CreateThread/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
-strsclnt/main/client_main/launch_thread/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
+**/_PR_CreateThread/**
 
 #367384
 **/pr_LoadLibraryByPathname/**
 
 #370536
-*/main/NSS_Shutdown/STAN_Shutdown/NSSTrustDomain_Destroy/nssListIterator_Destroy/nssList_Destroy/NSSArena_Destroy/nssArena_Destroy/arena_remove_pointer/nssPointerTracker_remove/PL_HashTableRemove/PL_HashTableRawRemove/DefaultAllocTable/**
-*/main/NSS_Shutdown/STAN_Shutdown/NSSTrustDomain_Destroy/nssList_Clear/token_destructor/nssToken_Destroy/nssArena_Destroy/arena_remove_pointer/nssPointerTracker_remove/PL_HashTableRemove/PL_HashTableRawRemove/DefaultAllocTable/**
-*/main/*/*/STAN_LoadDefaultNSS3TrustDomain/NSSTrustDomain_Create/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/**
+**/nssArena_Destroy/arena_remove_pointer/nssPointerTracker_remove/PL_HashTableRemove/PL_HashTableRawRemove/DefaultAllocTable/**
+**/NSSArena_Create/nssArena_Create/arena_add_pointer/nssPointerTracker_initialize/call_once/**
 
 #391770
 */main/**/OCSP_InitGlobal/PR_NewMonitor/**
 
 #391774
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Mutex_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Mutex_Create/PKIX_PL_Object_Alloc/PR_NewLock/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Mutex_Create/PR_NewLock/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/PKIX_PL_Object_Alloc/PR_NewLock/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_HashTable_Create/pkix_pl_PrimHashTable_Create/PKIX_PL_Malloc/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_Initialize/PKIX_PL_NssContext_Create/PKIX_PL_Malloc/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_Initialize/PR_NewLock/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PKIX_PL_Object_Alloc/PKIX_PL_Malloc/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PKIX_PL_Object_Alloc/PR_NewLock/**
-*/main/NSS_Initialize/*/PKIX_Initialize/PKIX_PL_MonitorLock_Create/PR_NewMonitor/**
+**/PKIX_Initialize/PKIX_PL_HashTable_Create/**
+**/PKIX_Initialize/PKIX_PL_Initialize/**
+**/PKIX_Initialize/PKIX_PL_MonitorLock_Create/**
 
 #393181
-ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_Strdup/**
-ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_Strdup_Util**
-ocspclnt/main/CERT_SetOCSPDefaultResponder/ocsp_InitStatusChecking/PORT_ZAlloc/**
-ocspclnt/main/CERT_SetOCSPDefaultResponder/ocsp_InitStatusChecking/PORT_ZAlloc_Util/**
-ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_ZAlloc/**
-ocspclnt/main/CERT_SetOCSPDefaultResponder/PORT_ZAlloc_Util/**
+ocspclnt/main/CERT_SetOCSPDefaultResponder/**
 
 #393183
 ocspclnt/main/PL_CreateOptState**
 
 #397478
-selfserv/main/SSL_ConfigServerSessionIDCache/ssl_InitClientSessionCacheLock/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
-selfserv/main/SSL_ConfigServerSessionIDCache/ssl_InitSymWrapKeysLock/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
-selfserv/main/SSL_ConfigServerSessionIDCache/__nss_InitLock/PR_NewLock/calloc
+selfserv/main/SSL_ConfigServerSessionIDCache/**
 
 #397483
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/PR_CallOnce/InitializeArenas/PR_NewLock/**
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc_Util/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc_Util/PL_ArenaAllocate/PR_CallOnce/InitializeArenas/PR_NewLock/**
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
-*/main/*/*/SECMOD_LoadModule/SECMOD_CreateModule/PORT_ArenaAlloc_Util/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
-ocspclnt/main/NSS_Init/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
-ocspclnt/main/NSS_Init/SECMOD_LoadModule/SECMOD_CreateModule/secmod_NewModule/PORT_ArenaAlloc_Util/PL_ArenaAllocate/LockArena/PR_CallOnce/InitializeArenas/PR_NewLock/**
+**/PR_CallOnce/InitializeArenas/PR_NewLock/**
 
 #397486
-strsclnt/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/lock_cache/ssl_InitClientSessionCacheLock/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
-strsclnt/clone/start_thread/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/lock_cache/ssl_InitClientSessionCacheLock/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
-strsclnt/clone/start_thread/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/lock_cache/ssl_InitClientSessionCacheLock/__nss_InitLock_Util/PR_NewLock/PR_Calloc/calloc
-strsclnt/clone/start_thread/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_HandleServerHelloMessage/mySSLAuthCertificate/SSL_AuthCertificate/CERT_VerifyCertNow/CERT_VerifyCert/CERT_VerifyCertChain/cert_VerifyCertChain/cert_VerifyCertChainPkix/cert_BuildAndValidateChain/PKIX_BuildChain/pkix_Build_InitiateBuildChain/pkix_BuildForwardDepthFirstSearch/pkix_Build_VerifyCertificate/PKIX_PL_Cert_IsCertTrusted/pkix_pl_Pk11CertStore_CheckTrust/CERT_GetCertTrust/CERT_LockCertTrust/__nss_InitLock_Util/PR_NewLock/PR_Calloc/calloc
-strsclnt/clone/start_thread/_pt_root/thread_wrapper/do_connects/handle_connection/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl_GatherRecord1stHandshake/ssl3_GatherCompleteHandshake/ssl3_HandleRecord/ssl3_HandleHandshake/ssl3_HandleHandshakeMessage/ssl3_HandleCertificate/mySSLAuthCertificate/SSL_AuthCertificate/CERT_VerifyCertNow/CERT_VerifyCert/CERT_VerifyCertChain/cert_VerifyCertChain/cert_VerifyCertChainPkix/cert_BuildAndValidateChain/PKIX_BuildChain/pkix_Build_InitiateBuildChain/pkix_BuildForwardDepthFirstSearch/pkix_Build_VerifyCertificate/PKIX_PL_Cert_IsCertTrusted/pkix_pl_Pk11CertStore_CheckTrust/CERT_GetCertTrust/CERT_LockCertTrust/__nss_InitLock_Util/PR_NewLock/PR_Calloc/calloc
-strsclnt/_lwp_start/_thr_setup/_pt_root/thread_wrapper/do_connects/PR_Send/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/__nss_InitLock/PR_NewLock/PR_Calloc/calloc
-strsclnt/_lwp_start/_pt_root/thread_wrapper/do_connects/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/__nss_InitLock/PR_NewLock/calloc
-ocspclnt/main/CERT_EnableOCSPDefaultResponder/CERT_VerifyCertificateNow/CERT_VerifyCertificate/cert_VerifyCertChain/cert_VerifyCertChainPkix/cert_BuildAndValidateChain/PKIX_BuildChain/pkix_Build_InitiateBuildChain/pkix_BuildForwardDepthFirstSearch/pkix_Build_VerifyCertificate/PKIX_PL_Cert_IsCertTrusted/pkix_pl_Pk11CertStore_CheckTrust/CERT_GetCertTrust/CERT_LockCertTrust/__nss_InitLock_Util/PR_NewLock/PR_Calloc/calloc
+**/ssl_Send/ssl_SecureSend/ssl_Do1stHandshake/ssl2_BeginClientHandshake/ssl_LookupSID/**
 
 #397487
 **/__rpc_getconfip/setnetconfig/**
 
+#399304
+**/CERT_LockCertTrust/**
+