Changes to fix rawhide build

- Removed dependency on removed internal junit class
- moved cmake reference to junit4.jar to junit.jar
- Disambiguate a couple of references

2 files changed, 4 insertions, 3 deletions

diff --git a/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java
index dfc1017bc..c48f39050 100755
--- a/base/util/src/netscape/security/x509/X509CRLImpl.java
+++ b/base/util/src/netscape/security/x509/X509CRLImpl.java
@@ -375,7 +375,8 @@ public class X509CRLImpl extends X509CRL {
     public void verify(PublicKey key)
             throws CRLException, NoSuchAlgorithmException, InvalidKeyException,
             NoSuchProviderException, SignatureException {
-        verify(key, null);
+        String sigProvider = null;
+        verify(key, sigProvider);
     }
 
     /**
diff --git a/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java
index 111cd3b6d..657e4d224 100755
--- a/base/util/src/netscape/security/x509/X509CertImpl.java
+++ b/base/util/src/netscape/security/x509/X509CertImpl.java
@@ -323,8 +323,8 @@ public class X509CertImpl extends X509Certificate
     public void verify(PublicKey key)
             throws CertificateException, NoSuchAlgorithmException,
             InvalidKeyException, NoSuchProviderException, SignatureException {
-
-        verify(key, null);
+        String sigProvider = null;
+        verify(key, sigProvider);
     }
 
     /**