r509 0.9.2 → 0.10.0

data/spec/csr_spec.rb

@@ -28,7 +28,7 @@ describe R509::CSR do
     expect { R509::CSR.new('invalid') }.to raise_error(ArgumentError, 'Must provide a hash of options')
   end
   it "key creation defaults to RSA when no type or key is passed" do
-    csr = R509::CSR.new(:subject => [['CN','testing.rsa']], :bit_strength => 1024)
+    csr = R509::CSR.new(:subject => [['CN','testing.rsa']], :bit_length => 1024)
     csr.rsa?.should == true
     csr.dsa?.should == false
     csr.ec?.should == false
@@ -46,19 +46,19 @@ describe R509::CSR do
     csr.to_pem.should match(/-----BEGIN CERTIFICATE REQUEST-----/)
   end
   it "returns true from #has_private_key? when private key is present" do
-    csr = R509::CSR.new(:bit_strength => 512, :subject => [['CN','private-key-check.com']])
+    csr = R509::CSR.new(:bit_length => 512, :subject => [['CN','private-key-check.com']])
     csr.has_private_key?.should == true
   end
   it "returns false from #has_private_key? when private key is not present" do
     csr = R509::CSR.new(:csr => @csr)
     csr.has_private_key?.should == false
   end
-  it "key creation defaults to 2048 when no bit strength or key is passed" do
+  it "key creation defaults to 2048 when no bit length or key is passed" do
     csr = R509::CSR.new(:subject => [['CN','testing2048.rsa']])
-    csr.bit_strength.should == 2048
+    csr.bit_length.should == 2048
   end
   it "creates a CSR when a key is provided" do
-    csr = R509::CSR.new(:key => @key3, :subject => [['CN','pregenerated.com']], :bit_strength => 1024)
+    csr = R509::CSR.new(:key => @key3, :subject => [['CN','pregenerated.com']], :bit_length => 1024)
     csr.to_pem.should match(/CERTIFICATE REQUEST/)
     #validate the CSR matches the key
     csr.req.verify(csr.key.public_key).should == true
@@ -71,10 +71,10 @@ describe R509::CSR do
     expect { R509::CSR.new(:subject => [['CN','error.com']], :csr => @csr) }.to raise_error(ArgumentError,'You must provide :subject or :csr, not both')
   end
   it "raises an exception for not providing valid type when key is nil" do
-    expect { R509::CSR.new(:subject => [['CN','error.com']], :type => :invalid_symbol) }.to raise_error(ArgumentError,'Must provide :rsa, :dsa, or :ec as type when key is nil')
+    expect { R509::CSR.new(:subject => [['CN','error.com']], :type => :invalid_symbol) }.to raise_error(ArgumentError,"Must provide #{R509::PrivateKey::KNOWN_TYPES.join(", ")} as type when key is nil")
   end
   it "raises an exception when you don't provide :subject or :csr" do
-    expect { R509::CSR.new(:bit_strength => 1024) }.to raise_error(ArgumentError,'You must provide :subject or :csr')
+    expect { R509::CSR.new(:bit_length => 1024) }.to raise_error(ArgumentError,'You must provide :subject or :csr')
   end
   it "raises an exception if you provide a list of domains with an existing CSR" do
     expect { R509::CSR.new(:csr => @csr, :san_names => ['moredomainsiwanttoadd.com']) }.to raise_error(ArgumentError,'You can\'t add domains to an existing CSR')
@@ -88,7 +88,7 @@ describe R509::CSR do
     #see http://www.ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/PKey/DSA.html
   end
   it "changes the message_digest to DSS1 when creating a DSA key" do
-    csr = R509::CSR.new(:subject => [["CN","dsasigned.com"]], :type => :dsa, :bit_strength => 512)
+    csr = R509::CSR.new(:subject => [["CN","dsasigned.com"]], :type => "dsa", :bit_length => 512)
     csr.message_digest.name.should == 'dss1'
     csr.signature_algorithm.should == 'dsaWithSHA1'
     #dss1 is actually the same as SHA1
@@ -100,7 +100,7 @@ describe R509::CSR do
     csr.verify_signature.should == true
   end
   it "signs a CSR properly when creating a DSA key" do
-    csr = R509::CSR.new(:subject => [["CN","dsasigned.com"]], :type => :dsa, :bit_strength => 512)
+    csr = R509::CSR.new(:subject => [["CN","dsasigned.com"]], :type => "dsa", :bit_length => 512)
     csr.verify_signature.should == true
   end
   it "writes to pem" do
@@ -118,11 +118,18 @@ describe R509::CSR do
     sio.string.should == @csr_der
   end
   it "duplicate SAN names should be removed" do
-    csr = R509::CSR.new( :bit_strength => 512, :subject => [['CN','test2345.com']], :san_names => ["test2.local","test.local","test.local"] )
+    csr = R509::CSR.new( :bit_length => 512, :subject => [['CN','test2345.com']], :san_names => ["test2.local","test.local","test.local"] )
     csr.san.dns_names.should == ["test2.local", "test.local"]
   end
+  it "existing GeneralNames object passed to CSR should be used" do
+    gn = R509::ASN1::GeneralNames.new
+    gn.create_item(:type => 'dNSName', :value => '127.0.0.1')
+    gn.create_item(:type => 'dNSName', :value => '127.0.0.2')
+    csr = R509::CSR.new( :bit_length => 512, :subject => [['CN','test2345.com']], :san_names => gn )
+    csr.san.dns_names.should == ["127.0.0.1", "127.0.0.2"]
+  end
   it "san is nil when there are no SAN names" do
-    csr = R509::CSR.new( :subject => [['CN','langui.sh'],['emailAddress','ca@langui.sh']], :bit_strength => 512)
+    csr = R509::CSR.new( :subject => [['CN','langui.sh'],['emailAddress','ca@langui.sh']], :bit_length => 512)
     csr.san.nil?.should == true
   end
   context "when initialized" do
@@ -135,15 +142,15 @@ describe R509::CSR do
   end
   context "when passing a subject array" do
     it "generates a matching CSR" do
-      csr = R509::CSR.new( :subject=> [['CN','langui.sh'],['ST','Illinois'],['L','Chicago'],['C','US'],['emailAddress','ca@langui.sh']], :bit_strength => 1024)
+      csr = R509::CSR.new( :subject=> [['CN','langui.sh'],['ST','Illinois'],['L','Chicago'],['C','US'],['emailAddress','ca@langui.sh']], :bit_length => 1024)
       csr.subject.to_s.should == '/CN=langui.sh/ST=Illinois/L=Chicago/C=US/emailAddress=ca@langui.sh'
     end
     it "generates a matching csr when supplying raw oids" do
-      csr = R509::CSR.new( :subject => [['2.5.4.3','common name'],['2.5.4.15','business category'],['2.5.4.7','locality'],['1.3.6.1.4.1.311.60.2.1.3','jurisdiction oid openssl typically does not know']], :bit_strength => 1024 )
+      csr = R509::CSR.new( :subject => [['2.5.4.3','common name'],['2.5.4.15','business category'],['2.5.4.7','locality'],['1.3.6.1.4.1.311.60.2.1.3','jurisdiction oid openssl typically does not know']], :bit_length => 1024 )
       csr.subject.to_s.should == "/CN=common name/businessCategory=business category/L=locality/jurisdictionOfIncorporationCountryName=jurisdiction oid openssl typically does not know"
     end
     it "adds SAN names to a generated CSR" do
-      csr = R509::CSR.new( :subject => [['CN','test']], :bit_strength => 1024, :san_names => ['1.2.3.4','http://langui.sh','email@address.local','domain.internal','2.3.4.5',[['CN','dirnametest']]])
+      csr = R509::CSR.new( :subject => [['CN','test']], :bit_length => 1024, :san_names => ['1.2.3.4','http://langui.sh','email@address.local','domain.internal','2.3.4.5',[['CN','dirnametest']]])
       csr.san.ip_addresses.should == ['1.2.3.4','2.3.4.5']
       csr.san.dns_names.should == ['domain.internal']
       csr.san.uris.should == ['http://langui.sh']
