bin/r509 in r509-0.9.2 vs bin/r509 in r509-0.10.0

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'r509'
-require 'trollop'
+require 'r509/trollop'
 
-opts = Trollop::options do
+opts = R509::Trollop::options do
   opt :interactive, "Interactive CSR/self-signed certificate generation. Overrides all flags other than keyout and out."
   opt :subject, "X509 subject / delimited. Example: /CN=test.com/O=Org/C=US/ST=Illinois/L=Chicago", :type => :string
   opt :message_digest, "Message digest to use. sha1, sha224, sha256, sha384, sha512, md5", :type => :string, :default => 'sha1'
   opt :duration, "Self-sign the certificate with the duration (in days) specified.", :type => :integer
   opt :bits, "Bit length of generated key. Ignored for EC.", :type => :integer, :default => 2048
@@ -16,32 +16,32 @@
   version "r509 #{R509::VERSION}"
 end
 
 if opts[:interactive] == true or opts[:subject].nil? then
   if opts[:type].upcase == "RSA" or opts[:type].upcase == "DSA"
-    print "CSR Bit Strength (2048):"
-    bit_strength = gets.chomp
-    bit_strength = (bit_strength.to_i > 0)? bit_strength.to_i : 2048
+    print "CSR Bit Length (2048):"
+    bit_length = gets.chomp
+    bit_length = (bit_length.to_i > 0)? bit_length.to_i : 2048
   elsif opts[:type].upcase == "EC"
     print "Curve Name (secp384r1):"
     curve_name = gets.chomp
     curve_name = (not curve_name.empty?)? curve_name : 'secp384r1'
   else
     puts "Invalid key type specified. RSA/DSA/EC"
     exit
   end
 
-  print "Message Digest (sha1):"
+  print "Message Digest (#{R509::MessageDigest::DEFAULT_MD}):"
   md = gets.chomp
   opts[:message_digest] = case md
     when 'sha1' then 'sha1'
     when 'sha224' then 'sha224'
     when 'sha256' then 'sha256'
     when 'sha384' then 'sha384'
     when 'sha512' then 'sha512'
     when 'md5' then 'md5'
-    else 'sha1'
+    else R509::MessageDigest::DEFAULT_MD
   end
 
   subject = []
   print "C (US): "
   c = gets.chomp
@@ -74,12 +74,12 @@
   print "SAN Domains (comma separated):"
   san_domains = []
   san_domains = gets.chomp.split(',').collect { |domain| domain.strip }
   csr = R509::CSR.new(
     :subject => subject,
-    :bit_strength => bit_strength,
-    :type => opts[:type].downcase.to_sym,
+    :bit_length => bit_length,
+    :type => opts[:type].upcase,
     :curve_name => curve_name,
     :san_names => san_domains,
     :message_digest => opts[:message_digest]
   )
 
@@ -97,50 +97,49 @@
       subject.add_entry(value[0],value[1])
     end
   }
   csr = R509::CSR.new(
     :subject => subject,
-    :bit_strength => opts[:bits],
-    :type => opts[:type].downcase.to_sym,
+    :bit_length => opts[:bits],
+    :type => opts[:type].upcase,
     :curve_name => opts[:curve_name],
     :message_digest => opts[:message_digest]
   )
   selfsign = opts[:duration] || 0
 end
 
 if selfsign > 0
-  ca = R509::CertificateAuthority::Signer.new
-  cert = ca.selfsign(
+  cert = R509::CertificateAuthority::Signer.selfsign(
     :csr => csr,
     :not_after => Time.now.to_i+86400*selfsign,
     :message_digest => opts[:message_digest]
   )
   if opts[:keyout].nil?
     puts csr.key.to_pem
   else
-    File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
+    csr.key.write_pem(opts[:keyout])
   end
   if opts[:out].nil?
     puts cert.to_pem
   else
-    File.open(opts[:out], 'w') {|f| f.write(cert.to_pem) }
+    cert.write_pem(opts[:out])
   end
 
   puts cert.subject
   if not cert.san.nil?
     puts "SAN(s): "+cert.san.names.map { |n| n.value }.join(", ")
   end
 else
   if opts[:keyout].nil?
     puts csr.key.to_pem
   else
-    File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
+    csr.key.write_pem(opts[:keyout])
   end
 
   if opts[:out].nil?
     puts csr.to_pem
   else
-    File.open(opts[:out], 'w') {|f| f.write(csr.to_pem) }
+    csr.write_pem(opts[:out])
   end
 
   puts csr.subject
   if not csr.san.nil?
     puts "SAN(s): "+csr.san.names.map{|n| n.value}.join(", ")