diff options
Diffstat (limited to 'nss/lib/freebl/manifest.mn')
| -rw-r--r-- | nss/lib/freebl/manifest.mn | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/nss/lib/freebl/manifest.mn b/nss/lib/freebl/manifest.mn index 1137e85..1ef9839 100644 --- a/nss/lib/freebl/manifest.mn +++ b/nss/lib/freebl/manifest.mn @@ -10,6 +10,30 @@ CORE_DEPTH = ../.. MODULE = nss +# copied from Linux.mk. We have a chicken and egg issue here. We need to set +# Library name before we call the platform code in coreconf, but we need to +# Pick up the automatic setting of FREEBL_LOWHASH before we can set the +# Library name... so for now we mimic the code in Linux.mk to get the +# automatic setting early... +# +# On Linux 2.6 or later, build libfreebl3.so with no NSPR and libnssutil3.so +# dependencies by default. Set FREEBL_NO_DEPEND to 0 in the environment to +# override this. +# +# +include $(CORE_DEPTH)/coreconf/arch.mk +ifeq ($(OS_ARCH),Linux) +ifneq ($(OS_TARGET),Android) +ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE)))) +ifndef FREEBL_NO_DEPEND +FREEBL_NO_DEPEND = 1 +FREEBL_LOWHASH = 1 +endif +endif +endif +endif + + LIBRARY_NAME = freebl LIBRARY_VERSION = 3 @@ -29,6 +53,13 @@ ifdef FREEBL_CHILD_BUILD ifdef USE_ABI64_FPU LIBRARY_NAME = freebl_64fpu endif + ifdef FREEBL_LOWHASH + LIBRARY_NAME = freeblpriv + endif + ifdef USE_STUB_BUILD + # for the stub build, reset name to the default (from freeblpriv) + LIBRARY_NAME = freebl + endif endif # if the library name contains _, we prefix the version with _ @@ -56,6 +87,7 @@ EXPORTS = \ PRIVATE_EXPORTS = \ alghmac.h \ blapi.h \ + chacha20poly1305.h \ hmacct.h \ secmpi.h \ secrng.h \ @@ -68,17 +100,12 @@ MPI_HDRS = mpi-config.h mpi.h mpi-priv.h mplogic.h mpprime.h logtab.h mp_gf2m.h MPI_SRCS = mpprime.c mpmontg.c mplogic.c mpi.c mp_gf2m.c -ECL_HDRS = ecl-exp.h ecl.h ec2.h ecp.h ecl-priv.h +ECL_HDRS = ecl-exp.h ecl.h ecp.h ecl-priv.h ifndef NSS_DISABLE_ECC ECL_SRCS = ecl.c ecl_curve.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 -ifdef NSS_ECC_MORE_THAN_SUITE_B -ECL_SRCS += ec2_aff.c ec2_mont.c ec2_proj.c \ - ec2_163.c ec2_193.c ec2_233.c \ - ecp_192.c ecp_224.c -endif + ecp_256_32.c ecp_25519.c else ECL_SRCS = $(NULL) endif @@ -101,8 +128,10 @@ CSRCS = \ desblapi.c \ des.c \ drbg.c \ + chacha20poly1305.c \ cts.c \ ctr.c \ + fipsfreebl.c \ gcm.c \ hmacct.c \ rijndael.c \ |