diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /security/nss/coreconf | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'security/nss/coreconf')
| -rw-r--r-- | security/nss/coreconf/config.gypi | 11 | ||||
| -rw-r--r-- | security/nss/coreconf/coreconf.dep | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi index 13f857cacf..baf4256a87 100644 --- a/security/nss/coreconf/config.gypi +++ b/security/nss/coreconf/config.gypi @@ -136,6 +136,7 @@ 'nss_include_dir%': '/usr/include/nss', 'only_dev_random%': 1, 'disable_fips%': 1, + 'fips_module_id%': '', 'mozpkix_only%': 0, 'mozilla_central%': 0, 'coverage%': 0, @@ -165,12 +166,22 @@ '<(nss_include_dir)', ], }], + [ 'disable_fips==0', { + 'defines': [ + 'NSS_ENABLE_FIPS_INDICATORS', + ], + }], [ 'disable_fips==1', { 'defines': [ 'NSS_FIPS_DISABLED', 'NSS_NO_INIT_SUPPORT', ], }], + [ 'fips_module_id!=""', { + 'defines': [ + 'NSS_FIPS_MODULE_ID="<(fips_module_id)"' + ], + }], [ 'OS!="android" and OS!="mac" and OS!="ios" and OS!="win"', { 'libraries': [ '-lpthread', diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep index 590d1bfaee..5182f75552 100644 --- a/security/nss/coreconf/coreconf.dep +++ b/security/nss/coreconf/coreconf.dep @@ -10,4 +10,3 @@ */ #error "Do not include this header file." - |