r509 0.8 → 0.8.1

data/bin/r509

@@ -3,13 +3,34 @@ require 'rubygems'
 require 'r509'
 require 'r509/version'
 require 'openssl'
+require 'trollop'
+
+opts = 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, sha256, 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.", :type => :integer, :default => 2048
+    opt :keyout, "File name to save generated key.", :type => :string
+    opt :out, "File name to save generated CSR or self-signed certificate", :type => :string
+    version "r509 #{R509::VERSION}"
+end
+
+if opts[:interactive] == true or opts[:subject].nil? then
+    print "CSR Bit Strength (2048):"
+    bit_strength = gets.chomp
+    bit_strength = (bit_strength.to_i > 0)? bit_strength.to_i : 2048
+
+    print "Message Digest (sha1):"
+    md = gets.chomp
+    md = case md
+        when 'sha1' then 'sha1'
+        when 'sha256' then 'sha256'
+        when 'sha512' then 'sha512'
+        when 'md5' then 'md5'
+        else 'sha1'
+    end
 
-subject = OpenSSL::X509::Name.new
-selfsign = 0
-if ARGV[0].nil? then
-    puts "Interactive CSR generation using r509 v#{R509::VERSION}."
-    puts ""
-    puts "You can also call with 1-3 args (string subject, int bit_strength, [optional days selfsign length])"
     subject = []
     print "C (US): "
     c = gets.chomp
@@ -42,45 +63,71 @@ if ARGV[0].nil? then
     print "SAN Domains (comma separated):"
     san_domains = []
     san_domains = gets.chomp.split(',').collect { |domain| domain.strip }
-    csr = R509::Csr.new(:subject => subject, :bit_strength => 2048, :san_names => san_domains)
+    csr = R509::Csr.new(
+        :subject => subject,
+        :bit_strength => bit_strength,
+        :san_names => san_domains,
+        :message_digest => md
+    )
+
+    selfsign = 0
     print "Self-signed cert duration in days (null disables self-sign):"
     selfsign_input = gets.chomp
     if selfsign_input.to_i > 0
         selfsign = selfsign_input.to_i
     end
-
-
-else
-    ARGV[0].split('/').each { |item|
+elsif not opts[:subject].nil?
+    subject = OpenSSL::X509::Name.new
+    opts[:subject].chomp.split('/').each { |item|
         if item != '' then
             value = item.split('=')
             subject.add_entry(value[0],value[1])
         end
     }
-    bit_strength = nil
-    if ARGV.size > 1 then
-        bit_strength = ARGV[1].to_i
-    else
-        bit_strength = 2048
-    end
-    if ARGV.size > 2 and ARGV[2].to_i > 0
-        selfsign = ARGV[2].to_i
-    end
-    csr = R509::Csr.new(:subject => subject, :bit_strength => bit_strength)
+    bit_strength = opts[:bits]
+    csr = R509::Csr.new(
+        :subject => subject,
+        :bit_strength => bit_strength,
+        :message_digest => opts[:message_digest]
+    )
+    selfsign = opts[:duration] || 0
 end
 
 if selfsign > 0
     ca = R509::CertificateAuthority::Signer.new
-    cert = ca.selfsign(:csr => csr, :not_after => Time.now.to_i+86400*selfsign)
-    puts csr.key.to_pem
-    puts cert
+    cert = ca.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) }
+    end
+    if opts[:out].nil?
+        puts cert.to_pem
+    else
+        File.open(opts[:out], 'w') {|f| f.write(cert.to_pem) }
+    end
+
     puts cert.subject
     if not cert.san_names.empty?
         puts "SAN(s): "+cert.san_names.join(", ")
     end
 else
-    puts csr.key.to_pem
-    puts csr
+    if opts[:keyout].nil?
+        puts csr.key.to_pem
+    else
+        File.open(opts[:keyout], 'w') {|f| f.write(csr.key.to_pem) }
+    end
+
+    if opts[:out].nil?
+        puts csr.to_pem
+    else
+        File.open(opts[:out], 'w') {|f| f.write(csr.to_pem) }
+    end
+
     puts csr.subject
     if not csr.san_names.empty?
         puts "SAN(s): "+csr.san_names.join(", ")

data/doc/R509.html

@@ -6,7 +6,7 @@
 <title>
   Module: R509
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -129,7 +129,7 @@ support.</p>
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.8</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.8.1</span><span class='tstring_end'>&quot;</span></span></pre></dd>
       
     </dl>
   
@@ -145,9 +145,9 @@ support.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:01 2012 by
+  Generated on Thu Nov  8 14:19:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -1231,9 +1231,11 @@ encryption (des3).</p>
           <span class="default">
             
           </span>
-          &mdash; <div class='inline'>
+          
+            &mdash; <div class='inline'>
 <p>a cert</p>
 </div>
+          
         </li>
       
         <li>
@@ -1242,11 +1244,13 @@ encryption (des3).</p>
           <span class="default">
             
           </span>
-          &mdash; <div class='inline'>
+          
+            &mdash; <div class='inline'>
 <p>optional private key to supply. either an unencrypted PEM/DER string or an
 R509::PrivateKey object (use the latter if you need password/hardware
 support)</p>
 </div>
