Skip to content

Account for ASN1Integers when transforming issuer serial numbers to_text in AuthorityKeyIdentifier extensions #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Account for ASN1Integers when transforming issuer serial numbers to_text in AuthorityKeyIdentifier extensions #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c9e46e
Account for ASN1Integers when handling serial numbers in X509Certs
lampad Oct 18, 2017
aef96b5
Test and use explicit value of ASN1Integer
lampad Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/org/jruby/ext/openssl/X509Extension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1EncodableVector;
import org.bouncycastle.asn1.ASN1Encoding;
import org.bouncycastle.asn1.ASN1Integer;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.ASN1OctetString;
import org.bouncycastle.asn1.ASN1Primitive;
Expand Down Expand Up @@ -456,7 +457,12 @@ public RubyString value(final ThreadContext context) {
break;
case 2 : // serial
val.append(new byte[] { 's','e','r','i','a','l',':' });
hexBytes( ((ASN1OctetString) obj).getOctets(), val );
if (obj instanceof ASN1Integer) {
hexBytes( ((ASN1Integer) obj).getValue().toByteArray(), val);
}
else {
hexBytes( ((ASN1OctetString) obj ).getOctets(), val );
}
break;
}
}
Expand Down
25 changes: 25 additions & 0 deletions src/test/ruby/x509/test_x509cert.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,31 @@ def test_cert_extensions # JRUBY-3468
end
end

def test_aki_extension_to_text
# Cert generation ripped from WEBrick
rsa2048 = OpenSSL::PKey::RSA.new TEST_KEY_RSA2048
cert = OpenSSL::X509::Certificate.new
cert.version = 2
cert.serial = 1
name = OpenSSL::X509::Name.new([ %w[CN localhost] ])
cert.subject = name
cert.issuer = name
cert.not_before = Time.now
cert.not_after = Time.now + (365*24*60*60)
cert.public_key = rsa2048.public_key

ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
ef.issuer_certificate = cert

aki = ef.create_extension("authorityKeyIdentifier",
"keyid:always,issuer:always")
cert.add_extension(aki)

assert_equal 1, cert.extensions.size
assert_equal "keyid:97:39:9D:C3:FB:CD:BA:8F:54:0C:90:7B:46:3F:EA:D6:43:75:B1:CB\n\nserial:01\n",
cert.extensions.first.value
end

def test_resolve_extensions
rsa2048 = OpenSSL::PKey::RSA.new TEST_KEY_RSA2048
ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
Expand Down