r509 0.9.2 → 0.10.0

data/doc/R509/CRL/SignedList.html

@@ -6,13 +6,13 @@
 <title>
   Class: R509::CRL::SignedList
   
-    &mdash; Documentation by YARD 0.8.5
+    &mdash; Documentation by YARD 0.8.6.1
   
 </title>
 
-  <link rel="stylesheet" href="../../css/style.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" charset="utf-8" />
 
-  <link rel="stylesheet" href="../../css/common.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" charset="utf-8" />
 
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
@@ -90,15 +90,11 @@
     
   
     
-      <dt class="r2">Includes:</dt>
-      <dd class="r2"><span class='object_link'><a href="../IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span></dd>
-      
-    
   
   
   
-    <dt class="r1 last">Defined in:</dt>
-    <dd class="r1 last">lib/r509/crl.rb</dd>
+    <dt class="r2 last">Defined in:</dt>
+    <dd class="r2 last">lib/r509/crl/signed_list.rb</dd>
   
 </dl>
 <div class="clear"></div>
@@ -519,16 +515,7 @@ certificate (call cert.public_key on that object).</p>
 
 
   
-  
-  
-  
-  
-  
-  
-  
-  <h3 class="inherited">Methods included from <span class='object_link'><a href="../IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span></h3>
-  <p class="inherited"><span class='object_link'><a href="../IOHelpers.html#read_data-instance_method" title="R509::IOHelpers#read_data (method)">#read_data</a></span>, <span class='object_link'><a href="../IOHelpers.html#read_data-class_method" title="R509::IOHelpers.read_data (method)">read_data</a></span>, <span class='object_link'><a href="../IOHelpers.html#write_data-instance_method" title="R509::IOHelpers#write_data (method)">#write_data</a></span>, <span class='object_link'><a href="../IOHelpers.html#write_data-class_method" title="R509::IOHelpers.write_data (method)">write_data</a></span></p>
-<div id="constructor_details" class="method_details_list">
+  <div id="constructor_details" class="method_details_list">
   <h2>Constructor Details</h2>
   
     <div class="method_details first">
@@ -578,7 +565,7 @@ certificate (call cert.public_key on that object).</p>
 19</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 16</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 16</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_crl'>crl</span><span class='rparen'>)</span>
   <span class='ivar'>@crl</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>X509</span><span class='op'>::</span><span class='const'>CRL</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_crl'>crl</span><span class='rparen'>)</span>
@@ -627,7 +614,7 @@ certificate (call cert.public_key on that object).</p>
 15</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 13</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_crl'>crl</span>
   <span class='ivar'>@crl</span>
@@ -670,7 +657,7 @@ certificate (call cert.public_key on that object).</p>
 15</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 13</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_issuer'>issuer</span>
   <span class='ivar'>@issuer</span>
@@ -756,7 +743,7 @@ certificate (call cert.public_key on that object).</p>
 27</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 25</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 25</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_load_from_file'>load_from_file</span><span class='lparen'>(</span> <span class='id identifier rubyid_filename'>filename</span> <span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>CRL</span><span class='op'>::</span><span class='const'>SignedList</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span> <span class='const'>IOHelpers</span><span class='period'>.</span><span class='id identifier rubyid_read_data'>read_data</span><span class='lparen'>(</span><span class='id identifier rubyid_filename'>filename</span><span class='rparen'>)</span> <span class='rparen'>)</span>
@@ -821,7 +808,7 @@ certificate (call cert.public_key on that object).</p>
 55</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 53</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 53</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_last_update'>last_update</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_last_update'>last_update</span>
@@ -880,7 +867,7 @@ certificate (call cert.public_key on that object).</p>
 62</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 60</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 60</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_next_update'>next_update</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_next_update'>next_update</span>
@@ -945,7 +932,7 @@ certificate (call cert.public_key on that object).</p>
 107</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 99</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 99</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_revoked'>revoked</span>
   <span class='id identifier rubyid_revoked_list'>revoked_list</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
@@ -1027,10 +1014,10 @@ certificate (call cert.public_key on that object).</p>
 80</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 74</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 74</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_revoked?'>revoked?</span><span class='lparen'>(</span><span class='id identifier rubyid_serial'>serial</span><span class='rparen'>)</span>
-  <span class='kw'>if</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_find'>find</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_revoked'>revoked</span><span class='op'>|</span> <span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_serial'>serial</span> <span class='op'>==</span> <span class='id identifier rubyid_serial'>serial</span> <span class='rbrace'>}</span>
+  <span class='kw'>if</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_find'>find</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_revoked'>revoked</span><span class='op'>|</span> <span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_serial'>serial</span> <span class='op'>==</span> <span class='id identifier rubyid_serial'>serial</span><span class='period'>.</span><span class='id identifier rubyid_to_i'>to_i</span> <span class='rbrace'>}</span>
     <span class='kw'>true</span>
   <span class='kw'>else</span>
     <span class='kw'>false</span>
@@ -1116,10 +1103,10 @@ certificate (call cert.public_key on that object).</p>
 119</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 111</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 111</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_revoked_cert'>revoked_cert</span><span class='lparen'>(</span><span class='id identifier rubyid_serial'>serial</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_revoked'>revoked</span> <span class='op'>=</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_find'>find</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_revoked'>revoked</span><span class='op'>|</span> <span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_serial'>serial</span> <span class='op'>==</span> <span class='id identifier rubyid_serial'>serial</span> <span class='rbrace'>}</span>
+  <span class='id identifier rubyid_revoked'>revoked</span> <span class='op'>=</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_find'>find</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_r'>r</span><span class='op'>|</span> <span class='id identifier rubyid_r'>r</span><span class='period'>.</span><span class='id identifier rubyid_serial'>serial</span> <span class='op'>==</span> <span class='id identifier rubyid_serial'>serial</span> <span class='rbrace'>}</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_revoked'>revoked</span>
     <span class='id identifier rubyid_reason'>reason</span> <span class='op'>=</span> <span class='id identifier rubyid_get_reason'>get_reason</span><span class='lparen'>(</span><span class='id identifier rubyid_revoked'>revoked</span><span class='rparen'>)</span>
     <span class='lbrace'>{</span> <span class='symbol'>:time</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_revoked'>revoked</span><span class='period'>.</span><span class='id identifier rubyid_time'>time</span><span class='comma'>,</span> <span class='symbol'>:reason</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_reason'>reason</span> <span class='rbrace'>}</span>
@@ -1174,7 +1161,7 @@ certificate (call cert.public_key on that object).</p>
 32</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 30</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 30</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_signature_algorithm'>signature_algorithm</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_signature_algorithm'>signature_algorithm</span>
@@ -1233,7 +1220,7 @@ certificate (call cert.public_key on that object).</p>
 96</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 94</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 94</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_der'>to_der</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span>
@@ -1296,7 +1283,7 @@ certificate (call cert.public_key on that object).</p>
 87</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 85</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 85</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_pem'>to_pem</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span>
@@ -1366,7 +1353,7 @@ certificate (call cert.public_key on that object)</p>
 70</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 68</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 68</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_verify'>verify</span><span class='lparen'>(</span><span class='id identifier rubyid_public_key'>public_key</span><span class='rparen'>)</span>
   <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_verify'>verify</span><span class='lparen'>(</span><span class='id identifier rubyid_public_key'>public_key</span><span class='rparen'>)</span>
@@ -1408,8 +1395,8 @@ certificate (call cert.public_key on that object)</p>
       
         &mdash;
         <div class='inline'>
-<p>Either a string of the path for the file that you'd like to write, or an
-IO-like object.</p>
+<p>Either a string of the path for the file that you&#39;d like to write, or
+an IO-like object.</p>
 </div>
       
     </li>
@@ -1428,7 +1415,7 @@ IO-like object.</p>
 48</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 46</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 46</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_write_der'>write_der</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_write_data'>write_data</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='comma'>,</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span><span class='rparen'>)</span>
@@ -1470,8 +1457,8 @@ IO-like object.</p>
       
         &mdash;
         <div class='inline'>
-<p>Either a string of the path for the file that you'd like to write, or an
-IO-like object.</p>
+<p>Either a string of the path for the file that you&#39;d like to write, or
+an IO-like object.</p>
 </div>
       
     </li>
@@ -1490,7 +1477,7 @@ IO-like object.</p>
 40</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/crl.rb', line 38</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/crl/signed_list.rb', line 38</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_write_pem'>write_pem</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_write_data'>write_data</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='comma'>,</span> <span class='ivar'>@crl</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span><span class='rparen'>)</span>
@@ -1505,9 +1492,9 @@ IO-like object.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Apr 23 10:46:04 2013 by
+  Generated on Sun Jan 26 13:37:27 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.5 (ruby-1.9.3).
+  0.8.6.1 (ruby-2.0.0).
 </div>
 
   </body>

data/doc/R509/CSR.html

@@ -6,13 +6,13 @@
 <title>
   Class: R509::CSR
   
-    &mdash; Documentation by YARD 0.8.5
+    &mdash; Documentation by YARD 0.8.6.1
   
 </title>
 
-  <link rel="stylesheet" href="../css/style.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
 
-  <link rel="stylesheet" href="../css/common.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
 
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
@@ -91,7 +91,7 @@
   
     
       <dt class="r2">Includes:</dt>
-      <dd class="r2"><span class='object_link'><a href="IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span></dd>
+      <dd class="r2"><span class='object_link'><a href="Helpers.html" title="R509::Helpers (module)">Helpers</a></span></dd>
       
     
   
@@ -344,12 +344,19 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#bit_strength-instance_method" title="#bit_strength (instance method)">- (Integer) <strong>bit_strength</strong> </a>
+      <a href="#bit_length-instance_method" title="#bit_length (instance method)">- (Integer) <strong>bit_length</strong> </a>
     
 
     
+      (also: #bit_strength)
+    
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#bit_length-instance_method" title="R509::Helpers#bit_length (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -359,7 +366,7 @@
 
   
     <span class="summary_desc"><div class='inline'>
-<p>Returns the bit strength of the key used to create the CSR.</p>
+<p>Returns the bit length of the key.</p>
 </div></span>
   
 </li>
@@ -374,6 +381,11 @@
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#curve_name-instance_method" title="R509::Helpers#curve_name (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -399,6 +411,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#dsa%3F-instance_method" title="R509::Helpers#dsa? (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -423,6 +440,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#ec%3F-instance_method" title="R509::Helpers#ec? (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -491,7 +513,7 @@ key if the key is EC.</p>
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#key_algorithm-instance_method" title="#key_algorithm (instance method)">- (Symbol) <strong>key_algorithm</strong> </a>
+      <a href="#key_algorithm-instance_method" title="#key_algorithm (instance method)">- (String) <strong>key_algorithm</strong> </a>
     
 
     
@@ -545,6 +567,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#rsa%3F-instance_method" title="R509::Helpers#rsa? (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -617,6 +644,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#to_der-instance_method" title="R509::Helpers#to_der (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -626,7 +658,7 @@ key if the key is EC.</p>
 
   
     <span class="summary_desc"><div class='inline'>
-<p>Converts the CSR into the DER format.</p>
+<p>Converts the object into DER format.</p>
 </div></span>
   
 </li>
@@ -639,10 +671,13 @@ key if the key is EC.</p>
     
 
     
-      (also: #to_s)
-    
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#to_pem-instance_method" title="R509::Helpers#to_pem (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -652,7 +687,7 @@ key if the key is EC.</p>
 
   
     <span class="summary_desc"><div class='inline'>
-<p>Converts the CSR into the PEM format.</p>
+<p>Converts the object into PEM format.</p>
 </div></span>
   
 </li>
@@ -691,6 +726,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#write_der-instance_method" title="R509::Helpers#write_der (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -700,7 +740,7 @@ key if the key is EC.</p>
 
   
     <span class="summary_desc"><div class='inline'>
-<p>Writes the CSR into the DER format.</p>
+<p>Writes the object into DER format.</p>
 </div></span>
   
 </li>
@@ -715,6 +755,11 @@ key if the key is EC.</p>
     
   </span>
   
+    <span class="note title not_defined_here">
+      included
+      from <span class='object_link'><a href="Helpers.html#write_pem-instance_method" title="R509::Helpers#write_pem (method)">Helpers</a></span>
+    </span>
+  
   
   
   
@@ -724,7 +769,7 @@ key if the key is EC.</p>
 
   
     <span class="summary_desc"><div class='inline'>
-<p>Writes the CSR into the PEM format.</p>
+<p>Writes the object into PEM format.</p>
 </div></span>
   
 </li>
@@ -737,14 +782,7 @@ key if the key is EC.</p>
   
   
   
-  
-  
-  
-  
-  
-  <h3 class="inherited">Methods included from <span class='object_link'><a href="IOHelpers.html" title="R509::IOHelpers (module)">IOHelpers</a></span></h3>
-  <p class="inherited"><span class='object_link'><a href="IOHelpers.html#read_data-instance_method" title="R509::IOHelpers#read_data (method)">#read_data</a></span>, <span class='object_link'><a href="IOHelpers.html#read_data-class_method" title="R509::IOHelpers.read_data (method)">read_data</a></span>, <span class='object_link'><a href="IOHelpers.html#write_data-instance_method" title="R509::IOHelpers#write_data (method)">#write_data</a></span>, <span class='object_link'><a href="IOHelpers.html#write_data-class_method" title="R509::IOHelpers.write_data (method)">write_data</a></span></p>
-<div id="constructor_details" class="method_details_list">
+  <div id="constructor_details" class="method_details_list">
   <h2>Constructor Details</h2>
   
     <div class="method_details first">
@@ -774,27 +812,36 @@ key if the key is EC.</p>
 <p>Generate a 4096-bit RSA key + CSR</p>
 </div></p>
       
-      <pre class="example code"><code>:type =&gt; :rsa,
-:bit_strength =&gt; 4096,
+      <pre class="example code"><code>:type =&gt; &quot;RSA&quot;,
+:bit_length =&gt; 4096,
 :subject =&gt; [
-  ['CN','somedomain.com'],
-  ['O','My Org'],
-  ['L','City'],
-  ['ST','State'],
-  ['C','US']
+  [&#39;CN&#39;,&#39;somedomain.com&#39;],
+  [&#39;O&#39;,&#39;My Org&#39;],
+  [&#39;L&#39;,&#39;City&#39;],
+  [&#39;ST&#39;,&#39;State&#39;],
+  [&#39;C&#39;,&#39;US&#39;]
 ]</code></pre>
     
       
+        <p class="example_title"><div class='inline'>
+<p>Generate a 2048-bit RSA key + CSR</p>
+</div></p>
+      
+      <pre class="example code"><code>:type =&gt; &quot;RSA&quot;,
+:bit_length =&gt; 4096,
+:subject =&gt; { :CN =&gt; &quot;myCN&quot;, :O =&gt; &quot;org&quot; }</code></pre>
+    
+      
         <p class="example_title"><div class='inline'>
 <p>Generate an ECDSA key using the secp384r1 curve parameters + CSR and sign
 with SHA512</p>
 </div></p>
       
-      <pre class="example code"><code>:type =&gt; :ec,
-:curve_name =&gt; 'secp384r1',
-:message_digest =&gt; 'sha512',
+      <pre class="example code"><code>:type =&gt; &quot;EC&quot;,
+:curve_name =&gt; &#39;secp384r1&#39;,
+:message_digest =&gt; &#39;sha512&#39;,
 :subject =&gt; [
-  ['CN','somedomain.com'],
+  [&#39;CN&#39;,&#39;somedomain.com&#39;],
 ]</code></pre>
     
   </div>
@@ -842,13 +889,14 @@ with SHA512</p>
       
         <li>
           <span class="name">:type</span>
-          <span class="type">(<tt>Symbol</tt>)</span>
+          <span class="type">(<tt>String</tt>)</span>
           <span class="default">
             
           </span>
           
             &mdash; <div class='inline'>
-<p>:rsa/:dsa/:ec required if not providing existing :csr. Defaults to :rsa</p>
+<p>Required if not providing existing :csr. Defaults to
+R509::PrivateKey::DEFAULT_TYPE. Allows R509::PrivateKey::KNOWN_TYPES.</p>
 </div>
           
         </li>
@@ -864,7 +912,23 @@ with SHA512</p>
           </span>
           
             &mdash; <div class='inline'>
-<p>Only used if :type is :ec</p>
+<p>Only used if :type is EC</p>
+</div>
+          
+        </li>
+      
+        <li>
+          <span class="name">:bit_length</span>
+          <span class="type">(<tt>Integer</tt>)</span>
+          <span class="default">
+            
+              &mdash; default:
+              <tt>2048</tt>
+            
+          </span>
+          
+            &mdash; <div class='inline'>
+<p>Only used if :type is RSA or DSA</p>
 </div>
           
         </li>
@@ -880,7 +944,7 @@ with SHA512</p>
           </span>
           
             &mdash; <div class='inline'>
-<p>Only used if :type is :rsa or :dsa</p>
+<p>Deprecated, identical to bit_length.</p>
 </div>
           
         </li>
@@ -901,7 +965,7 @@ sha1</p>
       
         <li>
           <span class="name">:san_names</span>
-          <span class="type">(<tt>Array</tt>)</span>
+          <span class="type">(<tt>Array</tt>, <tt><span class='object_link'><a href="ASN1/GeneralNames.html" title="R509::ASN1::GeneralNames (class)">R509::ASN1::GeneralNames</a></span></tt>)</span>
           <span class="default">
             
           </span>
@@ -909,7 +973,9 @@ sha1</p>
             &mdash; <div class='inline'>
 <p>List of domains, IPs, email addresses, or URIs to encode as
 subjectAltNames. The type is determined from the structure of the strings
-via the R509::ASN1.general_name_parser method</p>
+via the R509::ASN1.general_name_parser method. You can also pass an
+explicit R509::ASN1::GeneralNames object. Parsed names will be uniqued, but
+a GeneralNames object will not be touched.</p>
 </div>
           
         </li>
@@ -952,13 +1018,6 @@ support)</p>
       <pre class="lines">
 
 
-39
-40
-41
-42
-43
-44
-45
 46
 47
 48
@@ -1008,37 +1067,32 @@ support)</p>
 92</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 46</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='op'>=</span><span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='kw'>not</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>Hash</span><span class='rparen'>)</span>
-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Must provide a hash of options</span><span class='tstring_end'>'</span></span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>Must provide a hash of options</span><span class='tstring_end'>&#39;</span></span>
   <span class='kw'>end</span>
-    <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:subject</span><span class='rparen'>)</span> <span class='kw'>and</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:csr</span><span class='rparen'>)</span>
+  <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:subject</span><span class='rparen'>)</span> <span class='kw'>and</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:csr</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>You must provide :subject or :csr, not both</span><span class='tstring_end'>&quot;</span></span>
   <span class='kw'>end</span>
-  <span class='ivar'>@bit_strength</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:bit_strength</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='int'>2048</span>
-  <span class='ivar'>@curve_name</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:curve_name</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>secp384r1</span><span class='tstring_end'>&quot;</span></span>
-
-  <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:key</span><span class='rparen'>)</span>
-    <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='rparen'>)</span>
-      <span class='ivar'>@key</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span>
-    <span class='kw'>else</span>
-      <span class='ivar'>@key</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:key</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span><span class='rparen'>)</span>
-    <span class='kw'>end</span>
-  <span class='kw'>end</span>
+  <span class='ivar'>@bit_length</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:bit_length</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:bit_strength</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='op'>::</span><span class='const'>DEFAULT_STRENGTH</span>
+  <span class='ivar'>@curve_name</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:curve_name</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='op'>::</span><span class='const'>DEFAULT_CURVE</span>
+
+  <span class='ivar'>@key</span> <span class='op'>=</span> <span class='id identifier rubyid_load_private_key'>load_private_key</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span>
+
 
-  <span class='ivar'>@type</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:type</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='symbol'>:rsa</span>
-  <span class='kw'>if</span> <span class='kw'>not</span> <span class='lbracket'>[</span><span class='symbol'>:rsa</span><span class='comma'>,</span><span class='symbol'>:dsa</span><span class='comma'>,</span><span class='symbol'>:ec</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_include?'>include?</span><span class='lparen'>(</span><span class='ivar'>@type</span><span class='rparen'>)</span> <span class='kw'>and</span> <span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Must provide :rsa, :dsa, or :ec as type when key is nil</span><span class='tstring_end'>'</span></span>
+  <span class='ivar'>@type</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:type</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='op'>::</span><span class='const'>DEFAULT_TYPE</span>
+  <span class='kw'>if</span> <span class='kw'>not</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='op'>::</span><span class='const'>KNOWN_TYPES</span><span class='period'>.</span><span class='id identifier rubyid_include?'>include?</span><span class='lparen'>(</span><span class='ivar'>@type</span><span class='period'>.</span><span class='id identifier rubyid_upcase'>upcase</span><span class='rparen'>)</span> <span class='kw'>and</span> <span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Must provide </span><span class='embexpr_beg'>#{</span><span class='const'>R509</span><span class='op'>::</span><span class='const'>PrivateKey</span><span class='op'>::</span><span class='const'>KNOWN_TYPES</span><span class='period'>.</span><span class='id identifier rubyid_join'>join</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>, </span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='embexpr_end'>}</span><span class='tstring_content'> as type when key is nil</span><span class='tstring_end'>&quot;</span></span>
   <span class='kw'>end</span>
 
   <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:subject</span><span class='rparen'>)</span>
