libsaml 2.20.2 → 2.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87837a0136528b1b5aa4dfb2ed4acb70846ae2d8
-  data.tar.gz: 16a38221b628e95e2e2899046f68a9f0c327b2f0
+  metadata.gz: d3f4ae4023005cf57f6570cddf132b20294ec6ff
+  data.tar.gz: ff7959e530c2db13bd031550eb5e531f41281499
 SHA512:
-  metadata.gz: c5d64f0871f02694347288e850c80e0eca60b2c1ff9b49ae92fef3107b11771433d7ada24bd7fa517b14d4d7b3946ad7786294d578401e2f92c69cce40293228
-  data.tar.gz: 8289e202bbca07d1a9fff86117c014b021f7c659a6efeb11bcb1bb6206e1120110c95f42ea0bdd12b8d9411bc18acf75b282ec60058e5181a6cbe34c8b6d1bc0
+  metadata.gz: 6e3582842cd2a36beb40d06875f7731ef100e97313876ae68a29af840bb61b3ca79b9f309f1a84e5585d904e9bcdbfbaa1ff40a9638e14f253ffdca164237563
+  data.tar.gz: 6669b85141226fa1e25b50894833d39c2267cc8bd44739fd7dedb6644d59ce1d6fc746dc3d212251118d0cb82fcb46481f7102dca1a1c6f8d834db371a44c65a

data/lib/saml/config.rb

@@ -6,11 +6,11 @@ module Saml
     mattr_accessor :max_issue_instant_offset
     @@max_issue_instant_offset = 2
 
-    mattr_accessor :ssl_private_key_file
-    @@ssl_private_key_file = nil
+    mattr_accessor :ssl_private_key
+    @@ssl_private_key = nil
 
-    mattr_accessor :ssl_certificate_file
-    @@ssl_certificate_file = nil
+    mattr_accessor :ssl_certificate
+    @@ssl_certificate = nil
 
     mattr_accessor :http_ca_file
     @@http_ca_file = nil
@@ -27,7 +27,25 @@ module Saml
       registered_stores[name] = store
       self.default_store = name if options[:default]
     end
-
     module_function :register_store
+
+    def ssl_private_key_file=(private_key_file)
+      if private_key_file.present?
+        self.ssl_private_key = OpenSSL::PKey::RSA.new File.read(private_key_file)
+      else
+        self.ssl_private_key = nil
+      end
+    end
+    module_function :ssl_private_key_file=
+
+    def ssl_certificate_file=(certificate_file)
+      if certificate_file.present?
+        self.ssl_certificate = OpenSSL::X509::Certificate.new File.read(certificate_file)
+      else
+        self.ssl_certificate = nil
+      end
+    end
+    module_function :ssl_certificate_file=
+
   end
 end

data/lib/saml/util.rb

@@ -154,12 +154,10 @@ module Saml
       end
 
       def add_ssl_certificate_and_key(http)
-        return http unless Saml::Config.ssl_certificate_file.present?
-        return http unless Saml::Config.ssl_private_key_file.present?
-        cert = File.read(Saml::Config.ssl_certificate_file)
-        key  = File.read(Saml::Config.ssl_private_key_file)
-        http.cert = OpenSSL::X509::Certificate.new(cert)
-        http.key  = OpenSSL::PKey::RSA.new(key)
+        return http unless Saml::Config.ssl_certificate.present?
+        return http unless Saml::Config.ssl_private_key.present?
+        http.key  = Saml::Config.ssl_private_key
+        http.cert = Saml::Config.ssl_certificate
         http
       end
     end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.20.2"
+  VERSION = '2.20.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.20.2
+  version: 2.20.3
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport