JRuby OpenSSL implementation is more strict than real ruby one and

requires certificate serial number to be strictly positive.

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/ssl/certificate_authority.rb b/lib/puppet/ssl/certificate_authority.rb
index 08feff0ac..4a7d4615b 100644
--- a/lib/puppet/ssl/certificate_authority.rb
+++ b/lib/puppet/ssl/certificate_authority.rb
@@ -184,7 +184,7 @@ class Puppet::SSL::CertificateAuthority
         # it, but with a mode we can't actually read in some cases.  So, use
         # a default before the lock.
         unless FileTest.exist?(Puppet[:serial])
-            serial = 0x0
+            serial = 0x1
         end
 
         Puppet.settings.readwritelock(:serial) { |f|
diff --git a/spec/unit/ssl/certificate_authority.rb b/spec/unit/ssl/certificate_authority.rb
index e007df25b..fb30cb027 100755
--- a/spec/unit/ssl/certificate_authority.rb
+++ b/spec/unit/ssl/certificate_authority.rb
@@ -264,8 +264,8 @@ describe Puppet::SSL::CertificateAuthority do
                 Puppet.settings.stubs(:readwritelock).with(:serial).yields @filehandle
             end
 
-            it "should default to 0x0 for the first serial number" do
-                @ca.next_serial.should == 0x0
+            it "should default to 0x1 for the first serial number" do
+                @ca.next_serial.should == 0x1
             end
 
             it "should return the current content of the serial file" do
@@ -276,7 +276,7 @@ describe Puppet::SSL::CertificateAuthority do
             end
             
             it "should write the next serial number to the serial file as hex" do
-                @filehandle.expects(:<<).with("0001")
+                @filehandle.expects(:<<).with("0002")
 
                 @ca.next_serial
             end