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.

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

Jump to bottom

Pfx on windows fails due to CRLF conversion #19

Merged
merged 2 commits into from
Nov 22, 2015
Merged

Pfx on windows fails due to CRLF conversion #19

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
4a05d44
For P12 certificates to be valid when can't allow CRLF conversion whe…
Nov 16, 2015
944596e
Ensure it using the right class to read
Nov 16, 2015
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
2 changes: 1 addition & 1 deletion libraries/resource_ssl_certificate_readers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def safe_read_namespace(desc, ary)

def read_from_path(path)
return nil unless ::File.exist?(path)
::IO.read(path)
::File.open(path, 'rb') { |io| io.read }
end

def safe_read_from_path(desc, path)
Expand Down
3 changes: 2 additions & 1 deletion test/cookbooks/ssl_certificate_test/libraries/cert_ca_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ def self.generate_self_signed_ca_cert(key, cert, subject)
end

def self.ca_cert_to_file(subject, key_file, cert_file, time)
key = File.read(key_file)
key = File.open(key_file, 'rb') { |io| io.read }

key, cert = generate_generic_x509_key_cert(key, time)

generate_self_signed_ca_cert(key, cert, subject)
Expand Down