-    <span class='id identifier rubyid_san_names'>san_names</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>ASN1</span><span class='period'>.</span><span class='id identifier rubyid_general_name_parser'>general_name_parser</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:san_names</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='lbracket'>[</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_san_names'>san_names</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>ASN1</span><span class='period'>.</span><span class='id identifier rubyid_general_name_parser'>general_name_parser</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:san_names</span><span class='rbracket'>]</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_create_request'>create_request</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:subject</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='id identifier rubyid_san_names'>san_names</span><span class='rparen'>)</span> <span class='comment'>#sets @req
 </span>  <span class='kw'>elsif</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:csr</span><span class='rparen'>)</span>
     <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:san_names</span><span class='rparen'>)</span>
-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>You can't add domains to an existing CSR</span><span class='tstring_end'>&quot;</span></span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ArgumentError</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>You can&#39;t add domains to an existing CSR</span><span class='tstring_end'>&quot;</span></span>
     <span class='kw'>end</span>
     <span class='id identifier rubyid_parse_csr'>parse_csr</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:csr</span><span class='rbracket'>]</span><span class='rparen'>)</span>
   <span class='kw'>else</span>
@@ -1047,20 +1101,18 @@ support)</p>
 
   <span class='kw'>if</span> <span class='id identifier rubyid_dsa?'>dsa?</span>
     <span class='comment'>#only DSS1 is acceptable for DSA signing in OpenSSL &lt; 1.0
