Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes CVE-2017-7805, CVE-2017-5461, CVE-2016-1938, and CVE-2015-7575
- Loading branch information
Showing
7 changed files
with
60 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- nss/lib/ckfw/pem/pobject.c.orig 2014-01-23 16:28:18.000000000 +0200 | ||
+++ nss/lib/ckfw/pem/pobject.c 2017-11-23 10:27:54.223998464 +0200 | ||
@@ -630,6 +630,11 @@ pem_DestroyInternalObject | ||
if (io->u.key.ivstring) | ||
free(io->u.key.ivstring); | ||
break; | ||
+ case pemAll: | ||
+ /* pemAll is not used, keep the compiler happy | ||
+ * TODO: investigate a proper solution | ||
+ */ | ||
+ return; | ||
} | ||
|
||
if (NULL != gobj) | ||
@@ -1044,7 +1049,9 @@ pem_CreateObject | ||
int nobjs = 0; | ||
int i; | ||
int objid; | ||
+#if 0 | ||
pemToken *token; | ||
+#endif | ||
int cipher; | ||
char *ivstring = NULL; | ||
pemInternalObject *listObj = NULL; | ||
@@ -1073,7 +1080,9 @@ pem_CreateObject | ||
} | ||
slotID = nssCKFWSlot_GetSlotID(fwSlot); | ||
|
||
+#if 0 | ||
token = (pemToken *) mdToken->etc; | ||
+#endif | ||
|
||
/* | ||
* only create keys and certs. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters