Skip to content
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.

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

v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey #732

Merged
merged 9 commits into from
Jan 13, 2025

Conversation

johnnyshields
Copy link
Collaborator

@johnnyshields johnnyshields commented Jan 11, 2025

Rework of #726 - thanks @tobiasamft !
Solves #723

  • Return the original certificate from Utils.build_cert_object when an instance of OpenSSL::X509::Certificate is given. And return the original key from Utils.build_private_key_object when an instance of OpenSSL::PKey::PKey is given.
  • Allow SP certificates / private_key settings to be OpenSSL::X509::Certificate / OpenSSL::PKey::PKey objects.

tobiasamft and others added 5 commits October 4, 2024 10:16
This allows settings to accept instances of OpenSSL::X509::Certificate
as service provider (SP) certificates.
Return the original certificate from Utils.build_cert_object when an
instance of OpenSSL::X509::Certificate is given. And return the original
key from Utils.build_private_key_object when an instance of
OpenSSL::PKey::PKey is given.
…n instance of OpenSSL::X509::Certificate is given. And return the original key from Utils.build_private_key_object when an instance of OpenSSL::PKey::PKey is given.

- Allow SP certificates / private_key settings to be OpenSSL::X509::Certificate / OpenSSL::PKey::PKey objects.
@johnnyshields johnnyshields changed the title Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey Jan 11, 2025
@johnnyshields
Copy link
Collaborator Author

johnnyshields commented Jan 11, 2025

@pitbulk ready to merge.

@johnnyshields johnnyshields changed the title v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey [READY] v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey Jan 11, 2025
@johnnyshields
Copy link
Collaborator Author

@pitbulk conflicts resolved

@pitbulk pitbulk merged commit 4b24ac3 into SAML-Toolkits:v2.x Jan 13, 2025
29 checks passed
@pitbulk pitbulk changed the title [READY] v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey v2.x - Allow SP certificates to be OpenSSL::X509::Certificate / private_key to be OpenSSL::PKey::PKey Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants