summaryrefslogtreecommitdiffstats
path: root/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java')
-rw-r--r--pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java192
1 files changed, 98 insertions, 94 deletions
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
index b2752cb71..e3eee8099 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
+++ b/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
@@ -35,21 +35,19 @@ import netscape.security.x509.CertAttrSet;
import netscape.security.x509.Extensions;
import netscape.security.x509.OIDMap;
+
/**
* Represent a PKCS Attribute.
- *
- * <p>
- * Attributes are addiitonal attributes which can be inserted in a PKCS
+ *
+ * <p>Attributes are addiitonal attributes which can be inserted in a PKCS
* certificate request. For example a "Driving License Certificate" could have
* the driving license number as a attribute.
- *
- * <p>
- * Attributes are represented as a sequence of the attribute identifier (Object
- * Identifier) and a set of DER encoded attribute values. The current
+ *
+ * <p>Attributes are represented as a sequence of the attribute identifier
+ * (Object Identifier) and a set of DER encoded attribute values. The current
* implementation only supports one value per attribute.
- *
+ *
* ASN.1 definition of Attribute:
- *
* <pre>
* Attribute :: SEQUENCE {
* type AttributeValue,
@@ -57,7 +55,7 @@ import netscape.security.x509.OIDMap;
* }
* AttributeValue ::= ANY
* </pre>
- *
+ *
* @author Amit Kapoor
* @author Hemma Prafullchandra
* @version 1.13
@@ -67,11 +65,11 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
*
*/
private static final long serialVersionUID = 2002480042340316170L;
- protected ObjectIdentifier attributeId = null;
- protected CertAttrSet attributeValue = null;
+ protected ObjectIdentifier attributeId = null;
+ protected CertAttrSet attributeValue = null;
/**
- * Default constructor. Used only by sub-classes.
+ * Default constructor. Used only by sub-classes.
*/
public PKCS10Attribute() {
}
@@ -81,63 +79,64 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
*/
public PKCS10Attribute(DerValue derVal) throws IOException {
if (derVal.tag != DerValue.tag_Sequence) {
- throw new IOException("Sequence tag missing for PKCS10Attribute.");
- }
+ throw new IOException("Sequence tag missing for PKCS10Attribute.");
+ }
DerInputStream in = derVal.toDerInputStream();
// Object identifier
attributeId = in.getOID();
- // System.out.println("attribute ID in pkcs10 "+attributeId.toString());
-
- // Rest of the stuff is attribute value(s), wrapped in a SET.
- // For now, assume there is only one attribute value present.
- DerValue[] inAttrValues = in.getSet(1);
- int attrValueNum = inAttrValues.length;
- if (attrValueNum > 1) {
- throw new IOException(
- "More than one value per attribute not supported");
- }
-
- // Read the first attribute value
- DerValue inAttrValue = inAttrValues[0];
-
- if (attributeId.equals(PKCS9Attribute.EXTENSION_REQUEST_OID)) {
- // pkcs9 extensionAttr
- try {
- // remove the tag
- // DerValue dv = inAttrValue.data.getDerValue();
- // hack. toDerInputStream only gives one extension.
- DerInputStream fi = new DerInputStream(
- inAttrValue.toByteArray());
- attributeValue = (CertAttrSet) new Extensions(fi);
- // CertificateExtensions(fi);
- return;
- } catch (Exception e) {
- throw new IOException(e.toString());
- }
- }
- byte[] val = inAttrValue.toByteArray();
+ // System.out.println("attribute ID in pkcs10 "+attributeId.toString());
+
+ // Rest of the stuff is attribute value(s), wrapped in a SET.
+ // For now, assume there is only one attribute value present.
+ DerValue[] inAttrValues = in.getSet(1);
+ int attrValueNum = inAttrValues.length;
+ if (attrValueNum > 1) {
+ throw new IOException("More than one value per attribute not supported");
+ }
+
+ // Read the first attribute value
+ DerValue inAttrValue = inAttrValues[0];
+
+ if (attributeId.equals(PKCS9Attribute.EXTENSION_REQUEST_OID)) {
+ //pkcs9 extensionAttr
+ try{
+ // remove the tag
+ //DerValue dv = inAttrValue.data.getDerValue();
+ // hack. toDerInputStream only gives one extension.
+ DerInputStream fi = new DerInputStream(inAttrValue.toByteArray());
+ attributeValue = (CertAttrSet) new
+ Extensions(fi);
+ //CertificateExtensions(fi);
+ return;
+ } catch(Exception e) {
+ throw new IOException(e.toString());
+ }
+ }
+ byte[] val = inAttrValue.toByteArray();
Class[] params = { Object.class };
try {
- Class extClass = OIDMap.getClass(attributeId);
- if (extClass != null) {
- Constructor cons = extClass.getConstructor(params);
- Object value = Array.newInstance(byte.class, val.length);
- for (int i = 0; i < val.length; i++) {
- Array.setByte(value, i, val[i]);
- }
- Object[] passed = new Object[] { value };
- attributeValue = (CertAttrSet) cons.newInstance(passed);
- } else {
- // attribute classes are usable for PKCS10 attributes.
- // this is used where the attributes are not actual
- // implemented extensions.
- attributeValue = new ACertAttrSet(inAttrValue);
- }
- } catch (InvocationTargetException invk) {
- throw new IOException(invk.getTargetException().getMessage());
- } catch (Exception e) {
- throw new IOException(e.toString());
+ Class extClass = OIDMap.getClass(attributeId);
+ if (extClass != null) {
+ Constructor cons = extClass.getConstructor(params);
+ Object value = Array.newInstance(byte.class,val.length);
+ for (int i = 0; i < val.length; i++) {
+ Array.setByte(value,i,val[i]);
+ }
+ Object[] passed = new Object[] {value};
+ attributeValue = (CertAttrSet) cons.newInstance(passed);
+ } else {
+ // attribute classes are usable for PKCS10 attributes.
+ // this is used where the attributes are not actual
+ // implemented extensions.
+ attributeValue = new ACertAttrSet(inAttrValue);
+ }
+ }
+ catch (InvocationTargetException invk) {
+ throw new IOException(invk.getTargetException().getMessage());
+ }
+ catch (Exception e) {
+ throw new IOException(e.toString());
}
}
@@ -149,14 +148,14 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
* @param attributeValue the CertAttrSet.
*/
public PKCS10Attribute(ObjectIdentifier attributeId,
- CertAttrSet attributeValue) {
+ CertAttrSet attributeValue) {
this.attributeId = attributeId;
this.attributeValue = attributeValue;
}
/**
- * Constructs an attribute from another attribute. To be used for creating
- * decoded subclasses.
+ * Constructs an attribute from another attribute. To be used for
+ * creating decoded subclasses.
*
* @param attr the attribute to create from.
*/
@@ -167,50 +166,52 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
/**
* Write the output to the DerOutputStream.
- *
+ *
* @param out the OutputStream to write the attribute to.
* @exception CertificateException on certificate encoding errors.
* @exception IOException on encoding errors.
*/
- public void encode(OutputStream out) throws CertificateException,
- IOException {
+ public void encode(OutputStream out)
+ throws CertificateException, IOException {
// Encode the attribute value
- DerOutputStream outAttrValue = new DerOutputStream();
- attributeValue.encode(outAttrValue);
+ DerOutputStream outAttrValue = new DerOutputStream();
+ attributeValue.encode(outAttrValue);
- // Wrap the encoded attribute value into a SET
- DerValue outAttrValueSet = new DerValue(DerValue.tag_Set,
- outAttrValue.toByteArray());
+ // Wrap the encoded attribute value into a SET
+ DerValue outAttrValueSet = new DerValue(DerValue.tag_Set,
+ outAttrValue.toByteArray());
- // Create the attribute
+ // Create the attribute
DerOutputStream outAttr = new DerOutputStream();
outAttr.putOID(attributeId);
- outAttr.putDerValue(outAttrValueSet);
+ outAttr.putDerValue(outAttrValueSet);
- // Wrap the OID and the set of attribute values into a SEQUENCE
+ // Wrap the OID and the set of attribute values into a SEQUENCE
DerOutputStream tmp = new DerOutputStream();
tmp.write(DerValue.tag_Sequence, outAttr);
- // write the results to out
- out.write(tmp.toByteArray());
+ // write the results to out
+ out.write(tmp.toByteArray());
}
/**
- * DER encode this object onto an output stream. Implements the
- * <code>DerEncoder</code> interface.
- *
- * @param out the OutputStream on which to write the DER encoding.
- *
+ * DER encode this object onto an output stream.
+ * Implements the <code>DerEncoder</code> interface.
+ *
+ * @param out
+ * the OutputStream on which to write the DER encoding.
+ *
* @exception IOException on encoding errors.
*/
- public void derEncode(OutputStream out) throws IOException {
- try {
- encode(out);
- } catch (CertificateException ce) {
- IOException ioe = new IOException(ce.toString());
- ioe.fillInStackTrace();
- throw ioe;
- }
+ public void derEncode (OutputStream out) throws IOException
+ {
+ try {
+ encode(out);
+ } catch (CertificateException ce) {
+ IOException ioe = new IOException(ce.toString());
+ ioe.fillInStackTrace();
+ throw ioe;
+ }
}
/**
@@ -232,8 +233,11 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
*/
public String toString() {
String s = "AttributeId: " + attributeId.toString() + "\n";
- s += "AttributeValue: " + attributeValue.toString();
+ s += "AttributeValue: " + attributeValue.toString();
return (s);
}
}
+
+
+