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

--HG--
extra : amend_source : 89540ea9804b150775d2f6db5cb43bb121939bfa

lib/freebl/fipsfreebl.c

@@ -2021,12 +2021,6 @@ freebl_fipsPowerUpSelfTest(unsigned int tests)
         /* SHA-X Power-Up SelfTest(s). */
         rv = freebl_fips_SHA_PowerUpSelfTest();
 
-        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();