diff options
| author | Jack Magne <jmagne@dhcp-16-213.sjc.redhat.com> | 2013-09-10 14:24:08 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2013-09-10 15:12:41 -0700 |
| commit | 9c3cc5e955e9101ffb4e59282d548105dcc42664 (patch) | |
| tree | 29978bfd7d7f91062f85e1c5d844db88ce339cf2 | |
| parent | 4db22ab18f4ff17c1dd6dd5b9fa0227016eb7287 (diff) | |
| download | pki-9c3cc5e955e9101ffb4e59282d548105dcc42664.tar.gz pki-9c3cc5e955e9101ffb4e59282d548105dcc42664.tar.xz pki-9c3cc5e955e9101ffb4e59282d548105dcc42664.zip | |
Patch to get rid of introduced warnings.
4 files changed, 8 insertions, 8 deletions
diff --git a/.classpath b/.classpath index bee1aacbf..be9988d40 100644 --- a/.classpath +++ b/.classpath @@ -41,7 +41,7 @@ <classpathentry kind="lib" path="/usr/share/java/xerces-j2.jar"/> <classpathentry kind="lib" path="/usr/share/java/xml-commons-apis.jar"/> <classpathentry kind="lib" path="/usr/share/java/istack-commons-runtime.jar"/> - <classpathentry kind="lib" path="/usr/share/java/jss/jss4.jar"/> + <classpathentry kind="lib" path="/usr/lib64/jss/jss4.jar"/> <classpathentry kind="lib" path="/usr/share/java/apache-commons-lang.jar"/> <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-atom-provider.jar"/> <classpathentry kind="lib" path="/usr/share/java/tomcat/catalina.jar"/> diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java index 3e07ca307..3a7d09d5f 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java @@ -49,7 +49,7 @@ import com.netscape.cmsutil.crypto.CryptoUtil; * * @version $Revision$, $Date$ */ -@SuppressWarnings("serial") + public class KeyConstraint extends EnrollConstraint { public static final String CONFIG_KEY_TYPE = "keyType"; // (EC, RSA) @@ -148,7 +148,7 @@ public class KeyConstraint extends EnrollConstraint { value)); } - Vector vect = CryptoUtil.getECKeyCurve(key); + Vector<?> vect = CryptoUtil.getECKeyCurve(key); boolean curveFound = false; diff --git a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java index 62b8e6471..4531e0fe5 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java @@ -147,7 +147,7 @@ public class UserKeyDefault extends EnrollDefault { if (k.getAlgorithm().equals("RSA")) { return Integer.toString(getRSAKeyLen(k)); } else if (k.getAlgorithm().equals("EC")) { - Vector vect = CryptoUtil.getECKeyCurve(k); + Vector<String> vect = CryptoUtil.getECKeyCurve(k); if (vect != null) return vect.toString(); else diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index 25d89b085..5957f046d 100644 --- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -117,7 +117,7 @@ import org.mozilla.jss.util.Password; import com.netscape.cmsutil.util.Cert; import com.netscape.cmsutil.util.Utils; - +@SuppressWarnings("serial") public class CryptoUtil { public static final String CERTREQ_BEGIN_HEADING = "-----BEGIN CERTIFICATE REQUEST-----"; @@ -1643,12 +1643,12 @@ public class CryptoUtil { return ecCurves; } - public static Vector getECKeyCurve(X509Key key) throws Exception { + public static Vector<String> getECKeyCurve(X509Key key) throws Exception { AlgorithmId algid = key.getAlgorithmId(); //System.out.println("CryptoUtil: getECKeyCurve: algid ="+ algid); /* - * Get raw string representation of alg parameters, will give + * Get raw string representation of alg parameters, will give * us the curve OID. */ String params = null; @@ -1661,7 +1661,7 @@ public class CryptoUtil { } //System.out.println("CryptoUtil: getECKeyCurve: EC key OID ="+ params); - Vector vect = ecOIDs.get(params); + Vector<String> vect = ecOIDs.get(params); return vect; } |