diff options
author | Sergio Giro <sgiro@google.com> | 2016-01-27 20:40:41 +0000 |
---|---|---|
committer | Sergio Giro <sgiro@google.com> | 2016-01-28 15:30:59 +0000 |
commit | 80261dd2d1824bb3862e90e77a5412d56ad88b1f (patch) | |
tree | d89e670054247d0a050ac1b0d9a7918cbe3498d6 /bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java | |
parent | 9be78fe4c709f1e585b5ed7e99b21084045b7fba (diff) | |
download | android_external_bouncycastle-80261dd2d1824bb3862e90e77a5412d56ad88b1f.tar.gz android_external_bouncycastle-80261dd2d1824bb3862e90e77a5412d56ad88b1f.tar.bz2 android_external_bouncycastle-80261dd2d1824bb3862e90e77a5412d56ad88b1f.zip |
bouncycastle: Android tree with upstream code for version 1.50
Android tree as of c0d8909a6c6a4ac075a9dee7ac1fe6baff34acc0
Change-Id: I8d381554d6edec32aae8ff5bab5d5314f0954440
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java index 37b6b31..2543eb1 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java @@ -8,6 +8,21 @@ import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.ASN1TaggedObject; import org.bouncycastle.asn1.DERTaggedObject; +/** + * <a href="http://tools.ietf.org/html/rfc5652#section-5.3">RFC 5652</a>: + * Identify who signed the containing {@link SignerInfo} object. + * <p> + * The certificates referred to by this are at containing {@link SignedData} structure. + * <p> + * <pre> + * SignerIdentifier ::= CHOICE { + * issuerAndSerialNumber IssuerAndSerialNumber, + * subjectKeyIdentifier [0] SubjectKeyIdentifier + * } + * + * SubjectKeyIdentifier ::= OCTET STRING + * </pre> + */ public class SignerIdentifier extends ASN1Object implements ASN1Choice @@ -33,7 +48,16 @@ public class SignerIdentifier } /** - * return a SignerIdentifier object from the given object. + * Return a SignerIdentifier object from the given object. + * <p> + * Accepted inputs: + * <ul> + * <li> null → null + * <li> {@link SignerIdentifier} object + * <li> {@link IssuerAndSerialNumber} object + * <li> {@link org.bouncycastle.asn1.ASN1OctetString#getInstance(java.lang.Object) ASN1OctetString} input formats with SignerIdentifier structure inside + * <li> {@link org.bouncycastle.asn1.ASN1Primitive ASN1Primitive} for SignerIdentifier constructor. + * </ul> * * @param o the object we want converted. * @exception IllegalArgumentException if the object cannot be converted. @@ -82,14 +106,6 @@ public class SignerIdentifier /** * Produce an object suitable for an ASN1OutputStream. - * <pre> - * SignerIdentifier ::= CHOICE { - * issuerAndSerialNumber IssuerAndSerialNumber, - * subjectKeyIdentifier [0] SubjectKeyIdentifier - * } - * - * SubjectKeyIdentifier ::= OCTET STRING - * </pre> */ public ASN1Primitive toASN1Primitive() { |