-</span>    <span class='comment'>#post-1.0 you can sign with anything, but let's be conservative
+</span>    <span class='comment'>#post-1.0 you can sign with anything, but let&#39;s be conservative
 </span>    <span class='comment'>#see: http://www.ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/PKey/DSA.html
-</span>    <span class='ivar'>@message_digest</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>MessageDigest</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>dss1</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>
-  <span class='kw'>elsif</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:message_digest</span><span class='rparen'>)</span>
-    <span class='ivar'>@message_digest</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>MessageDigest</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:message_digest</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+</span>    <span class='ivar'>@message_digest</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>MessageDigest</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>dss1</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span>
   <span class='kw'>else</span>
-    <span class='ivar'>@message_digest</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>MessageDigest</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>sha1</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>
+    <span class='ivar'>@message_digest</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>MessageDigest</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:message_digest</span><span class='rbracket'>]</span><span class='rparen'>)</span>
   <span class='kw'>end</span>
 
   <span class='kw'>if</span> <span class='kw'>not</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='symbol'>:csr</span><span class='rparen'>)</span>
     <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_sign'>sign</span><span class='lparen'>(</span><span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='ivar'>@message_digest</span><span class='period'>.</span><span class='id identifier rubyid_digest'>digest</span><span class='rparen'>)</span>
   <span class='kw'>end</span>
   <span class='kw'>if</span> <span class='kw'>not</span> <span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='kw'>and</span> <span class='kw'>not</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_verify'>verify</span><span class='lparen'>(</span><span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='rparen'>)</span> <span class='kw'>then</span>
-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>R509Error</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Key does not match request.</span><span class='tstring_end'>'</span></span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>R509Error</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>Key does not match request.</span><span class='tstring_end'>&#39;</span></span>
   <span class='kw'>end</span>
 
 <span class='kw'>end</span></pre>
@@ -1102,12 +1154,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_attributes'>attributes</span>
   <span class='ivar'>@attributes</span>
@@ -1145,12 +1197,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_key'>key</span>
   <span class='ivar'>@key</span>
@@ -1188,12 +1240,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_message_digest'>message_digest</span>
   <span class='ivar'>@message_digest</span>
@@ -1231,12 +1283,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_req'>req</span>
   <span class='ivar'>@req</span>
@@ -1274,12 +1326,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_san'>san</span>
   <span class='ivar'>@san</span>
@@ -1317,12 +1369,12 @@ support)</p>
       <pre class="lines">
 
 
-13
-14
-15</pre>
+15
+16
+17</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 13</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 15</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_subject'>subject</span>
   <span class='ivar'>@subject</span>
@@ -1425,18 +1477,27 @@ support)</p>
 
     
       <div class="method_details first">
-  <h3 class="signature first" id="bit_strength-instance_method">
+  <h3 class="signature first" id="bit_length-instance_method">
   
-    - (<tt>Integer</tt>) <strong>bit_strength</strong> 
+    - (<tt>Integer</tt>) <strong>bit_length</strong> 
   
 
   
+    <span class="aliases">Also known as:
+    <span class="names"><span id='bit_strength-instance_method'>bit_strength</span></span>
+    </span>
+  
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#bit_length-instance_method" title="R509::Helpers#bit_length (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Returns the bit strength of the key used to create the CSR</p>
+<p>Returns the bit length of the key</p>
 
 
   </div>
