Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17eba7d1c022
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b883bd5c0b9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 3, 2017

  1. If data is not provided, extract it from the PKCS7 instance. 

    Fixes #132.
    @headius
    headius committed May 3, 2017
    Copy the full SHA
    3c92fb8 View commit details

Commits on May 4, 2017

  1. Merge pull request #133 from headius/fix-132 

    If data is not provided, extract it from the PKCS7 instance.
    @headius
    headius authored May 4, 2017
    Copy the full SHA
    2b883bd View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/main/java/org/jruby/ext/openssl/PKCS7.java
2 changes: 2 additions & 0 deletions src/main/java/org/jruby/ext/openssl/PKCS7.java
View file
Original file line number Diff line number Diff line change
@@ -190,6 +190,8 @@ public static IRubyObject write_smime(IRubyObject self, IRubyObject[] args) {
default: pkcs7 = (PKCS7) args[0];
}

if (data.isNil()) data = pkcs7.getData();

final int flg = flags.isNil() ? 0 : RubyNumeric.fix2int(flags);

String smime = "";