Skip to content

[fix] read back DER written by PKey#to_der (backport to 0.16) #397

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

Open
matrei wants to merge 1 commit into
base: 0.16
Choose a base branch
from
Open

[fix] read back DER written by PKey#to_der (backport to 0.16) #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 0 deletions src/main/java/org/jruby/ext/openssl/PKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
debugStackTrace(runtime, "PKey readPrivateKeyFromDER", e); /* ignore */
}
}
// d2i_PrivateKey_bio - PKCS#1 RSA, DSA and SEC1 EC keys (as written by #to_der)
if (keyPair == null) {
try {
keyPair = org.jruby.ext.openssl.impl.PKey.readPrivateKeyDER(str.getBytes());
} catch (IOException e) {
debugStackTrace(runtime, "PKey readPrivateKeyDER", e); /* ignore */
}
}
// PEM_read_bio_PrivateKey
if (keyPair != null) {
final String alg = getAlgorithm(keyPair);
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/org/jruby/ext/openssl/impl/PKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,20 @@ public static KeyPair readRSAPrivateKey(final KeyFactory rsaFactory, final byte[
return null;
}

// d2i_PrivateKey_bio - type specific DER encodings (PKCS#1 RSA, DSA, SEC1 EC)
public static KeyPair readPrivateKeyDER(final byte[] input) throws IOException {
try {
// each reader matches on sequence shape so order does not matter
KeyPair keyPair = readRSAPrivateKey(input);
if (keyPair == null) keyPair = readDSAPrivateKey(input);
if (keyPair == null) keyPair = readECPrivateKey(input);
return keyPair;
}
catch (Exception e) { // the EC reader mocks up a PrivateKeyInfo and blows up in all sorts of ways
throw new IOException("Could not parse private key: " + e.getMessage(), e);
}
}

// d2i_RSAPublicKey_bio
public static PublicKey readRSAPublicKey(final byte[] input)
throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
Expand Down
10 changes: 10 additions & 0 deletions src/test/ruby/test_pkey.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ def test_pkey_read_pkcs8_and_check_with_cert
assert_true cert.check_private_key(pkey)
end

# #to_der writes PKCS#1 (RSA, DSA) or SEC1 (EC), PKey.read only handled PKCS#8
def test_pkey_read_der_round_trip
%w[rsa2048 dsa2048 p256].each do |name|
key = Fixtures.pkey(name)
read = OpenSSL::PKey.read(key.to_der)
assert_instance_of key.class, read
assert_equal key.to_der, read.to_der
end
end

def test_pkey_pem_file_error
begin
ret = OpenSSL::PKey.read('not a PEM file')
Expand Down