@@ -1455,44 +1516,14 @@ support)</p>
       
         &mdash;
         <div class='inline'>
-<p>the integer bit strength.</p>
+<p>the integer bit length.</p>
 </div>
       
     </li>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-179
-180
-181
-182
-183
-184
-185
-186
-187</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 179</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_bit_strength'>bit_strength</span>
-  <span class='kw'>if</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_rsa?'>rsa?</span>
-    <span class='kw'>return</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_n'>n</span><span class='period'>.</span><span class='id identifier rubyid_num_bits'>num_bits</span>
-  <span class='kw'>elsif</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_dsa?'>dsa?</span>
-    <span class='kw'>return</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_p'>p</span><span class='period'>.</span><span class='id identifier rubyid_num_bits'>num_bits</span>
-  <span class='kw'>elsif</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_ec?'>ec?</span>
-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>R509Error</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Bit strength is not available for EC at this time.</span><span class='tstring_end'>'</span></span>
-  <span class='kw'>end</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -1504,6 +1535,11 @@ support)</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#curve_name-instance_method" title="R509::Helpers#curve_name (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
@@ -1534,33 +1570,7 @@ key if the key is EC. If not, raises an error.</p>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-193
-194
-195
-196
-197
-198
-199</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 193</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_curve_name'>curve_name</span>
-  <span class='kw'>if</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_ec?'>ec?</span>
-    <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_group'>group</span><span class='period'>.</span><span class='id identifier rubyid_curve_name'>curve_name</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>R509Error</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Curve name is only available with EC CSRs</span><span class='tstring_end'>'</span></span>
-  <span class='kw'>end</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -1572,6 +1582,11 @@ key if the key is EC. If not, raises an error.</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#dsa%3F-instance_method" title="R509::Helpers#dsa? (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
@@ -1601,25 +1616,7 @@ key if the key is EC. If not, raises an error.</p>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-166
-167
-168</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 166</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_dsa?'>dsa?</span>
-  <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>DSA</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -1631,6 +1628,11 @@ key if the key is EC. If not, raises an error.</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#ec%3F-instance_method" title="R509::Helpers#ec? (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
@@ -1660,25 +1662,7 @@ key if the key is EC. If not, raises an error.</p>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-173
-174
-175</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 173</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_ec?'>ec?</span>
-  <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>EC</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -1751,7 +1735,7 @@ key if the key is EC. If not, raises an error.</p>
       <div class="method_details ">
   <h3 class="signature " id="key_algorithm-instance_method">
   
-    - (<tt>Symbol</tt>) <strong>key_algorithm</strong> 
+    - (<tt>String</tt>) <strong>key_algorithm</strong> 
   
 
   
@@ -1773,13 +1757,13 @@ key if the key is EC. If not, raises an error.</p>
     <li>
       
       
-        <span class='type'>(<tt>Symbol</tt>)</span>
+        <span class='type'>(<tt>String</tt>)</span>
       
       
       
         &mdash;
         <div class='inline'>
-<p>value of the key algorithm. :rsa, :dsa, :ec</p>
+<p>value of the key algorithm. RSA, DSA, or EC</p>
 </div>
       
     </li>
@@ -1792,26 +1776,26 @@ key if the key is EC. If not, raises an error.</p>
       <pre class="lines">
 
 
-223
-224
-225
-226
-227
-228
-229
-230
-231</pre>
+148
+149
+150
+151
+152
+153
+154
+155
+156</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 223</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 148</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_key_algorithm'>key_algorithm</span>
   <span class='kw'>if</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>RSA</span> <span class='kw'>then</span>
-    <span class='symbol'>:rsa</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>RSA</span><span class='tstring_end'>&quot;</span></span>
   <span class='kw'>elsif</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>DSA</span> <span class='kw'>then</span>
-    <span class='symbol'>:dsa</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>DSA</span><span class='tstring_end'>&quot;</span></span>
   <span class='kw'>elsif</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>EC</span> <span class='kw'>then</span>
-    <span class='symbol'>:ec</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>EC</span><span class='tstring_end'>&quot;</span></span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -1891,6 +1875,11 @@ key if the key is EC. If not, raises an error.</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#rsa%3F-instance_method" title="R509::Helpers#rsa? (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
@@ -1920,25 +1909,7 @@ key if the key is EC. If not, raises an error.</p>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-159
-160
-161</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 159</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_rsa?'>rsa?</span>
-  <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>PKey</span><span class='op'>::</span><span class='const'>RSA</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -1986,12 +1957,12 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
       <pre class="lines">
 
 
