diff options
Diffstat (limited to 'pki/base/util/src/netscape/security')
7 files changed, 9 insertions, 9 deletions
diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java index 6e28b4a0e..ff1ea7173 100644 --- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -73,9 +73,9 @@ public class GenericASN1Extension extends Extension * get, set, delete methods of Certificate, x509 type. */ private String name; - public static String OID = null; + public String OID = null; public static Hashtable<String, String> mConfig = null; - public static String pattern = null; + public String pattern = null; private int index = 0; // Encode this value @@ -325,7 +325,7 @@ public class GenericASN1Extension extends Extension * Return the OID of this attribute. */ public String getOID() { - return (OID); + return OID; } /** diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java index a90abe7e3..c67fe9965 100644 --- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -312,6 +312,8 @@ public class PresenceServerExtension extends Extension implements CertAttrSet { fos.close(); Extension ext1 = new Extension(new DerValue(dos.toByteArray())); + + @SuppressWarnings("unused") PresenceServerExtension ext2 = new PresenceServerExtension( new Boolean(false), ext1.getExtensionValue()); diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java index 4de75a4e1..c8fb69582 100644 --- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java @@ -336,7 +336,7 @@ public class PKCS7 { public SignerInfo[] verify(byte[] bytes) throws NoSuchAlgorithmException, SignatureException { - Vector intResult = new Vector(); + Vector<SignerInfo> intResult = new Vector<SignerInfo>(); for (int i = 0; i < signerInfos.length; i++) { SignerInfo signerInfo = verify(signerInfos[i], bytes); diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/pki/base/util/src/netscape/security/util/DerInputStream.java index e85d48ed6..20ced6757 100644 --- a/pki/base/util/src/netscape/security/util/DerInputStream.java +++ b/pki/base/util/src/netscape/security/util/DerInputStream.java @@ -314,7 +314,7 @@ public class DerInputStream { /* * Pull values out of the stream. */ - Vector vec = new Vector(startLen); + Vector<DerValue> vec = new Vector<DerValue>(startLen); DerValue value; do { diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java index 5d0029875..7dc9e2890 100644 --- a/pki/base/util/src/netscape/security/x509/Extension.java +++ b/pki/base/util/src/netscape/security/x509/Extension.java @@ -177,7 +177,7 @@ public class Extension implements Serializable { byte[] dup = new byte[extensionValue.length]; System.arraycopy(extensionValue, 0, dup, 0, dup.length); - return (dup); + return dup; } public void setExtensionValue(byte value[]) { diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java index b24ce1158..0912d5b0c 100644 --- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -65,9 +65,9 @@ public class NSCCommentExtension extends Extension // Encode this extension value private void encodeThis() throws IOException { DerOutputStream os = new DerOutputStream(); - DerOutputStream tmp = new DerOutputStream(); os.putIA5String(mComment); + // DerOutputStream tmp = new DerOutputStream(); // os.write(DerValue.tag_Sequence,tmp); extensionValue = os.toByteArray(); } diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java index 920b0e1e4..d44003baa 100644 --- a/pki/base/util/src/netscape/security/x509/X500Name.java +++ b/pki/base/util/src/netscape/security/x509/X500Name.java @@ -148,7 +148,6 @@ public class X500Name implements Principal, GeneralNameInterface { String country) throws IOException { DirStrConverter dirStrConverter = new DirStrConverter(); PrintableConverter printableConverter = new PrintableConverter(); - DerValue val; AVA[] assertion = new AVA[1]; // array is cloned in constructors. int i = 4; @@ -194,7 +193,6 @@ public class X500Name implements Principal, GeneralNameInterface { String country) throws IOException { DirStrConverter dirStrConverter = new DirStrConverter(); PrintableConverter printableConverter = new PrintableConverter(); - DerValue val; AVA[] assertion = new AVA[1]; // array is cloned in constructors. int i = 6; |