Skip to content

fix: #9 adapt initialiser parameter to OpenSSL::PKey implementation #11

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
Quantenradierer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: #9 adapt initialiser parameter to OpenSSL::PKey implementation #11

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
30 changes: 21 additions & 9 deletions lib/keystores/jks/pkcs8_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ module PKey
class EC
original_initialize = instance_method(:initialize)

define_method(:initialize) do |der_or_pem|
define_method(:initialize) do |*several_variants|
init = original_initialize.bind(self)
begin
init.(der_or_pem)
init.(*several_variants)
rescue Exception
# If we blow up trying to parse the key, we might be der encoded PKCS8, and if we are, convert ourselves
# to PEM and try again.
init.(OpenSSL::PKey.der_to_pem(der_or_pem))
if several_variants.count == 1
init.(OpenSSL::PKey.der_to_pem(*several_variants))
else
raise
end
end
end

Expand Down Expand Up @@ -60,14 +64,18 @@ def encode_private_key
class RSA
original_initialize = instance_method(:initialize)

define_method(:initialize) do |der_or_pem|
define_method(:initialize) do |*several_variants|
init = original_initialize.bind(self)
begin
init.(der_or_pem)
init.(*several_variants)
rescue Exception
# If we blow up trying to parse the key, we might be der encoded PKCS8, and if we are, convert ourselves
# to PEM and try again.
init.(OpenSSL::PKey.der_to_pem(der_or_pem))
if several_variants.count == 1
init.(OpenSSL::PKey.der_to_pem(*several_variants))
else
raise
end
end
end

Expand Down Expand Up @@ -105,14 +113,18 @@ def to_pkcs8_pem
class DSA
original_initialize = instance_method(:initialize)

define_method(:initialize) do |der_or_pem|
define_method(:initialize) do |*several_variants|
init = original_initialize.bind(self)
begin
init.(der_or_pem)
init.(*several_variants)
rescue Exception
# If we blow up trying to parse the key, we might be der encoded PKCS8, and if we are, convert ourselves
# to PEM and try again.
init.(OpenSSL::PKey.der_to_pem(der_or_pem))
if several_variants.count == 1
init.(OpenSSL::PKey.der_to_pem(*several_variants))
else
raise
end
end
end

Expand Down