diff options
| author | Jonas Allmann <jallmann@mozilla.com> | 2017-11-16 09:32:08 +0100 |
|---|---|---|
| committer | Jonas Allmann <jallmann@mozilla.com> | 2017-11-16 09:32:08 +0100 |
| commit | cb9cb60973930178752706d36053f474c1671256 (patch) | |
| tree | dd2471020f141b3a0298506fdbcaee6de28292aa | |
| parent | d6405af8abdac31bc81c553c13e22d2d4a2c4acc (diff) | |
| download | nss-hg-cb9cb60973930178752706d36053f474c1671256.tar.gz | |
Bug 1397666, removed stray NSS_ENABLE_ECC, r=franziskus
Reviewers: franziskus
Reviewed By: franziskus
Bug #: 1397666
Differential Revision: https://phabricator.services.mozilla.com/D234
| -rw-r--r-- | cmd/fipstest/runtest.sh | 3 | ||||
| -rw-r--r-- | lib/freebl/fipsfreebl.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/cmd/fipstest/runtest.sh b/cmd/fipstest/runtest.sh index 99cefed77..5f8e66a08 100644 --- a/cmd/fipstest/runtest.sh +++ b/cmd/fipstest/runtest.sh @@ -7,9 +7,6 @@ TESTDIR=${1-.} COMMAND=${2-run} TESTS="aes aesgcm dsa ecdsa hmac tls rng rsa sha tdea" -if [ ${NSS_ENABLE_ECC}x = 1x ]; then - TESTS=${TESTS} ecdsa -fi for i in $TESTS do echo "********************Running $i tests" diff --git a/lib/freebl/fipsfreebl.c b/lib/freebl/fipsfreebl.c index a57de05e0..2328a677f 100644 --- a/lib/freebl/fipsfreebl.c +++ b/lib/freebl/fipsfreebl.c @@ -16,9 +16,7 @@ #include "secerr.h" #include "prtypes.h" -#ifdef NSS_ENABLE_ECC #include "ec.h" /* Required for ECDSA */ -#endif /* * different platforms have different ways of calling and initial entry point @@ -1078,8 +1076,6 @@ rsa_loser: return (SECFailure); } -#ifdef NSS_ENABLE_ECC - static SECStatus freebl_fips_ECDSA_Test(ECParams *ecparams, const PRUint8 *knownSignature, @@ -1276,8 +1272,6 @@ freebl_fips_ECDSA_PowerUpSelfTest() return (SECSuccess); } -#endif /* NSS_ENABLE_ECC */ - static SECStatus freebl_fips_DSA_PowerUpSelfTest(void) { @@ -1560,13 +1554,11 @@ freebl_fipsPowerUpSelfTest(unsigned int tests) if (rv != SECSuccess) return rv; -#ifdef NSS_ENABLE_ECC /* ECDSA Power-Up SelfTest(s). */ rv = freebl_fips_ECDSA_PowerUpSelfTest(); if (rv != SECSuccess) return rv; -#endif } /* Passed Power-Up SelfTest(s). */ return (SECSuccess); |