summaryrefslogtreecommitdiffstats
path: root/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
diff options
context:
space:
mode:
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java')
-rw-r--r--bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java24
1 files changed, 18 insertions, 6 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
index 84814c5..f1098e7 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
@@ -3,20 +3,32 @@ package org.bouncycastle.asn1;
import java.io.IOException;
/**
- * A NULL object.
+ * A NULL object - use DERNull.INSTANCE for populating structures.
*/
public abstract class ASN1Null
extends ASN1Primitive
{
- /**
- * @deprecated use DERNull.INSTANCE
- */
- // BEGIN android-changed
+ // BEGIN android-added
/*package*/ ASN1Null()
{
}
- // END android-changed
+ // END android-added
+ /**
+ * Return an instance of ASN.1 NULL from the passed in object.
+ * <p>
+ * Accepted inputs:
+ * <ul>
+ * <li> null &rarr; null
+ * <li> {@link ASN1Null} object
+ * <li> a byte[] containing ASN.1 NULL object
+ * </ul>
+ * </p>
+ *
+ * @param o object to be converted.
+ * @return an instance of ASN1Null, or null.
+ * @exception IllegalArgumentException if the object cannot be converted.
+ */
public static ASN1Null getInstance(Object o)
{
if (o instanceof ASN1Null)