+          
         </li>
       
         <li>
@@ -1255,9 +1259,11 @@ support)</p>
           <span class="default">
             
           </span>
-          &mdash; <div class='inline'>
+          
+            &mdash; <div class='inline'>
 <p>a PKCS12 object containing both key and cert</p>
 </div>
+          
         </li>
       
         <li>
@@ -1266,9 +1272,11 @@ support)</p>
           <span class="default">
             
           </span>
-          &mdash; <div class='inline'>
+          
+            &mdash; <div class='inline'>
 <p>password for PKCS12 or private key (if supplied)</p>
 </div>
+          
         </li>
       
     </ul>
@@ -1357,7 +1365,6 @@ support)</p>
     
       
       <span id=""></span>
-      <span id="cert-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="cert-instance_method">
   
@@ -1401,7 +1408,6 @@ support)</p>
     
       
       <span id=""></span>
-      <span id="key-instance_method"></span>
       <div class="method_details ">
   <h3 class="signature " id="key-instance_method">
   
@@ -3945,9 +3951,9 @@ IO-like object.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:02 2012 by
+  Generated on Thu Nov  8 14:19:26 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions.html

@@ -6,7 +6,7 @@
 <title>
   Module: R509::Cert::Extensions
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -97,41 +97,6 @@
 
   <h2>Constant Summary</h2>
   
-    <dl class="constants">
-      
-        <dt id="DNS_REGEX-constant" class="">DNS_REGEX =
-          <div class="docstring">
-  <div class="discussion">
-    
-<p>Regexes for OpenSSL's parsed values</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div>
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>DNS:([^,\n]+)</span><span class='regexp_end'>/</span></span></pre></dd>
-      
-        <dt id="IP_ADDRESS_REGEX-constant" class="">IP_ADDRESS_REGEX =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>IP:([^,\n]+)</span><span class='regexp_end'>/</span></span></pre></dd>
-      
-        <dt id="URI_REGEX-constant" class="">URI_REGEX =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>URI:([^,\n]+)</span><span class='regexp_end'>/</span></span></pre></dd>
-      
-        <dt id="R509_EXTENSION_CLASSES-constant" class="">R509_EXTENSION_CLASSES =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Set</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span></pre></dd>
-      
-    </dl>
-  
 
 
 
@@ -351,9 +316,9 @@ implementation are ignored (see #get_unknown_extensions).</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:01 2012 by
+  Generated on Thu Nov  8 14:19:25 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions/AuthorityInfoAccess.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert::Extensions::AuthorityInfoAccess
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -290,7 +290,6 @@ provide access to the components and meaning of the extension's contents.</p>
     
       
       <span id=""></span>
-      <span id="ca_issuers_uris-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="ca_issuers_uris-instance_method">
   
@@ -334,7 +333,6 @@ provide access to the components and meaning of the extension's contents.</p>
     
       
       <span id=""></span>
-      <span id="ocsp_uris-instance_method"></span>
       <div class="method_details ">
   <h3 class="signature " id="ocsp_uris-instance_method">
   
@@ -382,9 +380,9 @@ provide access to the components and meaning of the extension's contents.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:03 2012 by
+  Generated on Thu Nov  8 14:19:29 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions/AuthorityKeyIdentifier.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert::Extensions::AuthorityKeyIdentifier
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -139,9 +139,9 @@ contents.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:03 2012 by
+  Generated on Thu Nov  8 14:19:28 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions/BasicConstraints.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert::Extensions::BasicConstraints
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -310,7 +310,6 @@ CA certificates.</p>
     
       
       <span id=""></span>
-      <span id="path_length-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="path_length-instance_method">
   
@@ -473,9 +472,9 @@ CA certificates.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:03 2012 by
+  Generated on Thu Nov  8 14:19:28 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions/CrlDistributionPoints.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert::Extensions::CrlDistributionPoints
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -259,7 +259,6 @@ provide access to the components and meaning of the extension's contents.</p>
     
       
       <span id=""></span>
-      <span id="crl_uris-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="crl_uris-instance_method">
   
@@ -307,9 +306,9 @@ provide access to the components and meaning of the extension's contents.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:03 2012 by
+  Generated on Thu Nov  8 14:19:29 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>

data/doc/R509/Cert/Extensions/ExtendedKeyUsage.html

@@ -6,7 +6,7 @@
 <title>
   Class: R509::Cert::Extensions::ExtendedKeyUsage
   
-    &mdash; Documentation by YARD 0.8.0
+    &mdash; Documentation by YARD 0.8.2.1
   
 </title>
 
@@ -435,7 +435,6 @@ provide access to the components and meaning of the extension's contents.</p>
     
       
       <span id=""></span>
-      <span id="allowed_uses-instance_method"></span>
       <div class="method_details first">
   <h3 class="signature first" id="allowed_uses-instance_method">
   
@@ -771,9 +770,9 @@ provide access to the components and meaning of the extension's contents.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Oct 23 22:48:03 2012 by
+  Generated on Thu Nov  8 14:19:28 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.0 (ruby-1.9.3).
+  0.8.2.1 (ruby-1.9.3).
 </div>
 
   </body>