Bug 1092 fix#1165
Merged
headius merged 3 commits intojruby:masterfrom Oct 29, 2013
LarsWestergren:master
Merged
Conversation
Member
|
See #1092. |
lib/ruby/shared/openssl/pkcs12.rb
Outdated
Member
There was a problem hiding this comment.
Do we need unless here? Seems to me that if encoding is ASCII_8BIT already, there is no harm in forcing it. (And the code is slightly cleaner as a result.)
Contributor
Author
|
You are right. Unnecessary conditional removed. |
Member
|
Thank you! |
headius
added a commit
that referenced
this pull request
Oct 29, 2013
Bug 1092 fix Signed-off-by: Charles Oliver Nutter <headius@headius.com> Conflicts: test/externals/ruby2.0/openssl/test_pkcs12.rb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Behave like MRI - allow for instance UTF8 Strings to PKCS12.create, but coerce them to ASCII_8BIT so BouncyCastle can read them correctly.