Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[nss] Update to 3.41, fixes jb#36180
- Loading branch information
Marko Kenttälä
committed
Dec 21, 2018
1 parent
ab6de8f
commit 2e33772
Showing
8 changed files
with
86 additions
and
97 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
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,6 @@ | ||
# Add external nss header locations | ||
include_directories(../../dist/public/nss;../../dist/private/nss) | ||
# Find the external library path for linking | ||
execute_process(COMMAND find ${PROJECT_SOURCE_DIR}/../../dist -name libnssckfw.a OUTPUT_VARIABLE NSS_EXT_LIB_PATH) | ||
get_filename_component(NSS_LIB_PATH ${NSS_EXT_LIB_PATH} DIRECTORY) | ||
link_directories(${NSS_LIB_PATH}) |
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 |
---|---|---|
@@ -1,54 +1,42 @@ | ||
diff -up ./nss/lib/sysinit/nsssysinit.c.603313 ./nss/lib/sysinit/nsssysinit.c | ||
--- ./nss/lib/sysinit/nsssysinit.c.603313 2010-10-15 13:57:42.719738316 -0700 | ||
+++ ./nss/lib/sysinit/nsssysinit.c 2010-10-15 14:07:51.704637349 -0700 | ||
@@ -263,16 +263,26 @@ get_list(char *filename, char *stripped_ | ||
--- nss/lib/sysinit/nsssysinit.c 2018-12-19 16:54:54.326850754 +0200 | ||
+++ nss/lib/sysinit/nsssysinit.c 2018-12-19 17:05:34.932687833 +0200 | ||
@@ -231,9 +231,19 @@ | ||
sysdb = getSystemDB(); | ||
userdb = getUserDB(); | ||
|
||
- /* Don't open root's user DB */ | ||
+ /* return a list of databases to open. First the system database */ | ||
+ if (sysdb) { | ||
+ const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly"; | ||
+ module_list[next++] = PR_smprintf( | ||
+ "library= " | ||
+ "module=\"NSS system database\" " | ||
+ "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" " | ||
+ "NSS=\"trustOrder=80 %sflags=internal,critical\"", | ||
+ module_list[next++] = PR_smprintf( | ||
+ "library= " | ||
+ "module=\"NSS system database\" " | ||
+ "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" " | ||
+ "NSS=\"trustOrder=80 %sflags=internal,critical\"", | ||
+ sysdb, readonly, nssflags); | ||
+ } | ||
+ | ||
+ /* Next the user database, but not for root. */ | ||
if (userdb != NULL && !userIsRoot()) { | ||
- /* return a list of databases to open. First the user Database */ | ||
module_list[next++] = PR_smprintf( | ||
"library= " | ||
"module=\"NSS User database\" " | ||
"parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" " | ||
- "NSS=\"trustOrder=75 %sflags=internal%s\"", | ||
- userdb, stripped_parameters, nssflags, | ||
- isFIPS ? ",FIPS" : ""); | ||
+ "NSS=\"trustOrder=75 %sflags=internal%s\"", | ||
+ userdb, stripped_parameters, nssflags, | ||
+ isFIPS ? ",FIPS" : ""); | ||
- /* return a list of databases to open. First the user Database */ | ||
module_list[next++] = PR_smprintf( | ||
"library= " | ||
"module=\"NSS User database\" " | ||
@@ -252,17 +262,6 @@ | ||
userdb, stripped_parameters); | ||
} | ||
|
||
/* now open the user's defined PKCS #11 modules */ | ||
/* skip the local user DB entry */ | ||
@@ -283,17 +293,7 @@ get_list(char *filename, char *stripped_ | ||
"module=\"NSS User database\" " | ||
"parameters=\"configdir='sql:%s' %s\" " | ||
"NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", | ||
- userdb, stripped_parameters); | ||
- } | ||
- | ||
- /* now the system database (always read only unless it's root) */ | ||
- if (sysdb) { | ||
- const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly"; | ||
- module_list[next++] = PR_smprintf( | ||
- "library= " | ||
- "module=\"NSS system database\" " | ||
- "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" " | ||
- "NSS=\"trustOrder=80 %sflags=internal,critical\"",sysdb, readonly, nssflags); | ||
+ userdb, stripped_parameters); | ||
} | ||
- const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly"; | ||
- module_list[next++] = PR_smprintf( | ||
- "library= " | ||
- "module=\"NSS system database\" " | ||
- "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" " | ||
- "NSS=\"trustOrder=80 %sflags=internal,critical\"", | ||
- sysdb, readonly, nssflags); | ||
- } | ||
- | ||
/* that was the last module */ | ||
module_list[next] = 0; | ||
|
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