-216
-217
-218</pre>
+141
+142
+143</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 216</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 141</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_signature_algorithm'>signature_algorithm</span>
   <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_signature_algorithm'>signature_algorithm</span>
@@ -2045,17 +2016,17 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
       <pre class="lines">
 
 
-204
-205
-206
-207
-208
-209
-210
-211</pre>
+129
+130
+131
+132
+133
+134
+135
+136</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 204</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 129</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_subject_component'>subject_component</span> <span class='id identifier rubyid_short_name'>short_name</span>
   <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_subject'>subject</span><span class='period'>.</span><span class='id identifier rubyid_to_a'>to_a</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_element'>element</span><span class='op'>|</span>
@@ -2079,10 +2050,15 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#to_der-instance_method" title="R509::Helpers#to_der (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Converts the CSR into the DER format</p>
+<p>Converts the object into DER format</p>
 
 
   </div>
@@ -2101,32 +2077,14 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
       
         &mdash;
         <div class='inline'>
-<p>the CSR converted into DER format.</p>
+<p>the object converted into DER format.</p>
 </div>
       
     </li>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-136
-137
-138</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 136</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_to_der'>to_der</span>
-  <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -2136,16 +2094,17 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
   
 
   
-    <span class="aliases">Also known as:
-    <span class="names"><span id='to_s-instance_method'>to_s</span></span>
-    </span>
-  
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#to_pem-instance_method" title="R509::Helpers#to_pem (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Converts the CSR into the PEM format</p>
+<p>Converts the object into PEM format</p>
 
 
   </div>
@@ -2164,32 +2123,14 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
       
         &mdash;
         <div class='inline'>
-<p>the CSR converted into PEM format.</p>
+<p>the object converted into PEM format.</p>
 </div>
       
     </li>
   
 </ul>
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-127
-128
-129</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 127</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_to_pem'>to_pem</span>
-  <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -2255,10 +2196,15 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#write_der-instance_method" title="R509::Helpers#write_der (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Writes the CSR into the DER format</p>
+<p>Writes the object into DER format</p>
 
 
   </div>
@@ -2278,8 +2224,8 @@ sha256WithRSAEncryption, md5WithRSAEncryption</p>
       
         &mdash;
         <div class='inline'>
-<p>Either a string of the path for the file that you'd like to write, or an
-IO-like object.</p>
+<p>Either a string of the path for the file that you&#39;d like to write, or
+an IO-like object.</p>
 </div>
       
     </li>
@@ -2287,25 +2233,7 @@ IO-like object.</p>
 </ul>
 
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-152
-153
-154</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 152</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_write_der'>write_der</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_write_data'>write_data</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='comma'>,</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
       <div class="method_details ">
@@ -2317,10 +2245,15 @@ IO-like object.</p>
   
 
   
+    <span class="not_defined_here">
+      Originally defined in module
+        <span class='object_link'><a href="Helpers.html#write_pem-instance_method" title="R509::Helpers#write_pem (method)">Helpers</a></span>
+    </span>
+  
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Writes the CSR into the PEM format</p>
+<p>Writes the object into PEM format</p>
 
 
   </div>
@@ -2340,8 +2273,8 @@ IO-like object.</p>
       
         &mdash;
         <div class='inline'>
-<p>Either a string of the path for the file that you'd like to write, or an
-IO-like object.</p>
+<p>Either a string of the path for the file that you&#39;d like to write, or
+an IO-like object.</p>
 </div>
       
     </li>
@@ -2349,25 +2282,7 @@ IO-like object.</p>
 </ul>
 
 
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-144
-145
-146</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/csr.rb', line 144</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_write_pem'>write_pem</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_write_data'>write_data</span><span class='lparen'>(</span><span class='id identifier rubyid_filename_or_io'>filename_or_io</span><span class='comma'>,</span> <span class='ivar'>@req</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
+</div>
 </div>
     
   </div>
@@ -2375,9 +2290,9 @@ IO-like object.</p>
 </div>
 
     <div id="footer">
-  Generated on Tue Apr 23 10:46:04 2013 by
+  Generated on Sun Jan 26 13:37:26 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.5 (ruby-1.9.3).
+  0.8.6.1 (ruby-2.0.0).
 </div>
 
   </body>