jruby-openssl 0.4 → 0.5

data/History.txt

@@ -1,3 +1,12 @@
+== 0.5
+
+* Fixed JRUBY-3614: Unsupported HMAC algorithm (HMACSHA-256)
+* Fixed JRUBY-3570: ActiveMerchant's AuthorizeNet Gateway throws OpenSSL Cert Validation Error, when there should be no error
+* Fixed JRUBY-3557 Class cast exception in PKeyRSA.java
+* Fixed JRUBY-3468 X.509 certificates: subjectKeyIdentifier corrupted
+* Fixed JRUBY-3285 Unsupported HMAC algorithm (HMACSHA1) error when generating digest
+* Misc code cleanup
+
 == 0.2
 
 - Enable remaining tests; fix a nil string issue in SSLSocket.sysread (JRUBY-1888)
@@ -22,4 +31,4 @@
 
 == 0.0.5 and prior
 
-- Initial versions with maintenance updates
+- Initial versions with maintenance updates

data/lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.4"
+    VERSION = "0.5"
   end
 end

data/lib/openssl/ssl.rb

@@ -53,7 +53,7 @@ module OpenSSL
     module Nonblock
       def initialize(*args)
         flag = File::NONBLOCK
-        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
+        flag |= @io.fcntl(Fcntl::F_GETFL, nil) if defined?(Fcntl::F_GETFL)
         @io.fcntl(Fcntl::F_SETFL, flag)
         super
       end

data/test/openssl/test_hmac.rb

@@ -29,6 +29,16 @@ class OpenSSL::TestHMAC < Test::Unit::TestCase
     h = @h1.dup
     assert_equal(@h1.digest, h.digest, "dup digest")
   end
+
+  def test_sha256
+    digest256 = OpenSSL::Digest::Digest.new("sha256")
+    assert_equal(
+      "\210\236-\3270\331Yq\265\177sE\266\231hXa\332\250\026\235O&c*\307\001\227~\260n\362",
+      OpenSSL::HMAC.digest(digest256, 'blah', "blah"))
+    assert_equal(
+      "889e2dd730d95971b57f7345b699685861daa8169d4f26632ac701977eb06ef2",
+      OpenSSL::HMAC.hexdigest(digest256, 'blah', "blah"))
+  end
 end
 
 end

data/test/test_openssl_x509.rb

@@ -0,0 +1,34 @@
+require 'openssl'
+require 'test/unit'
+
+# JRUBY-3468
+class TestOpensslX509 < Test::Unit::TestCase
+  def test_jruby3468
+    pem_cert = <<END
+-----BEGIN CERTIFICATE-----
+MIIC/jCCAmegAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJKUDER
+MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQD
+DAxodHRwLWFjY2VzczIwHhcNMDcwOTExMTM1ODMxWhcNMDkwOTEwMTM1ODMxWjBN
+MQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVs
+b3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczIwgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBALi66ujWtUCQm5HpMSyr/AAIFYVXC/dmn7C8TR/HMiUuW3waY4uX
+LFqCDAGOX4gf177pX+b99t3mpaiAjJuqc858D9xEECzhDWgXdLbhRqWhUOble4RY
+c1yWYC990IgXJDMKx7VAuZ3cBhdBxtlE9sb1ZCzmHQsvTy/OoRzcJCrTAgMBAAGj
+ge0wgeowDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9PcGVu
+U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJNE0GGaRKmN2qhnO
+FyBWVl4Qj6owDgYDVR0PAQH/BAQDAgEGMHUGA1UdIwRuMGyAFCTRNBhmkSpjdqoZ
+zhcgVlZeEI+qoVGkTzBNMQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcx
+FDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczKCAQEw
+DQYJKoZIhvcNAQEFBQADgYEAH11tstSUuqFpMqoh/vM5l3Nqb8ygblbqEYQs/iG/
+UeQkOZk/P1TxB6Ozn2htJ1srqDpUsncFVZ/ecP19GkeOZ6BmIhppcHhE5WyLBcPX
+It5q1BW0PiAzT9LlEGoaiW0nw39so0Pr1whJDfc1t4fjdk+kSiMIzRHbTDvHWfpV
+nTA=
+-----END CERTIFICATE-----
+END
+
+    cert   = OpenSSL::X509::Certificate.new(pem_cert)
+    key_id = cert.extensions[2]
+
+    assert_equal "24:D1:34:18:66:91:2A:63:76:AA:19:CE:17:20:56:56:5E:10:8F:AA", key_id.value
+  end
+end

metadata

@@ -5,9 +5,9 @@ homepage: http://jruby-extras.rubyforge.org/jruby-openssl
 executables: []
 
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 post_install_message: 
-date: 2009-03-16 05:00:00 +00:00
+date: 2009-05-12 05:00:00 +00:00
 files: 
 - History.txt
 - README.txt
@@ -15,8 +15,6 @@ files:
 - lib/jopenssl.jar
 - lib/bcmail-jdk14-139.jar
 - lib/bcprov-jdk14-139.jar
-- lib/jopenssl
-- lib/openssl
 - lib/openssl.rb
 - lib/jopenssl/version.rb
 - lib/openssl/bn.rb
@@ -27,12 +25,9 @@ files:
 - lib/openssl/dummyssl.rb
 - lib/openssl/ssl.rb
 - lib/openssl/x509.rb
-- test/fixture
-- test/openssl
 - test/pkcs7_mime_enveloped.message
 - test/pkcs7_mime_signed.message
 - test/pkcs7_multipart_signed.message
-- test/ref
 - test/test_cipher.rb
 - test/test_integration.rb
 - test/test_java.rb
@@ -42,6 +37,7 @@ files:
 - test/test_java_pkcs7.rb
 - test/test_java_smime.rb
 - test/test_openssl.rb
+- test/test_openssl_x509.rb
 - test/test_pkey.rb
 - test/ut_eof.rb
 - test/fixture/cacert.pem
@@ -68,7 +64,7 @@ files:
 - test/ref/compile.rb
 - test/ref/pkcs1
 - test/ref/pkcs1.c
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 rdoc_options: 
 - --main
 - README.txt
@@ -81,6 +77,8 @@ platform: ruby
 summary: OpenSSL add-on for JRuby
 default_executable: 
 bindir: bin
+licenses: []
+
 required_rubygems_version: !ruby/object:Gem::Requirement 
   version: 
   requirements: 
@@ -95,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 require_paths: 
 - lib
-specification_version: 2
+specification_version: 3
 test_files: 
 - test/test_cipher.rb
 - test/test_integration.rb
@@ -106,6 +104,7 @@ test_files:
 - test/test_java_pkcs7.rb
 - test/test_java_smime.rb
 - test/test_openssl.rb
+- test/test_openssl_x509.rb
 - test/test_pkey.rb
 dependencies: []