openssl-extensions 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 1.1.0, released 2011-01-20
+
+* Extended OpenSSL::PKey::PKey to add equality methods.
+
 ## 1.0.0, released 2011-01-17
 
 * Initial major release.
-* Extends OpenSSL::X509::Request, OpenSSL::X509::Certificate, OpenSSL::X509::Name
-* Adds OpenSSLExtensions::X509::CertificateChain and OpenSSLExtensions::X509::AuthorityKeyIdentifier
+* Extended OpenSSL::X509::Request, OpenSSL::X509::Certificate, OpenSSL::X509::Name
+* Added OpenSSLExtensions::X509::CertificateChain and OpenSSLExtensions::X509::AuthorityKeyIdentifier
 

data/lib/openssl-extensions/all.rb

@@ -1,6 +1,7 @@
 require 'openssl-extensions'
 OpenSSLExtensions.check_dependencies!
 
+require 'openssl-extensions/pkey/pkey'
 require 'openssl-extensions/x509/certificate'
 require 'openssl-extensions/x509/certificate_chain'
 require 'openssl-extensions/x509/request'

data/lib/openssl-extensions/pkey.rb

@@ -0,0 +1,4 @@
+require 'openssl-extensions'
+
+module OpenSSLExtensions::PKey
+end

data/lib/openssl-extensions/pkey/pkey.rb

@@ -0,0 +1,19 @@
+require 'openssl-extensions'
+require 'openssl-extensions/pkey'
+
+##
+# Extends OpenSSL::PKey::PKey and its submodules with helper methods.
+#
+module OpenSSLExtensions::PKey::PKey
+  def ==(other)
+    other.kind_of?(OpenSSL::PKey::PKey) &&
+      self.hash == other.hash
+  end
+  alias_method :eql?, :==
+
+  def hash
+    to_pem.hash
+  end
+end
+
+OpenSSL::PKey::PKey.send(:include, OpenSSLExtensions::PKey::PKey)

data/lib/openssl-extensions/version.rb

@@ -1,3 +1,3 @@
 module OpenSSLExtensions
-  Version = '1.0.0'
+  Version = '1.1.0'
 end

data/spec/fixtures/keys/dsa.key

@@ -0,0 +1,20 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIDPQIBAAKCAQEAiVNJHKZ1id9fDSwG1Ze3Klp2prgLNK42YbkWz2Zf/fubDAU5
+VIdbDAVNJfUrA0ZcMDdFXUw7UbU5rY4rBQWt3OmUD6YTDZoiAZ8wgqU8G6RPf/jh
+erimlVirUWWXGvef5EtXWZ1TaCNHBb9eErSuLWabFjwBDhezgP5ERswBSGDLvB0b
+pabFN8wp/aMgUv315qCPo9meekhPjv0kxqoOai0Jpgl31W/FuJE80tEDBLoVdxvG
+rX7tb9WffBDlonQzEFj5kargRLElZHMo4iQq8l+NmQjVdFQCRrzxwSXpM5B4QYmw
+OKvbr3/6+RBTlymWiY1PoLo0PL70/DFZVT80SwIVAJcUyYEMiZCpIiDBgG7HgUIM
+vpX7AoIBAHtG/S/nEbvdS1rUkUsxJEH4C2wWHUqIpVjpKnwPKDrW4wVDchg4Bblu
+ckK3+6SnFGPyMxiChOtSux1AUwAd170OFp2a4kYHDnjM+Z/rGVlE8Ou5wS7NYEYr
+N707TFTUyQ2S/Gp/+UWmFyfMb2pZcB66KhLT5HMMA1EpHagxRzI9YXgRNIlh7al1
+GOVoG9orz80NJkyZF5AOIXwXLGXJN6Y03V4E9uyIdfnkDyjlcwHHLqy6Jit1r/Q1
+KXOf9vzFhXZ5zClR8WQNjrgd9YKRaMcZl5CjLg5cR+Q/zLfEPmrf2wbnA6plOWCr
+fpHjZke9EolwPBLGPtX+L3mblZAQguQCggEAS0ncfxyk8PPXxTRFTE0ztPijWUIb
+0w8yFKMkV0Cn5XBCIQ7lB3Q9wrlBgxoOuMCJcILyUru8sOlynYTJEmDen3WtHUIs
+wbwd2DevrFM5c9/fWL0ZHghdefzrY47/urzqgFl9L7yCCBMM/WwTjgNMwcuG2NMM
+iXXpwjy6hD5DuXVHAmJ9i45ciDR+WVfFsVp3SvUWB6Pq0CraAE+S5Z8BRyiSmEHR
+4n3NGAnDm7ztFKBIOa+mca1hTN7ggUQ+AkknOd90defpDcoGl2250sgwxZacS1A3
+XIZT4X7/cOrxlfpfxkFUNFW/yVGKhvhGxq6BcEBmrxIpKmDm7Fu7tfdHRgIUJgS4
+GiwEtZtv2O0Jh/DHgJ/2nc0=
+-----END DSA PRIVATE KEY-----

