diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
| commit | 6b2bba06b433fb75979ab6daf7bbe8bc76c53875 (patch) | |
| tree | 75803b4683889e6e0d2a3faef30415db3ff7b3ba /security/nss/lib/freebl/manifest.mn | |
| parent | 72def35cd0cf3649b6d7ab72b66117df3e1c33fc (diff) | |
| parent | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (diff) | |
| download | UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.gz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.lz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.xz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1
Diffstat (limited to 'security/nss/lib/freebl/manifest.mn')
| -rw-r--r-- | security/nss/lib/freebl/manifest.mn | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn index e4c9ab0b7..bf8144218 100644 --- a/security/nss/lib/freebl/manifest.mn +++ b/security/nss/lib/freebl/manifest.mn @@ -1,10 +1,10 @@ -# +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # NOTE: any ifdefs in this file must be defined on the gmake command line -# (if anywhere). They cannot come from Makefile or config.mk +# (if anywhere). They cannot come from Makefile or config.mk CORE_DEPTH = ../.. @@ -75,7 +75,7 @@ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \ -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" \ -DSOFTOKEN_SHLIB_VERSION=\"$(SOFTOKEN_LIBRARY_VERSION)\" -REQUIRES = +REQUIRES = EXPORTS = \ blapit.h \ @@ -86,7 +86,6 @@ EXPORTS = \ PRIVATE_EXPORTS = \ alghmac.h \ - blake2b.h \ blapi.h \ chacha20poly1305.h \ hmacct.h \ @@ -103,13 +102,16 @@ MPI_SRCS = mpprime.c mpmontg.c mplogic.c mpi.c mp_gf2m.c ECL_HDRS = ecl-exp.h ecl.h ecp.h ecl-priv.h +ifndef NSS_DISABLE_ECC ECL_SRCS = ecl.c ecl_mult.c ecl_gf.c \ ecp_aff.c ecp_jac.c ecp_mont.c \ ec_naf.c ecp_jm.c ecp_256.c ecp_384.c ecp_521.c \ ecp_256_32.c ecp_25519.c +else +ECL_SRCS = $(NULL) +endif SHA_SRCS = sha_fast.c MPCPU_SRCS = mpcpucache.c -VERIFIED_SRCS = $(NULL) CSRCS = \ freeblver.c \ @@ -124,8 +126,6 @@ CSRCS = \ alg2268.c \ arcfour.c \ arcfive.c \ - crypto_primitives.c \ - blake2b.c \ desblapi.c \ des.c \ drbg.c \ @@ -153,7 +153,6 @@ CSRCS = \ $(MPI_SRCS) \ $(MPCPU_SRCS) \ $(ECL_SRCS) \ - $(VERIFIED_SRCS) \ $(STUBS_SRCS) \ $(LOWHASH_SRCS) \ $(EXTRA_SRCS) \ @@ -163,7 +162,6 @@ ALL_CSRCS := $(CSRCS) ALL_HDRS = \ alghmac.h \ - blake2b.h \ blapi.h \ blapit.h \ des.h \ @@ -180,6 +178,12 @@ ALL_HDRS = \ $(NULL) +ifdef AES_GEN_TBL +DEFINES += -DRIJNDAEL_GENERATE_TABLES +else +ifdef AES_GEN_TBL_M +DEFINES += -DRIJNDAEL_GENERATE_TABLES_MACRO +else ifdef AES_GEN_VAL DEFINES += -DRIJNDAEL_GENERATE_VALUES else @@ -189,3 +193,5 @@ else DEFINES += -DRIJNDAEL_INCLUDE_TABLES endif endif +endif +endif |