diff options
author | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:59 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:59 -0500 |
commit | 171aaece4f23709d33d180cf36eb3af5e454b0c9 (patch) | |
tree | 1485f9f0a7bd10de4ff25030db575dbb8dafae74 /pki/base/util/src/netscape/security/x509/GenericValueConverter.java | |
parent | adad2fcee8a29fdb82376fbce07dedb11fccc182 (diff) | |
download | pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.tar.gz pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.tar.xz pki-171aaece4f23709d33d180cf36eb3af5e454b0c9.zip |
Revert "Formatting"
This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.
Diffstat (limited to 'pki/base/util/src/netscape/security/x509/GenericValueConverter.java')
-rw-r--r-- | pki/base/util/src/netscape/security/x509/GenericValueConverter.java | 196 |
1 files changed, 108 insertions, 88 deletions
diff --git a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java index 11a65058b..5c906d09f 100644 --- a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java +++ b/pki/base/util/src/netscape/security/x509/GenericValueConverter.java @@ -24,125 +24,145 @@ import netscape.security.util.DerValue; import sun.io.CharToByteConverter; /** - * A GenericValueConverter converts a string that is not associated with a - * particular attribute to a DER encoded ASN.1 character string type. Currently - * supports PrintableString, IA5String, BMPString T.61String and Universal - * String. - * - * <p> - * The conversion is done as follows. A CharToByteConverter is obtained for the - * all the character sets from the global default ASN1CharStrConvMap. The - * CharToByteConverters are then used to convert the string to the smallest - * character set first -- printableString. If the string contains characters - * outside of that character set, it is converted to the next character set -- - * IA5String character set. If that is not enough it is converted to a - * BMPString, then Universal String which contains all characters. + * A GenericValueConverter converts a string that is not associated with + * a particular attribute to a DER encoded ASN.1 character string type. + * Currently supports PrintableString, IA5String, BMPString T.61String and + * Universal String. * + * <p>The conversion is done as follows. + * A CharToByteConverter is obtained for the all the character sets + * from the global default ASN1CharStrConvMap. + * The CharToByteConverters are then used to convert the string to the + * smallest character set first -- printableString. + * If the string contains characters outside of that character set, + * it is converted to the next character set -- IA5String character set. + * If that is not enough it is converted to a BMPString, then + * Universal String which contains all characters. + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. * */ -public class GenericValueConverter implements AVAValueConverter { - public GenericValueConverter() { +public class GenericValueConverter implements AVAValueConverter +{ + public GenericValueConverter() + { } /** - * Converts a string to a DER encoded ASN.1 primtable string, defined here - * as a PrintableString, IA5String, T.61String, BMPString or + * Converts a string to a DER encoded ASN.1 primtable string, defined here + * as a PrintableString, IA5String, T.61String, BMPString or * UniversalString. The string is not expected to be encoded in any form. * - * <p> - * If a CharToByteConverter is not available for a character set that is - * needed to convert the string, the string cannot be converted and an - * IOException is thrown. For example, if the string contains characters - * outside the PrintableString character and only a PrintableString + * <p>If a CharToByteConverter is not available for a character set that + * is needed to convert the string, the string cannot be converted and + * an IOException is thrown. For example, if the string contains characters + * outside the PrintableString character and only a PrintableString * CharToByteConverter is available then an IOException is thrown. * - * @param s A string representing a generic attribute string value. - * - * @return The DER value of the attribute. + * @param s A string representing a generic attribute string value. + * + * @return The DER value of the attribute. * - * @exception IOException if the string cannot be converted, such as when a - * CharToByteConverter needed is unavailable. + * @exception IOException if the string cannot be converted, such as + * when a CharToByteConverter needed is + * unavailable. */ - public DerValue getValue(String s) throws IOException { - return getValue(s, null); + public DerValue getValue(String s) + throws IOException + { + return getValue(s, null); } - public DerValue getValue(String s, byte[] tags) throws IOException { - // try to convert to printable, then t61 the universal - - // i.e. from minimal coverage to the broadest. - int ret = -1; - CharToByteConverter cbc; - DerValue value; - byte[] bbuf, derBuf; - int i; + public DerValue getValue(String s, byte[] tags) + throws IOException + { + // try to convert to printable, then t61 the universal - + // i.e. from minimal coverage to the broadest. + int ret = -1; + CharToByteConverter cbc; + DerValue value; + byte[] bbuf, derBuf; + int i; - if (tags == null || tags.length == 0) - tags = DefEncodingTags; + if (tags == null || tags.length == 0) + tags = DefEncodingTags; - bbuf = new byte[4 * s.length()]; - for (i = 0; i < tags.length; i++) { - try { - cbc = ASN1CharStrConvMap.getDefault().getCBC(tags[i]); - if (cbc == null) - continue; - ret = cbc.convert(s.toCharArray(), 0, s.length(), bbuf, 0, - bbuf.length); - break; - } catch (java.io.CharConversionException e) { - continue; - } catch (InstantiationException e) { - throw new IOException("Cannot instantiate CharToByteConverter"); - } catch (IllegalAccessException e) { - throw new IOException( - "Illegal Access loading CharToByteConverter"); - } - } - if (ret == -1) { - throw new IllegalArgumentException( - "Cannot convert the string value to a ASN.1 type"); - } + bbuf = new byte[4*s.length()]; + for (i = 0; i < tags.length; i++) + { + try { + cbc = ASN1CharStrConvMap.getDefault().getCBC(tags[i]); + if (cbc == null) + continue; + ret = cbc.convert(s.toCharArray(), 0, s.length(), + bbuf, 0, bbuf.length); + break; + } + catch (java.io.CharConversionException e) { + continue; + } + catch (InstantiationException e) { + throw new IOException("Cannot instantiate CharToByteConverter"); + } + catch (IllegalAccessException e) { + throw new IOException( + "Illegal Access loading CharToByteConverter"); + } + } + if (ret == -1) { + throw new IllegalArgumentException( + "Cannot convert the string value to a ASN.1 type"); + } - derBuf = new byte[ret]; - System.arraycopy(bbuf, 0, derBuf, 0, ret); - return new DerValue(tags[i], derBuf); + derBuf = new byte[ret]; + System.arraycopy(bbuf, 0, derBuf, 0, ret); + return new DerValue(tags[i], derBuf); } - /** + /** * Creates a DerValue from the byte array of BER encoded value. * * NOTE: currently only supports DER encoding (a form of BER) on input . + * + * @param berStream Byte array of a BER encoded value. + * + * @return DerValue object. * - * @param berStream Byte array of a BER encoded value. - * - * @return DerValue object. - * - * @exception IOException If the BER value cannot be converted to a valid - * Directory String DER value. + * @exception IOException If the BER value cannot be converted to a + * valid Directory String DER value. */ - public DerValue getValue(byte[] berByteStream) throws IOException { - // accepts any tag. - DerValue value = new DerValue(berByteStream); - return value; + public DerValue getValue(byte[] berByteStream) + throws IOException + { + // accepts any tag. + DerValue value = new DerValue(berByteStream); + return value; } /** - * Converts a DerValue of ASN1 Character string type to a java string (the - * string is not encoded in any form). + * Converts a DerValue of ASN1 Character string type to a java string + * (the string is not encoded in any form). * - * @param avaValue A DerValue - * @return A string representing the attribute value. - * @exception IOException if a ByteToCharConverter needed for the conversion - * is not available or if BER value is not one of the ASN1 - * character string types here. + * @param avaValue A DerValue + * @return A string representing the attribute value. + * @exception IOException if a ByteToCharConverter needed for the + * conversion is not available or if BER value + * is not one of the ASN1 character string types + * here. */ - public String getAsString(DerValue avaValue) throws IOException { - return avaValue.getASN1CharString(); + public String getAsString(DerValue avaValue) + throws IOException + { + return avaValue.getASN1CharString(); } - private static byte DefEncodingTags[] = { DerValue.tag_PrintableString, - DerValue.tag_IA5String, DerValue.tag_BMPString, - DerValue.tag_UTF8String, DerValue.tag_T61String, - DerValue.tag_UniversalString }; + private static byte DefEncodingTags[] = { + DerValue.tag_PrintableString, + DerValue.tag_IA5String, + DerValue.tag_BMPString, + DerValue.tag_UTF8String, + DerValue.tag_T61String, + DerValue.tag_UniversalString + }; } |