@@ -153,9 +160,9 @@ describe R509::CSR do
     end
   end
   context "when supplying an existing csr" do
-    it "populates the bit_strength" do
+    it "populates the bit_length" do
       csr = R509::CSR.new({ :csr => @csr })
-      csr.bit_strength.should == 2048
+      csr.bit_length.should == 2048
     end
     it "populates the subject" do
       csr = R509::CSR.new({ :csr => @csr })
@@ -183,11 +190,11 @@ describe R509::CSR do
     end
     it "returns RSA key algorithm for RSA CSR" do
       csr = R509::CSR.new({ :csr => @csr })
-      csr.key_algorithm.should == :rsa
+      csr.key_algorithm.should == "RSA"
     end
     it "returns DSA key algorithm for DSA CSR" do
       csr = R509::CSR.new({ :csr => @csr_dsa })
-      csr.key_algorithm.should == :dsa
+      csr.key_algorithm.should == "DSA"
     end
     it "returns the public key" do
       #this is more complex than it should have to be. diff versions of openssl
@@ -221,32 +228,32 @@ describe R509::CSR do
   end
   context "when setting alternate signature algorithms" do
     it "sets sha1 if you pass an invalid message digest" do
-      csr = R509::CSR.new(:message_digest => 'sha88', :bit_strength => 512, :subject => [['CN','langui.sh']])
+      csr = R509::CSR.new(:message_digest => 'sha88', :bit_length => 512, :subject => [['CN','langui.sh']])
       csr.message_digest.name.should == 'sha1'
       csr.signature_algorithm.should == "sha1WithRSAEncryption"
     end
     it "sets sha224 properly" do
-      csr = R509::CSR.new(:message_digest => 'sha224', :bit_strength => 512, :subject => [['CN','sha224-signature-alg.test']])
+      csr = R509::CSR.new(:message_digest => 'sha224', :bit_length => 512, :subject => [['CN','sha224-signature-alg.test']])
       csr.message_digest.name.should == 'sha224'
       csr.signature_algorithm.should == "sha224WithRSAEncryption"
     end
     it "sets sha256 properly" do
-      csr = R509::CSR.new(:message_digest => 'sha256', :bit_strength => 512, :subject => [['CN','sha256-signature-alg.test']])
+      csr = R509::CSR.new(:message_digest => 'sha256', :bit_length => 512, :subject => [['CN','sha256-signature-alg.test']])
       csr.message_digest.name.should == 'sha256'
       csr.signature_algorithm.should == "sha256WithRSAEncryption"
     end
     it "sets sha384 properly" do
-      csr = R509::CSR.new(:message_digest => 'sha384', :bit_strength => 768, :subject => [['CN','sha384-signature-alg.test']])
+      csr = R509::CSR.new(:message_digest => 'sha384', :bit_length => 768, :subject => [['CN','sha384-signature-alg.test']])
       csr.message_digest.name.should == 'sha384'
       csr.signature_algorithm.should == "sha384WithRSAEncryption"
     end
     it "sets sha512 properly" do
-      csr = R509::CSR.new(:message_digest => 'sha512', :bit_strength => 1024, :subject => [['CN','sha512-signature-alg.test']])
+      csr = R509::CSR.new(:message_digest => 'sha512', :bit_length => 1024, :subject => [['CN','sha512-signature-alg.test']])
       csr.message_digest.name.should == 'sha512'
       csr.signature_algorithm.should == "sha512WithRSAEncryption"
     end
     it "sets md5 properly" do
-      csr = R509::CSR.new(:message_digest => 'md5', :bit_strength => 512, :subject => [['CN','md5-signature-alg.test']])
+      csr = R509::CSR.new(:message_digest => 'md5', :bit_length => 512, :subject => [['CN','md5-signature-alg.test']])
       csr.message_digest.name.should == 'md5'
       csr.signature_algorithm.should == "md5WithRSAEncryption"
     end
