openssl-extensions 0.0.7 → 0.0.8

data/lib/openssl-extensions/all.rb

@@ -3,5 +3,6 @@ OpenSSLExtensions.check_dependencies!
 
 require 'openssl-extensions/x509/certificate'
 require 'openssl-extensions/x509/certificate_chain'
+require 'openssl-extensions/x509/request'
 require 'openssl-extensions/x509/name'
 require 'openssl-extensions/ssl/ssl_socket'

data/lib/openssl-extensions/version.rb

@@ -1,3 +1,3 @@
 module OpenSSLExtensions
-  Version = '0.0.7'
+  Version = '0.0.8'
 end

data/lib/openssl-extensions/x509/certificate.rb

@@ -6,31 +6,13 @@ require 'openssl-extensions/x509/authority_key_identifier'
 #
 module OpenSSLExtensions::X509::Certificate
 
-  def subject_alternative_names
-    names_string = read_extension_by_oid('subjectAltName')
-    names_string ? names_string.scan(%r{DNS:([^,]+)}).flatten : []
-  end
-  alias :sans :subject_alternative_names
-
   ##
-  # Returns the bit strength of the public certificate.
+  # Equality is tested by comparing the generated PEM signatures.
   #
-  def strength
-    public_key.n.num_bits
-  end
-
-  def subject_key_identifier
-    read_extension_by_oid('subjectKeyIdentifier')
-  end
-
-  def authority_key_identifier
-    OpenSSLExtensions::X509::AuthorityKeyIdentifier.new(read_extension_by_oid('authorityKeyIdentifier'))
-  end
-
-  def read_extension_by_oid(oid)
-    (extensions.detect { |e| e.to_a.first == oid } || []).to_a[1]
+  def ==(other)
+    to_pem == other.to_pem
   end
-  protected :read_extension_by_oid
+  alias_method :eql?, :==
 
   ##
   # Returns +true+ if this certificate is authorized to sign for other certificates (useful for determining CA roots
@@ -41,6 +23,18 @@ module OpenSSLExtensions::X509::Certificate
     usage.nil? || !!(usage.match(%r{\bCertificate Sign\b}))
   end
 
+  def authority_key_identifier
+    OpenSSLExtensions::X509::AuthorityKeyIdentifier.new(read_extension_by_oid('authorityKeyIdentifier'))
+  end
+
+  ##
+  # Override the default Object#hash to identify uniqueness of the
+  # Certificate.  This uses a hash of the certificate PEM.
+  # 
+  def hash
+    to_pem.hash
+  end
+
   ##
   # Returns +true+ if the certificate given is the issuer certificate for this certificate.
   #
@@ -54,6 +48,11 @@ module OpenSSLExtensions::X509::Certificate
        self.issuer.organization == issuer.subject.organization)
   end
 
+  def read_extension_by_oid(oid)
+    (extensions.detect { |e| e.to_a.first == oid } || []).to_a[1]
+  end
+  protected :read_extension_by_oid
+
   ##
   # Returns +true+ if this certificate is a root certificate (it is its
   # own issuer).
@@ -64,20 +63,26 @@ module OpenSSLExtensions::X509::Certificate
   end
 
   ##
-  # Equality is tested by comparing the generated PEM signatures.
+  # Returns the bit strength of the public certificate.
   #
-  def ==(other)
-    to_pem == other.to_pem
+  def strength
+    public_key.n.num_bits
   end
-  alias_method :eql?, :==
 
   ##
-  # Override the default Object#hash to identify uniqueness of the
-  # Certificate.  This uses a hash of the certificate PEM.
-  # 
-  def hash
-    to_pem.hash
+  # Returns a collection of subject alternative names on the certificate.
+  # If no alternative names were provided, then this returns an empty set.
+  #
+  def subject_alternative_names
+    names_string = read_extension_by_oid('subjectAltName')
+    names_string ? names_string.scan(%r{DNS:([^,]+)}).flatten : []
+  end
+  alias :sans :subject_alternative_names
+
+  def subject_key_identifier
+    read_extension_by_oid('subjectKeyIdentifier')
   end
+
 end
 
 OpenSSL::X509::Certificate.send(:include, OpenSSLExtensions::X509::Certificate)

data/lib/openssl-extensions/x509/request.rb

@@ -0,0 +1,68 @@
+require 'openssl-extensions/x509'
+
+##
+# Extends OpenSSL::X509::Request with shortcut methods.
+#
+module OpenSSLExtensions::X509::Request
+
+  ##
+  # Equality is tested by comparing the generated PEM signatures.
+  #
+  def ==(other)
+    to_pem == other.to_pem
+  end
+  alias_method :eql?, :==
+
+  ##
+  # Returns +true+ if the signing request were generated with a challenge
+  # password.
+  #
+  def challenge_password?
+    !read_attributes_by_oid('challengePassword').nil?
+  end
+
+  ##
+  # Override the default Object#hash to identify uniqueness of the
+  # Request.  This uses a hash of the PEM.
+  # 
+  def hash
+    to_pem.hash
+  end
+
+  def read_attributes_by_oid(*oids)
+    attributes.detect { |a| oids.include?(a.oid) }
+  end
+  protected :read_attributes_by_oid
+
+  ##
+  # Returns the bit strength of the public key used for the signing
+  # request.
+  #
+  def strength
+    public_key.n.num_bits
+  end
+
+  ##
+  # Returns a collection of subject alternative names requested.  If no
+  # alternative names were requested, this returns an empty set.
+  #
+  def subject_alternative_names
+    @_subject_alternative_names ||= begin
+      if attribute = read_attributes_by_oid('extReq', 'msExtReq')
+        set = OpenSSL::ASN1.decode(attribute.value)
+        seq = set.value.first
+        if sans = seq.value.collect { |asn1ext| OpenSSL::X509::Extension.new(asn1ext).to_a }.detect { |e| e.first == 'subjectAltName' }
+          sans[1].gsub(/DNS:/,'').split(', ')
+        else
+          []
+        end
+      else
+        []
+      end
+    end
+  end
+  alias :sans :subject_alternative_names
+
+end
+
+OpenSSL::X509::Request.send(:include, OpenSSLExtensions::X509::Request)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openssl-extensions
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Nathaniel Bibler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -04:00
+date: 2010-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,16 +26,30 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196421
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+        version: 2.1.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fuubar
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :development
+  version_requirements: *id002
 description: This library patches OpenSSL to add helper methods and extensions to OpenSSL objects with the intention of making the interface more intuitive.
 email: 
 - nate@envylabs.com
@@ -54,6 +68,7 @@ files:
 - lib/openssl-extensions/x509/certificate.rb
 - lib/openssl-extensions/x509/certificate_chain.rb
 - lib/openssl-extensions/x509/name.rb
+- lib/openssl-extensions/x509/request.rb
 - lib/openssl-extensions/x509.rb
 - lib/openssl-extensions.rb
 has_rdoc: true