test/rubygems: regenerate certificatesfeature/openssl-110-v2

Regenerate test CA certificates with appropriate extensions

Test certificates in test/rubygems lack the basic constraints extension.

Here is the patch against rubygems' util/create_certs.rb.

ruby util/create_certs.rb &&
cp test/rubygems/*.pem /path/to/ruby/test/rubygems/ &&
ruby util/create_encrypted_key.rb &&
cp test/rubygems/encrypted_private_key.pem /path/to/ruby/test/rubygems/

------------------------ >8 ------------------------
diff --git a/util/create_certs.rb b/util/create_certs.rb
index 4f6f9ea..313a724 100644
--- a/util/create_certs.rb
+++ b/util/create_certs.rb
@@ -4,37 +4,41 @@ require 'time'

 class CertificateBuilder

-  attr_reader :today
+  attr_reader :start

   def initialize key_size = 2048
-    today           = Time.now.utc
-    @today          = Time.utc today.year, today.month, today.day
+    @start          = Time.utc 2012, 01, 01, 00, 00, 00
     @end_of_time    = Time.utc 9999, 12, 31, 23, 59, 59
     @end_of_time_32 = Time.utc 2038, 01, 19, 03, 14, 07

+    @key_size = key_size
     @serial = 0
   end

-  def create_certificates(key, subject, issuer_key = key, issuer = subject,
-                          not_before: @today, not_after: :end_of_time)
+  def create_certificates(key, subject, issuer_key = key, issuer_cert = nil,
+                          not_before: @start, not_after: :end_of_time,
+                          is_ca: false)
     certificates = []

     not_before, not_before_32 = validity_for not_before
     not_after,  not_after_32  = validity_for not_after
+    issuer_cert, issuer_cert_32 = issuer_cert

     certificates <<
-      create_certificate(key, subject, issuer_key, issuer,
-                         not_before, not_after)
+      create_certificate(key, subject, issuer_key, issuer_cert,
+                         not_before, not_after, is_ca)
     certificates <<
-      create_certificate(key, subject, issuer_key, issuer,
-                         not_before_32, not_after_32)
+      create_certificate(key, subject, issuer_key, issuer_cert_32,
+                         not_before_32, not_after_32, is_ca)

     certificates
   end

-  def create_certificate key, subject, issuer_key, issuer, not_before, not_after
-    puts "creating cert - subject: #{subject}, issuer: #{issuer}"
+  def create_certificate(key, subject, issuer_key, issuer_cert,
+                         not_before, not_after, is_ca)
     cert = OpenSSL::X509::Certificate.new
+    issuer_cert ||= cert # if not specified, create self signing cert
+
     cert.version    = 2
     cert.serial     = 0

@@ -45,32 +49,41 @@ class CertificateBuilder

     cert.public_key = key.public_key

-    cert.subject =
-      OpenSSL::X509::Name.new [%W[CN #{subject}], %w[DC example]]
-    cert.issuer  =
-      OpenSSL::X509::Name.new [%W[CN #{issuer}],  %w[DC example]]
+    cert.subject = OpenSSL::X509::Name.new [%W[CN #{subject}], %w[DC example]]
+    cert.issuer  = issuer_cert.subject

-    ef = OpenSSL::X509::ExtensionFactory.new nil, cert
+    ef = OpenSSL::X509::ExtensionFactory.new issuer_cert, cert

     cert.extensions = [
-      ef.create_extension('subjectAltName', "email:#{subject}@example")
+      ef.create_extension('subjectAltName', "email:#{subject}@example"),
+      ef.create_extension('subjectKeyIdentifier', 'hash')
     ]

+    if cert != issuer_cert # not self-signed cert
+      cert.add_extension ef.create_extension('authorityKeyIdentifier', 'keyid:always')
+    end
+
+    if is_ca
+      cert.add_extension ef.create_extension('basicConstraints', 'CA:TRUE', true)
+      cert.add_extension ef.create_extension('keyUsage', 'keyCertSign', true)
+    end
+
     cert.sign issuer_key, OpenSSL::Digest::SHA1.new

+    puts "created cert - subject: #{cert.subject}, issuer: #{cert.issuer}"
     cert
   end

   def create_key
     puts "creating key"
-    OpenSSL::PKey::RSA.new 2048
+    OpenSSL::PKey::RSA.new @key_size
   end

   def create_keys names
     keys = {}

     names.each do |name|
-      keys[name] = create_key
+      keys[name] = OpenSSL::PKey::RSA.new File.read(File.join "test/rubygems/#{name}_key.pem")
     end

     keys
@@ -108,37 +121,39 @@ keys = cb.create_keys [

 keys[:public] = keys[:private].public_key

-certs = {
-  alternate:
-    cb.create_certificates(keys[:alternate], 'alternate'),
-  child:
-    cb.create_certificates(keys[:child], 'child',
-                           keys[:private], 'nobody'),
-  expired:
-    cb.create_certificates(keys[:private], 'nobody',
-                           not_before: Time.at(0),
-                           not_after: Time.at(0)),
-  future:
-    cb.create_certificates(keys[:private], 'nobody',
-                           not_before: :end_of_time,
-                           not_after: :end_of_time),
-  grandchild:
-    cb.create_certificates(keys[:grandchild], 'grandchild',
-                           keys[:child], 'child'),
-  invalid_issuer:
-    cb.create_certificates(keys[:invalid], 'invalid',
-                           keys[:invalid], 'nobody'),
-  invalid_signer:
-    cb.create_certificates(keys[:invalid], 'invalid',
-                           keys[:private], 'invalid'),
-  invalidchild:
-    cb.create_certificates(keys[:invalidchild], 'invalidchild',
-                           keys[:invalid], 'child'),
-  public:
-    cb.create_certificates(keys[:private], 'nobody'),
-  wrong_key:
-    cb.create_certificates(keys[:alternate], 'nobody'),
-}
+certs = {}
+certs[:public] =
+  cb.create_certificates(keys[:private], 'nobody',
+                         is_ca: true)
+certs[:child] =
+  cb.create_certificates(keys[:child], 'child',
+                         keys[:private], certs[:public],
+                         is_ca: true)
+certs[:alternate] =
+  cb.create_certificates(keys[:alternate], 'alternate')
+certs[:expired] =
+  cb.create_certificates(keys[:private], 'nobody',
+                         not_before: Time.at(0),
+                         not_after: Time.at(0))
+certs[:future] =
+  cb.create_certificates(keys[:private], 'nobody',
+                         not_before: :end_of_time,
+                         not_after: :end_of_time)
+certs[:invalid_issuer] =
+  cb.create_certificates(keys[:invalid], 'invalid',
+                         keys[:invalid], certs[:public],
+                         is_ca: true)
+certs[:grandchild] =
+  cb.create_certificates(keys[:grandchild], 'grandchild',
+                         keys[:child], certs[:child])
+certs[:invalid_signer] =
+  cb.create_certificates(keys[:invalid], 'invalid',
+                         keys[:private], certs[:invalid])
+certs[:invalidchild] =
+  cb.create_certificates(keys[:invalidchild], 'invalidchild',
+                         keys[:invalid], certs[:child])
+certs[:wrong_key] =
+  cb.create_certificates(keys[:alternate], 'nobody')

 base_dir = 'test/rubygems'

1 files changed, 10 insertions, 9 deletions

diff --git a/test/rubygems/child_cert.pem b/test/rubygems/child_cert.pem
index 3079a9e604..45a16e057d 100644
--- a/test/rubygems/child_cert.pem
+++ b/test/rubygems/child_cert.pem
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7DCCAdSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMQ8wDQYDVQQDDAZub2Jv
-ZHkxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMCAXDTEyMTIwODAwMDAwMFoYDzk5
+MIIDHDCCAgSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMQ8wDQYDVQQDDAZub2Jv
+ZHkxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMCAXDTEyMDEwMTAwMDAwMFoYDzk5
 OTkxMjMxMjM1OTU5WjApMQ4wDAYDVQQDDAVjaGlsZDEXMBUGCgmSJomT8ixkARkW
 B2V4YW1wbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKf7+1q0cR
 MhC/RM6Whpon/5IxuSve3CCxxdN0LcSbUisFMlf28Zj+S545SKFc6gHFcnYLZZsy
@@ -8,11 +8,12 @@ Gm4FWEd4DhNpg/kgoDPuPGwQp2DEOvKnnneB/Shj8V+6oLrjXaZFAu8Q916c5/BL
 z+PlHIIsO/Q865XOK+5z1sZi0xval8QT7u4Usrcy86gevflCbpBAWkNPa/DZDqA9
 nk0vB2XDSHvhavcrYLfDrYAnFz3wiZ70LYQrmdeOqkPpaiw//Qpzqp+vtuF2br6U
 iYWpN+dhdFsIxAwIE5kWZ1kk6OBJ4kHvr+Sh8Oqbf6WFBhW/lQa9wldA0xhNwhGr
-1FDEfC+0g/BvAgMBAAGjHDAaMBgGA1UdEQQRMA+BDWNoaWxkQGV4YW1wbGUwDQYJ
-KoZIhvcNAQEFBQADggEBAGuRKUhUhtmObY00za/qw71wjqtNZad5+k9acM/xh/my
-+YEBSlj8ZIWD1H0kUmAO0Pmwab6ziFA8IrAo0N1D897o7eP83KzVeVxoJi1g+8rS
-u16bF7cC5zT9S/N/ZNTVz9ERjRAD7MdcbXEikKPaqjqzZBViClqpO8YQ6Z9bFgXk
-gV9plX1ki17H+EuXNs21gqsy+8NAxTlXKuF5JKriBOQ9XW62496F/yZPw6XQ50My
-R21cOLiDdoXDmS4Wo7bJ+sbR3N1JbhqZ7Wt9DkQnMtXw4xOcFM5PsVIsmn1KhGGp
-v8GAxxUMzFoPvsx+XcV9TWjR1seYlXnvdlx65YYtZg8=
+1FDEfC+0g/BvAgMBAAGjTDBKMBgGA1UdEQQRMA+BDWNoaWxkQGV4YW1wbGUwHQYD
+VR0OBBYEFHzVU9N7sklKBPrHElxoZ32Fg64IMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBABBTzbNeUN2unx3xm7pLAFzgrqAzUT5g1bxHD4H5H34O
+JGdyF/9yJ7gUpbw/Vhqe4F7XntHUNqjb3z1jppFqYLSObRuBCmNPy8b/TB1PIFvQ
+6i8SR7TaXEU1n8JHW6RWViEZ6/Ci32qRtVaQUv9VLbcgaHid1G+aXYQcUjAqUDoj
+5cSLnhnGjO5mjBnaxXINTVbRbuAfFzCYELOJ2u3T1g0ccHjzTWSNKm9YeNbZO149
+d8mzUwwr4/ZHj3bARGd7OkN9isBqq9HTn2CzC+NpPzxPPIMXKpwjrJCfzrLCxWi0
+Dkh88RCcdwqKI59hZKUgo3mJOErHmJnX0EIDl6Jq63I=
 -----END CERTIFICATE-----