1 files changed, 27 insertions, 8 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
index 7593a7a..39a7bb2 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
@@ -9,6 +9,19 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.DERTaggedObject;
 
+/**
+ * <a href="http://tools.ietf.org/html/rfc5652#section-6.2">RFC 5652</a>:
+ * Content encryption key delivery mechanisms.
+ * <p>
+ * <pre>
+ * RecipientInfo ::= CHOICE {
+ *     ktri      KeyTransRecipientInfo,
+ *     kari  [1] KeyAgreeRecipientInfo,
+ *     kekri [2] KEKRecipientInfo,
+ *     pwri  [3] PasswordRecipientInfo,
+ *     ori   [4] OtherRecipientInfo }
+ * </pre>
+ */
 public class RecipientInfo
     extends ASN1Object
     implements ASN1Choice
@@ -51,6 +64,20 @@ public class RecipientInfo
         this.info = info;
     }
 
+    /**
+     * Return a RecipientInfo object from the given object.
+     * <p>
+     * Accepted inputs:
+     * <ul>
+     * <li> null &rarr; null
+     * <li> {@link RecipientInfo} object
+     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with RecipientInfo structure inside
+     * <li> {@link org.bouncycastle.asn1.ASN1TaggedObject#getInstance(java.lang.Object) ASN1TaggedObject} input formats with RecipientInfo structure inside
+     * </ul>
+     *
+     * @param o the object we want converted.
+     * @exception IllegalArgumentException if the object cannot be converted.
+     */
     public static RecipientInfo getInstance(
         Object  o)
     {
@@ -138,14 +165,6 @@ public class RecipientInfo
 
     /**
      * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * RecipientInfo ::= CHOICE {
-     *     ktri KeyTransRecipientInfo,
-     *     kari [1] KeyAgreeRecipientInfo,
-     *     kekri [2] KEKRecipientInfo,
-     *     pwri [3] PasswordRecipientInfo,
-     *     ori [4] OtherRecipientInfo }
-     * </pre>
      */
     public ASN1Primitive toASN1Primitive()
     {