Skip to content

Commit

Permalink
... long time coming - OpenSSL::X509::CRL support for loading revoked…
Browse files Browse the repository at this point in the history
… entries (#5)
  • Loading branch information
kares committed Sep 8, 2014
1 parent 2dcdb3f commit 226aba5
Show file tree
Hide file tree
Showing 6 changed files with 255 additions and 89 deletions.
19 changes: 16 additions & 3 deletions src/main/java/org/jruby/ext/openssl/ASN1.java
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,15 @@ private static void defaultObjects(final Ruby runtime) {
addObject(runtime, 186, "AES-256-CFB", "aes-256-cfb","2.16.840.1.101.3.4.1.44");
}

static ASN1ObjectIdentifier asOID(final String oid) {
try {
return new ASN1ObjectIdentifier(oid);
}
catch (IllegalArgumentException e) {
return null;
}
}

private static void addObject(final Ruby runtime, final int nid,
final String sn, final String ln, final String oid) {
if ( oid != null && ( sn != null || ln != null ) ) {
Expand Down Expand Up @@ -420,14 +429,18 @@ static Integer obj2nid(final Ruby runtime, final ASN1ObjectIdentifier oid) {
}

static String o2a(final Ruby runtime, final ASN1ObjectIdentifier oid) {
return o2a(runtime, oid, false);
}

static String o2a(final Ruby runtime, final ASN1ObjectIdentifier oid, final boolean silent) {
final Integer nid = obj2nid(runtime, oid);
if ( nid == null ) {
if ( silent ) return null;
throw new NullPointerException("nid not found for oid = '" + oid + "' (" + runtime + ")");
}
String one = nidToLn(runtime).get(nid);
if (one == null) {
one = nidToSn(runtime).get(nid);
}
if ( one == null ) one = nidToSn(runtime).get(nid);
if ( one == null ) ASN1Registry.o2a(oid);
return one;
}

Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/jruby/ext/openssl/BN.java
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@ private RubyString to_s(final int base) {
}
}

@Override
public String toString() {
return to_s().toString();
}

public String toString(int base) {
return to_s(base).toString();
}

@Override
@SuppressWarnings("unchecked")
@JRubyMethod
Expand Down
Loading

0 comments on commit 226aba5

Please sign in to comment.