summaryrefslogtreecommitdiff
path: root/cpputil
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2017-06-11 15:56:41 +0100
committerMartin Thomson <martin.thomson@gmail.com>2017-06-11 15:56:41 +0100
commit823d50bdf35175819613c7f810dab7d54293d0f1 (patch)
tree243812b2badd6d1a7cd85a880ad419dff0f9f0b8 /cpputil
parent495ea2280393663ebc576c11a393dc8aa91f5a22 (diff)
parentdc7ad091212db63eed4505c73c937c404250d04d (diff)
downloadnss-hg-823d50bdf35175819613c7f810dab7d54293d0f1.tar.gz
Merge NSS trunk to NSS_TLS13_DRAFT19_BRANCH branch
Diffstat (limited to 'cpputil')
-rw-r--r--cpputil/scoped_ptrs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpputil/scoped_ptrs.h b/cpputil/scoped_ptrs.h
index 0436cd20e..9f224dfc0 100644
--- a/cpputil/scoped_ptrs.h
+++ b/cpputil/scoped_ptrs.h
@@ -35,6 +35,7 @@ struct ScopedDelete {
}
void operator()(PK11URI* uri) { PK11URI_DestroyURI(uri); }
void operator()(PLArenaPool* arena) { PORT_FreeArena(arena, PR_FALSE); }
+ void operator()(PK11Context* context) { PK11_DestroyContext(context, true); }
};
template <class T>
@@ -64,6 +65,7 @@ SCOPED(SECKEYPrivateKey);
SCOPED(SECKEYPrivateKeyList);
SCOPED(PK11URI);
SCOPED(PLArenaPool);
+SCOPED(PK11Context);
#undef SCOPED