@@ -257,13 +264,13 @@ describe R509::CSR do
     csr.ec?.should == false
     csr.dsa?.should == false
   end
-  it "gets RSA bit strength" do
+  it "gets RSA bit length" do
     csr = R509::CSR.new({:csr => @csr})
-    csr.bit_strength.should == 2048
+    csr.bit_length.should == 2048
   end
   it "returns an error for curve_name for dsa/rsa CSRs" do
     csr = R509::CSR.new(:csr => @csr)
-    expect { csr.curve_name }.to raise_error(R509::R509Error, 'Curve name is only available with EC CSRs')
+    expect { csr.curve_name }.to raise_error(R509::R509Error, 'Curve name is only available with EC')
   end
   it "checks dsa?" do
     csr = R509::CSR.new({:csr => @csr_dsa})
@@ -271,9 +278,9 @@ describe R509::CSR do
     csr.ec?.should == false
     csr.dsa?.should == true
   end
-  it "gets DSA bit strength" do
+  it "gets DSA bit length" do
     csr = R509::CSR.new({:csr => @csr_dsa})
-    csr.bit_strength.should == 1024
+    csr.bit_length.should == 1024
   end
 
   it "loads a csr with load_from_file" do
@@ -292,20 +299,20 @@ describe R509::CSR do
       csr.curve_name.should == "secp384r1"
     end
     it "generates a CSR with default curve" do
-      csr = R509::CSR.new(:type => :ec, :subject => [["CN","ec-test.local"]])
+      csr = R509::CSR.new(:type => "EC", :subject => [["CN","ec-test.local"]])
       csr.curve_name.should == "secp384r1"
     end
     it "generates a CSR with explicit curve" do
-      csr = R509::CSR.new(:type => :ec, :curve_name => "sect283r1", :subject => [["CN","ec-test.local"]])
+      csr = R509::CSR.new(:type => "EC", :curve_name => "sect283r1", :subject => [["CN","ec-test.local"]])
       csr.curve_name.should == "sect283r1"
     end
-    it "raises error on bit strength" do
+    it "raises error on bit length" do
       csr = R509::CSR.new(:csr => @ec_csr2_der)
-      expect { csr.bit_strength }.to raise_error(R509::R509Error,'Bit strength is not available for EC at this time.')
+      expect { csr.bit_length }.to raise_error(R509::R509Error,'Bit length is not available for EC at this time.')
     end
     it "returns the key algorithm" do
       csr = R509::CSR.new(:csr => @ec_csr2_pem)
-      csr.key_algorithm.should == :ec
+      csr.key_algorithm.should == "EC"
     end
     it "returns the public key" do
       csr = R509::CSR.new(:csr => @ec_csr2_pem)
@@ -317,7 +324,7 @@ describe R509::CSR do
       csr.ec?.should == true
     end
     it "sets alternate signature properly for EC" do
-      csr = R509::CSR.new(:message_digest => 'sha256', :type => :ec, :subject => [["CN","ec-signature-alg.test"]])
+      csr = R509::CSR.new(:message_digest => 'sha256', :type => "EC", :subject => [["CN","ec-signature-alg.test"]])
       csr.message_digest.name.should == 'sha256'
       csr.signature_algorithm.should == 'ecdsa-with-SHA256'
     end
@@ -340,7 +347,7 @@ describe R509::CSR do
     end
     it "returns RSA key algorithm for RSA CSR" do
       csr = R509::CSR.new({ :csr => @csr })
-      csr.key_algorithm.should == :rsa
+      csr.key_algorithm.should == "RSA"
     end
   end
 

