Bug 1588567 - enable mozilla::pkix gtests in NSS r=jcj

Differential Revision: https://phabricator.services.mozilla.com/D49184 --HG-- extra : moz-landing-system : lando
sailfishos-mirror · Nov 1, 2019 · 03c4635 · 03c4635
1 parent a945332
commit 03c4635
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/gtests/mozpkix_gtest/pkixcheck_CheckKeyUsage_tests.cpp b/gtests/mozpkix_gtest/pkixcheck_CheckKeyUsage_tests.cpp
@@ -166,8 +166,8 @@ void ASSERT_SimpleCase(uint8_t unusedBits, uint8_t bits, KeyUsage usage)
 
   // Test that none of the other non-padding bits are mistaken for the given
   // key usage in the single-byte value case.
-  NAMED_SIMPLE_KU(notGood, unusedBits,
-                  static_cast<uint8_t>((~bits >> unusedBits) << unusedBits));
+  uint8_t paddingBits = (static_cast<uint8_t>(~bits) >> unusedBits) << unusedBits;
+  NAMED_SIMPLE_KU(notGood, unusedBits, paddingBits);
   ASSERT_BAD(CheckKeyUsage(EndEntityOrCA::MustBeEndEntity, &notGood, usage));
   ASSERT_BAD(CheckKeyUsage(EndEntityOrCA::MustBeCA, &notGood, usage));
 

diff --git a/lib/mozpkix/test-lib/pkixtestnss.cpp b/lib/mozpkix/test-lib/pkixtestnss.cpp
@@ -236,7 +236,7 @@ GenerateKeyPairInner()
   }
   PK11RSAGenParams params;
   params.keySizeInBits = 2048;
-  params.pe = 3;
+  params.pe = 65537;
 
   // Bug 1012786: PK11_GenerateKeyPair can fail if there is insufficient
   // entropy to generate a random key. Attempting to add some entropy and

diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh
@@ -64,8 +64,14 @@ gtest_start()
     pushd "$DIR"
     GTESTREPORT="$DIR/report.xml"
     PARSED_REPORT="$DIR/report.parsed"
+    # The mozilla::pkix gtests cause an ODR violation that we ignore.
+    # See bug 1588567.
+    if [ "$i" = "mozpkix_gtest" ]; then
+      EXTRA_ASAN_OPTIONS="detect_odr_violation=0"
+    fi
     echo "executing $i"
-    "${BINDIR}/$i" "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
+    ASAN_OPTIONS="$ASAN_OPTIONS:$EXTRA_ASAN_OPTIONS" "${BINDIR}/$i" \
+                 "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
                  -d "$DIR" -w --gtest_output=xml:"${GTESTREPORT}" \
                               --gtest_filter="${GTESTFILTER:-*}"
     html_msg $? 0 "$i run successfully"
@@ -93,7 +99,7 @@ gtest_cleanup()
 }
 
 ################## main #################################################
-GTESTS="${GTESTS:-prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest smime_gtest}"
+GTESTS="${GTESTS:-prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest smime_gtest mozpkix_gtest}"
 gtest_init "$0"
 gtest_start
 gtest_cleanup