Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1163364 - Fix -Wnull-conversion warnings about conversion of NULL constant to 'CSSM_CSP_HANDLE'. r=spohl

Browse Source
This commit is contained in:
Chris Peterson 2015-05-06 08:59:14 -07:00
parent 214929420b
commit ba9a9426e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/libmar/verify/MacVerifyCrypto.cpp
View File

@ -95,7 +95,7 @@ static CSSM_VERSION sCssmVersion = {2, 0};
static const CSSM_GUID sMozCssmGuid =
{ 0x9243121f, 0x5820, 0x4b41,
{ 0xa6, 0x52, 0xba, 0xb6, 0x3f, 0x9d, 0x3d, 0x7f }};
static CSSM_CSP_HANDLE sCspHandle = NULL;
static CSSM_CSP_HANDLE sCspHandle = CSSM_INVALID_HANDLE;
void* cssmMalloc (CSSM_SIZE aSize, void* aAllocRef) {
(void)aAllocRef;
@ -410,9 +410,9 @@ CryptoMac_FreePublicKey(CryptoX_PublicKey* aPublicKey)
if (!aPublicKey || !*aPublicKey) {
return;
}
if (!OnLionOrLater() && sCspHandle) {
if (!OnLionOrLater() && sCspHandle != CSSM_INVALID_HANDLE) {
CSSM_ModuleDetach(sCspHandle);
sCspHandle = NULL;
sCspHandle = CSSM_INVALID_HANDLE;
}
CFRelease((SecKeyRef)*aPublicKey);
}