data/spec/engine_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'r509/engine'
+
+# boilerplate to reset the singleton between tests
+class R509::Engine
+  def reset
+    @engines = {}
+  end
+end
+
+describe R509::Engine do
+  before :each do
+    R509::Engine.instance.reset
+  end
+
+  it "is a singleton" do
+    expect { R509::Engine.new }.to raise_error(StandardError)
+  end
+
+  it "raises an error if you don't supply an :so_path and :id" do
+    expect { R509::Engine.instance.load("not even a hash") }.to raise_error(ArgumentError, "You must supply a hash with both :so_path and :id")
+    expect { R509::Engine.instance.load({:so_path => "path"}) }.to raise_error(ArgumentError, "You must supply a hash with both :so_path and :id")
+  end
+
+  it "load returns a new engine" do
+    OpenSSL::Engine.should_receive(:load)
+    engine_double = double('engine')
+    OpenSSL::Engine.should_receive(:by_id).and_yield(engine_double).and_return(engine_double)
+    engine_double.should_receive(:ctrl_cmd).with("SO_PATH", "/some/path")
+    engine_double.should_receive(:ctrl_cmd).with("ID", "mocked")
+    engine_double.should_receive(:ctrl_cmd).with("LOAD")
+    engine = R509::Engine.instance.load(:so_path => "/some/path", :id => "mocked")
+    engine.should == engine_double
+  end
+
+  it "load returns pre-existing engine" do
+    OpenSSL::Engine.should_receive(:load)
+    OpenSSL::Engine.should_receive(:by_id).and_return("mocked_engine")
+    R509::Engine.instance.load(:so_path => "/some/path", :id => "mocked")
+    engine = R509::Engine.instance.load(:so_path => "/some/path", :id => "mocked")
+    engine.should == 'mocked_engine'
+  end
+
+  it "returns an engine with []" do
+    OpenSSL::Engine.should_receive(:load)
+    OpenSSL::Engine.should_receive(:by_id).and_return("mocked_engine")
+    R509::Engine.instance.load(:so_path => "/some/path", :id => "mocked")
+    R509::Engine.instance["mocked"].should == "mocked_engine"
+    R509::Engine.instance["other"].should be_nil
+  end
+end

data/spec/fixtures.rb

@@ -69,6 +69,8 @@ module TestFixtures
 
   CSR_INVALID_SIGNATURE = read_fixture('csr_invalid_signature.pem')
 
+  SPKI_INVALID_SIGNATURE = "MIIBOjCBpDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnk0rEYEFZS0KaOq1xb4pJbWMuTFbji9a5GDjgw8jDQh3YS5968sXqmTZS9Vm0ctOmicUka0MOfSwlVEzvLLh/5Na7A8dreOrGI3Qck9AsAEfCBWACZ4hTOfm23rBQYsR9FkEhDAVUXZm2JBPZM38c5QVV37NNr2zCD+CIoXhCjMCAwEAARYAMA0GCSqGSIb3DQEBBQUAA4GBAENx9YXoEYTCOkC9SX4qQFmRgCTFhZVB6E+aAW20KIndAchIctegOR4mzCHAgizmvgmboevG9meKOVZJRWLucElIOnXBFV7BORsn9HP8Bhc1ct3wip2Bwp9wFPM8MS7FyA/Csyze8eKh5wedXWTmPqHMcoUz2QP0lSu1iRZGLRps"
+
   CSR_DER = read_fixture('csr1.der')
 
   CSR_NEWLINES = read_fixture('csr1_newlines.pem')
@@ -128,6 +130,9 @@ module TestFixtures
   TEST_CA_OCSP_CERT = read_fixture('test_ca_ocsp.cer')
   TEST_CA_OCSP_KEY  = read_fixture('test_ca_ocsp.key')
 
+  TEST_CA_CRL_CERT = read_fixture('test_ca_crl.cer')
+  TEST_CA_CRL_KEY  = read_fixture('test_ca_crl.key')
+
   TEST_CA_SUBROOT_CERT = read_fixture('test_ca_subroot.cer')
   TEST_CA_SUBROOT_KEY  = read_fixture('test_ca_subroot.key')
 
@@ -161,6 +166,10 @@ module TestFixtures
     R509::Cert.new(:cert => TEST_CA_CERT, :key => TEST_CA_KEY)
   end
 
