Fix bugzilla bug #673614.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1796 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

11 files changed, 15 insertions, 13 deletions

diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
index 50ae17be..4623826f 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
@@ -28,7 +28,7 @@ import com.netscape.certsrv.logging.*;
 import com.netscape.certsrv.apps.CMS;
 import netscape.security.x509.*;
 import netscape.security.util.*;
-import netscape.security.provider.*;
+import netscape.security.provider.DSAPublicKey;
 import java.security.interfaces.DSAParams;
 import java.math.BigInteger;
 import com.netscape.cms.policy.APolicyRule;
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
index fede4df8..b30e2790 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
@@ -27,7 +27,7 @@ import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.common.*;
 import netscape.security.x509.*;
 import netscape.security.util.*;
-import netscape.security.provider.*;
+import netscape.security.provider.RSAPublicKey;
 import com.netscape.cms.policy.APolicyRule;
 
 
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
index a94536e8..134a78ea 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
+++ b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
@@ -30,7 +30,8 @@ import com.netscape.cms.profile.common.*;
 import com.netscape.cms.profile.def.*;
 
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+import netscape.security.provider.RSAPublicKey;
+import netscape.security.provider.DSAPublicKey;
 import java.security.interfaces.DSAParams;
 import java.math.BigInteger;
 
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
index 2e11d56f..1770c13e 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
+++ b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
@@ -32,7 +32,7 @@ import com.netscape.cms.profile.common.*;
 import com.netscape.cms.profile.def.*;
 
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+//import netscape.security.provider.*;
 import netscape.security.util.*;
 import java.math.BigInteger;
 
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
index e6b3edc2..258b470f 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
@@ -31,7 +31,8 @@ import com.netscape.certsrv.apps.CMS;
 
 import java.security.interfaces.DSAParams;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+import netscape.security.provider.RSAPublicKey;
+import netscape.security.provider.DSAPublicKey;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
index 999d7e79..a8e2900d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
@@ -29,9 +29,9 @@ import com.netscape.certsrv.property.*;
 import com.netscape.certsrv.apps.*;
 import com.netscape.certsrv.apps.CMS;
 
-import java.security.interfaces.DSAParams;
+//import java.security.interfaces.DSAParams;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+//import netscape.security.provider.*;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
index c9f6ffde..e16c032a 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
@@ -29,9 +29,9 @@ import com.netscape.certsrv.property.*;
 import com.netscape.certsrv.apps.*;
 import com.netscape.certsrv.apps.CMS;
 
-import java.security.interfaces.DSAParams;
+//import java.security.interfaces.DSAParams;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+//import netscape.security.provider.*;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
index b1d78519..d7160daa 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
@@ -30,7 +30,7 @@ import java.security.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+import netscape.security.provider.RSAPublicKey;
 import com.netscape.certsrv.authority.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.certsrv.base.*;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
index db3371d7..3f74a269 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
@@ -30,7 +30,7 @@ import java.security.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+import netscape.security.provider.RSAPublicKey;
 import com.netscape.certsrv.common.*;
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.*;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
index 9ec9bdad..0211c311 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
@@ -30,7 +30,7 @@ import java.security.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import netscape.security.x509.*;
-import netscape.security.provider.*;
+//import netscape.security.provider.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.*;
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
index 8c050359..7b6fcdb8 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
@@ -23,7 +23,7 @@ import java.io.*;
 import java.util.*;
 import java.security.*;
 import java.security.cert.*;
-import netscape.security.provider.*;
+//import netscape.security.provider.*;
 import netscape.security.x509.*;
 import netscape.security.pkcs.*;
 import netscape.ldap.*;