diff options
| author | Daiki Ueno <dueno@redhat.com> | 2020-09-05 08:53:40 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2020-09-05 08:53:40 +0200 |
| commit | 31d580cf6fbd78283528070368fb21dd6060eff7 (patch) | |
| tree | dffbaebbbcd72ec3fd55618a0bb786a1c4007613 | |
| parent | 1a57acb46cfdb10a2553f32b14c1c163babb08f8 (diff) | |
| download | nss-hg-31d580cf6fbd78283528070368fb21dd6060eff7.tar.gz | |
Bug 1662738, run RNG self-tests only if NSPR is linked, r=rrelyea
Summary: After the continuous DRBG test was added, RNG self-tests have
no longer worked standalone. This moves the self-tests to the DO_REST
block so it only runs when the program is also linked to NSPR.
Reviewers: rrelyea
Reviewed By: rrelyea
Bug #: 1662738
Differential Revision: https://phabricator.services.mozilla.com/D89250
| -rw-r--r-- | lib/freebl/fipsfreebl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/freebl/fipsfreebl.c b/lib/freebl/fipsfreebl.c index f29f4efd8..23f665a1b 100644 --- a/lib/freebl/fipsfreebl.c +++ b/lib/freebl/fipsfreebl.c @@ -2023,12 +2023,6 @@ freebl_fipsPowerUpSelfTest(unsigned int tests) if (rv != SECSuccess) return rv; - - /* RNG Power-Up SelfTest(s). */ - rv = freebl_fips_RNG_PowerUpSelfTest(); - - if (rv != SECSuccess) - return rv; } /* @@ -2036,6 +2030,12 @@ freebl_fipsPowerUpSelfTest(unsigned int tests) * standalone */ if (tests & DO_REST) { + /* RNG Power-Up SelfTest(s). */ + rv = freebl_fips_RNG_PowerUpSelfTest(); + + if (rv != SECSuccess) + return rv; + /* DES3 Power-Up SelfTest(s). */ rv = freebl_fips_DES3_PowerUpSelfTest(); |