data/spec/fixtures/keys/rsa.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA3f3Bou3FMmtUGzCgmSsNAg+qZspDR1b/Ym9V+cfqHup4yzJf
+YGysS7ISiHfeny+AoMxeIycFMwfu28zKBo90wxNe9AMSFUEcwzUCSH7ZgErEZS+n
+siXIV3+ZfDOl3/dZ2Nu8pzBBtoRIga9QKlfzTbudiysxjAQF3dk37lZ+vAJt3sJh
+ThcGZy1yqYPvN6NQw65hUuqm+zvRzgk+ZIDXs6cZXzZX+LjWRKZivbeNQDiQF4Z2
+Qsf0GSFV4hb5ASLtdl8FFdV7wEda7XTsHrxOHYgNnlhtKgflGDwC0Q2Ll92b8xY6
+vWL4KmZFPm1drHlSr6Ssv+XjceZArz4cii5SsQIDAQABAoIBAA1vE87GUM6yTA6x
+LKbYQhtD024RA21HyICueCd7f6GLUvAJBliRewPBrPlxN5muiDwy4eeCrv/dlQjc
+JcWr3McJXw+pN+jtXc46YP7+Hi9zVttAvQc83hjdce5gOcOJ9nf3JD2B4BgpfTHL
+6DAHzoN/vRL09DSi8a/xOz9DILxD1H2rz7U4932VpMfFJvGvg5Cnh2pXg6mBo4IB
+t5JHHWm8wPoQzhVqo4AXltc3J8oi5nWC5gCgnx2dOt9OBBtrRLvofo4SYOs5ZX4N
+ZjPm9zgrzL0JDpVWE1ZOGK6eC8Nd2k0hTN85XmzZR7bWvblq9/nIYbkPm88GkDvi
+YRW2jzkCgYEA+GmrmHQqua471KNk9qLFww5wfJHyBfoD5XVp0xnPb2+9gC2si8+W
+6wLF01zU1fGB4rHXrlDLM0gjk93LBCLLK11tZuYDDAjAoWgBalcmVINiHowLKfUA
+goJb2styB3Oy+uVwPXw2fCa4m7jwB1mfghmOAI2NBgC4vW2c4LfoJy8CgYEA5MV/
+Q69oDtlnM45zverQkCZjtu69oZWYrkX0Iloj78MxEn36XFkcLfQXG6fCopGKneED
+HOwCMR2nGifexzRcp21sXA1r/46VAhwM260ssDOUQN2DoxngOaMUgZHCm6zGuq4k
+YBv6atSTrWL9wLCH4Iu82lIE5UauRULAirGirB8CgYB3zcbDPOtKJ7yVPcQ4qqIE
+A5e+jEiUF1L/vBOwitcfIF3dTqnTt+dKKkksOa4wDEye/zRMzoxhjB4UdzgtI3am
+0GUt5ip8CFCWx2k/Vw6WXdLZdqL/tjhruOEB8XJqI6OjGzp5fMluMOKBv7yLXu7t
+uNNicuIbjgeK3C13t1pQYwKBgF7ymR8+bbG8CVkchm0MSAOL61bBP3MQ441w+yJG
+xyN7n6JNJtutIETySaTwu5c9UIq2GNSoH0DDTddNNOj4knvqrk6GQ4yNYMq/WZbT
+CPkYby98wGWxF57UUG52UI7L5q8UF4TMF+K+14veyfJvUfWgCYGTCPUfoLSeP8tQ
+bnOBAoGBAO2uosK4fpL/aasgNdnQl6C0LxYdexWUkv5Qmhyqh24mPNIPmqaQeFVm
+OIzf/MfUBz1y7th/37hjICUVUuCk1siXltlflbw1q2AJMT3ZHxCpBwQyKjO2QWqM
+yWRMZH2Bjn0P7+pxVfKX5bfItH3rBFyQmkAi73KB3hf4amT0q3Ku
+-----END RSA PRIVATE KEY-----

data/spec/integration/openssl/pkey/pkey_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe OpenSSL::PKey::PKey do
+  subject { pkeys('rsa') }
+
+  it 'includes the OpenSSLExtensions::PKey::PKey extensions' do
+    subject.should be_kind_of OpenSSLExtensions::PKey::PKey
+  end
+end

data/spec/models/openssl-extensions/pkey/pkey_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe OpenSSLExtensions::PKey::PKey do
+  subject { extended_pkeys('rsa') }
+
+  context '==' do
+    it 'is true for matching keys' do
+      subject.should == extended_pkeys('rsa')
+    end
+
+    it 'is false for mismatched keys' do
+      subject.should_not == extended_pkeys('dsa')
+    end
+  end
+
+  context 'eql?' do
+    it 'is true for matching keys' do
+      subject.should be_eql extended_pkeys('rsa')
+    end
+
+    it 'is false for mismatched keys' do
+      subject.should_not be_eql extended_pkeys('dsa')
+    end
+  end
+
+  context 'hash' do
+    it 'returns the hash of the PEM string' do
+      subject.stub!(:to_pem => mock('PEM', :hash => 'test'))
+      subject.hash
+    end
+  end
+end

