diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2014-04-13 04:30:52 +0400 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2014-04-13 04:30:52 +0400 |
| commit | 2e0fb76843b7ffaccc505683c153cea5da001d79 (patch) | |
| tree | 1d10b1a3d6cb52bfcc80622a5642bdd459bbd483 /core/src/main/java/org | |
| parent | 26f3b83df76b466a390691c6dd68beea9cc9386c (diff) | |
clean ups.
Diffstat (limited to 'core/src/main/java/org')
4 files changed, 6 insertions, 16 deletions
diff --git a/core/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java b/core/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java index 5b592888..85d9843b 100644 --- a/core/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java +++ b/core/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java @@ -103,15 +103,6 @@ public class DERApplicationSpecific throw new IllegalArgumentException("failed to construct object from byte[]: " + e.getMessage()); } } - else if (obj instanceof ASN1Encodable) - { - ASN1Primitive primitive = ((ASN1Encodable)obj).toASN1Primitive(); - - if (primitive instanceof ASN1Sequence) - { - return (DERApplicationSpecific)primitive; - } - } throw new IllegalArgumentException("unknown object in getInstance: " + obj.getClass().getName()); } diff --git a/core/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java b/core/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java index c885a6c6..848f4fcf 100644 --- a/core/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java +++ b/core/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java @@ -25,7 +25,7 @@ public class EncryptionScheme this.algId = AlgorithmIdentifier.getInstance(seq); } - public static final EncryptionScheme getInstance(Object obj) + public static EncryptionScheme getInstance(Object obj) { if (obj instanceof EncryptionScheme) { diff --git a/core/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java b/core/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java index 3b408362..83804f38 100644 --- a/core/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java +++ b/core/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java @@ -25,7 +25,7 @@ public class KeyDerivationFunc this.algId = AlgorithmIdentifier.getInstance(seq); } - public static final KeyDerivationFunc getInstance(Object obj) + public static KeyDerivationFunc getInstance(Object obj) { if (obj instanceof KeyDerivationFunc) { diff --git a/core/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java b/core/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java index 78b09796..b3020e0a 100644 --- a/core/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java +++ b/core/src/main/java/org/bouncycastle/asn1/x9/DHValidationParms.java @@ -21,17 +21,16 @@ public class DHValidationParms extends ASN1Object public static DHValidationParms getInstance(Object obj) { - if (obj == null || obj instanceof DHDomainParameters) + if (obj instanceof DHValidationParms) { return (DHValidationParms)obj; } - - if (obj instanceof ASN1Sequence) + else if (obj != null) { - return new DHValidationParms((ASN1Sequence)obj); + return new DHValidationParms(ASN1Sequence.getInstance(obj)); } - throw new IllegalArgumentException("Invalid DHValidationParms: " + obj.getClass().getName()); + return null; } public DHValidationParms(DERBitString seed, ASN1Integer pgenCounter) |