fixed logic around error parsing oid

it's supposed to raise on der encoding (not initialization), and it's supposed to be an ASN1Error (not TypeError) exception

Author: HoneyryderChuck

src/main/java/org/jruby/ext/openssl/ASN1.java

@@ -739,26 +739,19 @@ public static void createASN1(final Ruby runtime, final RubyModule OpenSSL, fina
     }
 
     static ASN1ObjectIdentifier getObjectID(final Ruby runtime, final String nameOrOid)
-        throws IllegalArgumentException {
+        throws RaiseException {
         final String name = nameOrOid.toLowerCase();
 
         ASN1ObjectIdentifier objectId = getOIDLookup(runtime).get( name );
         if ( objectId != null ) return objectId;
 
         final String objectIdStr = ASN1Registry.getOIDLookup().get( name );
-        if ( objectIdStr != null ) return toObjectID(objectIdStr, false);
+        if ( objectIdStr != null ) return new ASN1ObjectIdentifier(objectIdStr);
 
-        return new ASN1ObjectIdentifier( nameOrOid );
-    }
-
-    static ASN1ObjectIdentifier toObjectID(final String oid, final boolean silent)
-        throws IllegalArgumentException {
         try {
-            return new ASN1ObjectIdentifier(oid);
-        }
-        catch (IllegalArgumentException e) {
-            if ( silent ) return null;
-            throw e;
+            return new ASN1ObjectIdentifier( nameOrOid );
+        } catch (IllegalArgumentException e) {
+            throw newASN1Error(runtime, "invalid OBJECT ID " + nameOrOid + ": " + e.getMessage());
         }
     }
 
@@ -1776,17 +1769,6 @@ static void initializeImpl(final ThreadContext context,
             // NOTE: Primitive only
             final String baseName = self.getMetaClass().getRealClass().getBaseName();
             switch (baseName) {
-                case "ObjectId":
-                    final String name;
-                    try {
-                        name = oid2Sym( runtime, getObjectID(runtime, value.toString()), true );
-                    }
-                    catch (IllegalArgumentException e) {
-                        // e.g. in case of nil "string  not an OID"
-                        throw runtime.newTypeError(e.getMessage());
-                    }
-                    if ( name != null ) value = runtime.newString(name);
-                    break;
                 case "BitString":
                     self.setInstanceVariable("@unused_bits", runtime.newFixnum(0));
                     break;
@@ -1858,7 +1840,9 @@ private ASN1Encodable toASN1Primitive(final ThreadContext context) {
 
             final IRubyObject val = value(context);
             if ( type == ASN1ObjectIdentifier.class ) {
-                return getObjectID(context.runtime, val.toString());
+                final String oidStr = val.convertToString().toString();
+
+                return getObjectID(context.runtime, oidStr);
             }
             if ( type == DERNull.class || type == ASN1Null.class ) {
                 return DERNull.INSTANCE;