data/spec/support/pkey_fixtures.rb

@@ -0,0 +1,46 @@
+module PKeyFixtures
+  ##
+  # Returns an OpenSSL::X509::Certificate without explicit extensions.
+  #
+  def pkeys(name)
+    name = name.to_s.downcase.gsub(/[^\w\.]/, '-')
+    pkey_path = File.expand_path("../../fixtures/keys/#{name}.key", __FILE__)
+    key = nil
+
+    if File.exist?(pkey_path) && File.readable?(pkey_path)
+      data = File.read(pkey_path)
+      key = [
+        OpenSSL::PKey::RSA,
+        OpenSSL::PKey::DSA,
+        OpenSSL::PKey::EC,
+        OpenSSL::PKey::DH
+      ].collect { |klass| instantiate_pkey(data, klass) }.
+        detect { |key| !key.nil? }
+      data = nil
+    end
+
+    key
+  end
+
+  ##
+  # Returns an OpenSSL::PKey explicitly extended with 
+  # OpenSSLExtensions::PKey::PKey.
+  #
+  def extended_pkeys(name)
+    pkeys(name).extend(OpenSSLExtensions::PKey::PKey)
+  end
+
+
+  protected
+
+
+  def instantiate_pkey(data, klass)
+    klass.new(data)
+  rescue OpenSSL::PKey::PKeyError
+    nil
+  end
+end
+
+RSpec.configure do |config|
+  config.include PKeyFixtures
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openssl-extensions
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nathaniel Bibler
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
@@ -58,6 +61,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/openssl-extensions/all.rb
+- lib/openssl-extensions/pkey/pkey.rb
+- lib/openssl-extensions/pkey.rb
 - lib/openssl-extensions/ssl/ssl_socket.rb
 - lib/openssl-extensions/ssl.rb
 - lib/openssl-extensions/version.rb
@@ -89,10 +94,14 @@ files:
 - spec/fixtures/certificates/hongkong-post-root-ca.pem
 - spec/fixtures/certificates/www.geocerts.com.pem
 - spec/fixtures/certificates/www.twongo.com.pem
+- spec/fixtures/keys/dsa.key
+- spec/fixtures/keys/rsa.key
+- spec/integration/openssl/pkey/pkey_spec.rb
 - spec/integration/openssl/ssl/ssl_socket_spec.rb
 - spec/integration/openssl/x509/certificate_spec.rb
 - spec/integration/openssl/x509/name_spec.rb
 - spec/integration/openssl/x509/request_spec.rb
+- spec/models/openssl-extensions/pkey/pkey_spec.rb
 - spec/models/openssl-extensions/ssl/ssl_socket_spec.rb
 - spec/models/openssl-extensions/x509/authority_key_identifier_spec.rb
 - spec/models/openssl-extensions/x509/certificate_chain_spec.rb
@@ -102,6 +111,7 @@ files:
 - spec/models/openssl-extensions_spec.rb
 - spec/spec_helper.rb
 - spec/support/certificate_request_fixtures.rb
+- spec/support/pkey_fixtures.rb
 - spec/support/ssl_certificate_fixtures.rb
 has_rdoc: true
 homepage: http://github.com/envylabs/openssl-extensions
@@ -117,6 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -125,6 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -156,10 +168,14 @@ test_files:
 - spec/fixtures/certificates/hongkong-post-root-ca.pem
 - spec/fixtures/certificates/www.geocerts.com.pem
 - spec/fixtures/certificates/www.twongo.com.pem
+- spec/fixtures/keys/dsa.key
+- spec/fixtures/keys/rsa.key
+- spec/integration/openssl/pkey/pkey_spec.rb
 - spec/integration/openssl/ssl/ssl_socket_spec.rb
 - spec/integration/openssl/x509/certificate_spec.rb
 - spec/integration/openssl/x509/name_spec.rb
 - spec/integration/openssl/x509/request_spec.rb
+- spec/models/openssl-extensions/pkey/pkey_spec.rb
 - spec/models/openssl-extensions/ssl/ssl_socket_spec.rb
 - spec/models/openssl-extensions/x509/authority_key_identifier_spec.rb
 - spec/models/openssl-extensions/x509/certificate_chain_spec.rb
@@ -169,4 +185,5 @@ test_files:
 - spec/models/openssl-extensions_spec.rb
 - spec/spec_helper.rb
 - spec/support/certificate_request_fixtures.rb
+- spec/support/pkey_fixtures.rb
 - spec/support/ssl_certificate_fixtures.rb