diff options
| author | Kenny Root <kroot@google.com> | 2014-10-17 16:41:47 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-10-17 16:41:51 -0700 |
| commit | 218699c1451b91c24d6f65c8b25cf7ac8fffbf7f (patch) | |
| tree | 1a8763d2f3d10dd3b01741949795d0f03c5c0e42 /luni/src/test/java/com | |
| parent | a96d6871503966e8589ee8d929acc68ee1e4d59c (diff) | |
| download | libcore-218699c1451b91c24d6f65c8b25cf7ac8fffbf7f.zip libcore-218699c1451b91c24d6f65c8b25cf7ac8fffbf7f.tar.gz libcore-218699c1451b91c24d6f65c8b25cf7ac8fffbf7f.tar.bz2 | |
Track change to bouncycastle
Bug: 18013422
Change-Id: Ia5cfe6bf4678048e521c28cfc5f375929379070c
Diffstat (limited to 'luni/src/test/java/com')
| -rw-r--r-- | luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java b/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java index 6d033d3..83d9478 100644 --- a/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java +++ b/luni/src/test/java/com/android/org/bouncycastle/jce/provider/CertBlacklistTest.java @@ -133,7 +133,7 @@ public class CertBlacklistTest extends TestCase { private Set<String> getPubkeyBlacklist(String path) throws IOException { // set our blacklist path - CertBlacklist bl = new CertBlacklist(path, CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH); + CertBlacklist bl = new CertBlacklist(path, ""); // call readPubkeyBlacklist Set<byte[]> arr = bl.pubkeyBlacklist; // convert the results to a hashset of strings @@ -146,7 +146,7 @@ public class CertBlacklistTest extends TestCase { private Set<String> getSerialBlacklist(String path) throws IOException { // set our blacklist path - CertBlacklist bl = new CertBlacklist(CertBlacklist.DEFAULT_PUBKEY_BLACKLIST_PATH, path); + CertBlacklist bl = new CertBlacklist("", path); // call readPubkeyBlacklist Set<BigInteger> arr = bl.serialBlacklist; // convert the results to a hashset of strings @@ -231,8 +231,7 @@ public class CertBlacklistTest extends TestCase { // write that to the test blacklist writeBlacklist(new HashSet<String>()); // set our blacklist path - CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), - CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH); + CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), ""); // check to make sure it isn't blacklisted assertEquals(bl.isPublicKeyBlackListed(pk), false); } @@ -247,8 +246,7 @@ public class CertBlacklistTest extends TestCase { testBlackList.add(hash); writeBlacklist(testBlackList); // set our blacklist path - CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), - CertBlacklist.DEFAULT_SERIAL_BLACKLIST_PATH); + CertBlacklist bl = new CertBlacklist(tmpFile.getCanonicalPath(), ""); // check to make sure it isn't blacklited assertTrue(bl.isPublicKeyBlackListed(pk)); } |