+  def self.test_ca_crl_delegate
+    R509::Cert.new(:cert => TEST_CA_CRL_CERT, :key => TEST_CA_CRL_KEY)
+  end
+
   def self.test_ca_ec_cert
     R509::Cert.new(:cert => TEST_CA_EC_CERT, :key => TEST_CA_EC_KEY)
   end
@@ -174,55 +183,54 @@ module TestFixtures
   end
 
   def self.test_ca_server_profile
-    R509::Config::CAProfile.new(
-        :basic_constraints => {"ca" => false },
-        :key_usage => ["digitalSignature","keyEncipherment"],
-        :extended_key_usage => ["serverAuth"],
-        :certificate_policies => [
-          { "policy_identifier" => "2.16.840.1.12345.1.2.3.4.1",
-  "cps_uris" => ["http://example.com/cps","http://other.com/cps"],
-  "user_notices" => [ {"explicit_text" => "thing", "organization" => "my org", "notice_numbers" => "1,2,3,4"} ]
-          }
-        ]
+    R509::Config::CertProfile.new(
+      :basic_constraints => R509::Cert::Extensions::BasicConstraints.new({:ca => false }),
+      :key_usage => R509::Cert::Extensions::KeyUsage.new(:value => ["digitalSignature","keyEncipherment"]),
+      :extended_key_usage => R509::Cert::Extensions::ExtendedKeyUsage.new(:value => ["serverAuth"]),
+      :certificate_policies => R509::Cert::Extensions::CertificatePolicies.new(:value => [
+          { :policy_identifier => "2.16.840.1.12345.1.2.3.4.1",
+  :cps_uris => ["http://example.com/cps","http://other.com/cps"],
+  :user_notices => [ {:explicit_text => "thing", :organization => "my org", :notice_numbers => [1,2,3,4]} ]
+        }
+      ])
     )
 
   end
 
   def self.test_ca_server_profile_with_subject_item_policy
     subject_item_policy = R509::Config::SubjectItemPolicy.new(
-      "CN" => "required",
-      "O" => "optional",
-      "ST" => "required",
-      "C" => "required",
-      "OU" => "optional"
+      "CN" => { :policy => "required"},
+      "O" => { :policy => "optional"},
+      "ST" => { :policy => "required"},
+      "C" => { :policy => "required"},
+      "OU" => { :policy => "optional"}
     )
-    R509::Config::CAProfile.new(
-      :basic_constraints => {"ca" => false },
-      :key_usage => ["digitalSignature","keyEncipherment"],
-      :extended_key_usage => ["serverAuth"],
-      :certificate_policies => [
-        { "policy_identifier" => "2.16.840.1.12345.1.2.3.4.1",
-"cps_uris" => ["http://example.com/cps","http://other.com/cps"],
-"user_notices" => [ {"explicit_text" => "thing", "organization" => "my org", "notice_numbers" => "1,2,3,4"} ]
+    R509::Config::CertProfile.new(
+      :basic_constraints => R509::Cert::Extensions::BasicConstraints.new({:ca => false }),
+      :key_usage => R509::Cert::Extensions::KeyUsage.new(:value => ["digitalSignature","keyEncipherment"]),
+      :extended_key_usage => R509::Cert::Extensions::ExtendedKeyUsage.new(:value => ["serverAuth"]),
+      :certificate_policies => R509::Cert::Extensions::CertificatePolicies.new(:value => [
+          { :policy_identifier => "2.16.840.1.12345.1.2.3.4.1",
+  :cps_uris => ["http://example.com/cps","http://other.com/cps"],
+  :user_notices => [ {:explicit_text => "thing", :organization => "my org", :notice_numbers => [1,2,3,4]} ]
         }
-      ],
+      ]),
       :subject_item_policy => subject_item_policy
     )
   end
 
   def self.test_ca_subroot_profile
-    R509::Config::CAProfile.new(
-          :basic_constraints => {"ca" => true, "path_length" => 0 },
-          :key_usage => ["keyCertSign","cRLSign"],
-          :extended_key_usage => [],
+    R509::Config::CertProfile.new(
+          :basic_constraints => {:ca => true, :path_length => 0 },
+          :key_usage => {:value => ["keyCertSign","cRLSign"]},
           :certificate_policies => nil)
   end
 
   def self.test_ca_ocspsigner_profile
-    R509::Config::CAProfile.new(
-          :basic_constraints => { "ca" => false },
-          :key_usage => ["digitalSignature"],
-          :extended_key_usage => ["OCSPSigning"],
+    R509::Config::CertProfile.new(
+          :basic_constraints => { :ca => false },
+          :key_usage => {:value => ["digitalSignature"]},
+          :extended_key_usage => {:value => ["OCSPSigning"]},
           :certificate_policies => nil)
   end
 
@@ -235,8 +243,6 @@ module TestFixtures
 
     opts = {
       :ca_cert => test_ca_cert(),
-      :cdp_location => ['http://crl.domain.com/test_ca.crl'],
-      :ocsp_location => ['http://ocsp.domain.com'],
       :ocsp_start_skew_seconds => 3600,
       :ocsp_validity_hours => 48,
       :crl_list_file => crl_list_sio,
@@ -261,8 +267,6 @@ module TestFixtures
 
     opts = {
       :ca_cert => test_ca_cert(),
-      :cdp_location => ['http://crl.domain.com/test_ca.crl'],
-      :ocsp_location => ['http://ocsp.domain.com'],
       :ocsp_start_skew_seconds => 3600,
       :ocsp_validity_hours => 48,
       :crl_list_file => crl_list_sio,
@@ -279,8 +283,6 @@ module TestFixtures
 
     opts = {
       :ca_cert => test_ca_ec_cert(),
-      :cdp_location => ['http://crl.domain.com/test_ca.crl'],
-      :ocsp_location => ['http://ocsp.domain.com'],
       :ocsp_start_skew_seconds => 3600,
       :ocsp_validity_hours => 48,
       :crl_list_file => crl_list_sio,
@@ -297,8 +299,6 @@ module TestFixtures
 
     opts = {
       :ca_cert => test_ca_dsa_cert(),
-      :cdp_location => ['http://crl.domain.com/test_ca.crl'],
-      :ocsp_location => ['http://ocsp.domain.com'],
       :ocsp_start_skew_seconds => 3600,
       :ocsp_validity_hours => 48,
       :crl_list_file => crl_list_sio,

data/spec/fixtures/cert1.pem

@@ -21,4 +21,4 @@ BZB3DR71BJTP/YUOD6uWOFSh8didm3kHNbAvG4X/xWyj07n70Cof0PBDGtw8QKlt
 CBydpPHBeew14n0PXXLB8jrDd6PtlKvKWrLVs9igASBuW584chaWNw039zxRKoqq
 PsMwIw+1he4Bax4hH4fM4wQOFpnhk5Y34VmdZqo1JtF7Vn41ghGwsXVswvl6wPC1
 g4+GUUwJtQ6cJyMmN4sIHDbCFTOWBlUijvMrvl3wxncqDmOp
------END CERTIFICATE-----
+-----END CERTIFICATE-----

data/spec/fixtures/config_pool_test_minimal.yaml

@@ -1,15 +1,11 @@
-certificate_authorities: {
-  test_ca: {
-    ca_cert: {
-      cert: 'test_ca.cer',
-      key: 'test_ca.key'
-    }
-  },
-  second_ca: {
-    ca_cert: {
-      cert: 'test_ca.cer',
-      key: 'test_ca.key'
-    }
-  }
-}
-config_is_string: "this is bogus"
+---
+certificate_authorities:
+  test_ca:
+    ca_cert:
+      cert: test_ca.cer
+      key: test_ca.key
+  second_ca:
+    ca_cert:
+      cert: test_ca.cer
+      key: test_ca.key
+config_is_string: this is bogus