RubyGems - r509 - Versions diffs - 0.8.1 → 0.9 - Mend

r509 0.8.1 → 0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (203) hide show

data/README.md +343 -151
data/Rakefile +26 -23
data/bin/r509 +126 -112
data/bin/r509-parse +24 -24
data/doc/R509.html +169 -7
data/doc/R509/ASN1.html +370 -0
data/doc/R509/ASN1/GeneralName.html +1121 -0
data/doc/R509/ASN1/GeneralNames.html +843 -0
data/doc/R509/ASN1/NoticeReference.html +392 -0
data/doc/R509/ASN1/PolicyInformation.html +387 -0
data/doc/R509/ASN1/PolicyQualifiers.html +455 -0
data/doc/R509/ASN1/UserNotice.html +386 -0
data/doc/R509/{Crl.html → CRL.html} +7 -7
data/doc/R509/CRL/Administrator.html +1559 -0
data/doc/R509/{Crl/Parser.html → CRL/SignedList.html} +501 -210
data/doc/R509/{Csr.html → CSR.html} +444 -314
data/doc/R509/Cert.html +866 -617
data/doc/R509/Cert/Extensions.html +52 -41
data/doc/R509/Cert/Extensions/AuthorityInfoAccess.html +70 -35
data/doc/R509/Cert/Extensions/AuthorityKeyIdentifier.html +387 -4
data/doc/R509/Cert/Extensions/BasicConstraints.html +61 -25
data/doc/R509/Cert/Extensions/CRLDistributionPoints.html +354 -0
data/doc/R509/Cert/Extensions/CertificatePolicies.html +340 -0
data/doc/R509/Cert/Extensions/ExtendedKeyUsage.html +440 -49
data/doc/R509/Cert/Extensions/{CrlDistributionPoints.html → InhibitAnyPolicy.html} +52 -35
data/doc/R509/Cert/Extensions/KeyUsage.html +247 -121
data/doc/R509/Cert/Extensions/NameConstraints.html +445 -0
data/doc/R509/Cert/Extensions/OCSPNoCheck.html +239 -0
data/doc/R509/Cert/Extensions/PolicyConstraints.html +424 -0
data/doc/R509/Cert/Extensions/SubjectAlternativeName.html +437 -62
data/doc/R509/Cert/Extensions/SubjectKeyIdentifier.html +52 -10
data/doc/R509/CertificateAuthority.html +4 -4
data/doc/R509/CertificateAuthority/Signer.html +154 -187
data/doc/R509/Config.html +6 -6
data/doc/R509/Config/{CaConfig.html → CAConfig.html} +451 -348
data/doc/R509/Config/{CaConfigPool.html → CAConfigPool.html} +47 -47
data/doc/R509/Config/CAProfile.html +1015 -0
data/doc/R509/Config/SubjectItemPolicy.html +86 -86
data/doc/R509/IOHelpers.html +22 -22
data/doc/R509/MessageDigest.html +14 -14
data/doc/R509/NameSanitizer.html +53 -53
data/doc/R509/{Ocsp.html → OCSP.html} +9 -9
data/doc/R509/{Ocsp → OCSP}/Request.html +7 -7
data/doc/R509/{Ocsp → OCSP}/Request/Nonce.html +56 -11
data/doc/R509/{Ocsp → OCSP}/Response.html +44 -44
data/doc/R509/{OidMapper.html → OIDMapper.html} +23 -39
data/doc/R509/PrivateKey.html +415 -168
data/doc/R509/R509Error.html +3 -3
data/doc/R509/{Spki.html → SPKI.html} +354 -192
data/doc/R509/Subject.html +224 -113
data/doc/R509/Validity.html +27 -5
data/doc/R509/Validity/Checker.html +13 -13
data/doc/R509/Validity/DefaultChecker.html +13 -13
data/doc/R509/Validity/DefaultWriter.html +14 -14
data/doc/R509/Validity/Status.html +39 -39
data/doc/R509/Validity/Writer.html +18 -18
data/doc/_index.html +138 -35
data/doc/class_list.html +1 -1
data/doc/css/style.css +10 -0
data/doc/file.README.html +368 -171
data/doc/file.r509.html +92 -69
data/doc/frames.html +1 -1
data/doc/index.html +368 -171
data/doc/method_list.html +910 -390
data/doc/top-level-namespace.html +3 -3
data/lib/r509.rb +32 -16
data/lib/r509/asn1.rb +375 -0
data/lib/r509/cert.rb +381 -364
data/lib/r509/cert/extensions.rb +443 -76
data/lib/r509/certificate_authority.rb +407 -0
data/lib/r509/config.rb +547 -351
data/lib/r509/crl.rb +336 -366
data/lib/r509/csr.rb +278 -289
data/lib/r509/ec-hack.rb +37 -0
data/lib/r509/exceptions.rb +3 -3
data/lib/r509/io_helpers.rb +44 -44
data/lib/r509/message_digest.rb +53 -0
data/lib/r509/ocsp.rb +80 -70
data/lib/r509/oid_mapper.rb +32 -0
data/lib/r509/private_key.rb +228 -0
data/lib/r509/spki.rb +145 -93
data/lib/r509/subject.rb +203 -110
data/lib/r509/validity.rb +70 -68
data/lib/r509/version.rb +2 -2
data/r509.yaml +92 -69
data/spec/asn1_spec.rb +402 -0
data/spec/cert/extensions_spec.rb +957 -494
data/spec/cert_spec.rb +382 -307
data/spec/certificate_authority_spec.rb +668 -250
data/spec/config_spec.rb +515 -302
data/spec/crl_spec.rb +197 -198
data/spec/csr_spec.rb +334 -289
data/spec/fixtures.rb +247 -171
data/spec/fixtures/cert1.der +0 -0
data/spec/fixtures/cert1.pem +0 -0
data/spec/fixtures/cert1_public_key_modulus.txt +0 -0
data/spec/fixtures/cert3.p12 +0 -0
data/spec/fixtures/cert3.pem +0 -0
data/spec/fixtures/cert3_key.pem +0 -0
data/spec/fixtures/cert3_key_des3.pem +0 -0
data/spec/fixtures/cert4.pem +0 -0
data/spec/fixtures/cert5.pem +0 -0
data/spec/fixtures/cert6.pem +0 -0
data/spec/fixtures/cert_expired.pem +0 -0
data/spec/fixtures/cert_inhibit.pem +24 -0
data/spec/fixtures/cert_name_constraints.pem +29 -0
data/spec/fixtures/cert_not_yet_valid.pem +0 -0
data/spec/fixtures/cert_ocsp_no_check.pem +18 -0
data/spec/fixtures/cert_policy_constraints.pem +31 -0
data/spec/fixtures/cert_san.pem +0 -0
data/spec/fixtures/cert_san2.pem +0 -0
data/spec/fixtures/cert_unknown_extension.pem +28 -0
data/spec/fixtures/config_pool_test_minimal.yaml +11 -11
data/spec/fixtures/config_test.yaml +54 -36
data/spec/fixtures/config_test_dsa.yaml +35 -0
data/spec/fixtures/config_test_ec.yaml +35 -0
data/spec/fixtures/config_test_engine_key.yaml +5 -5
data/spec/fixtures/config_test_engine_no_key_name.yaml +4 -4
data/spec/fixtures/config_test_minimal.yaml +4 -4
data/spec/fixtures/config_test_password.yaml +5 -5
data/spec/fixtures/config_test_various.yaml +111 -74
data/spec/fixtures/crl_list_file.txt +0 -0
data/spec/fixtures/crl_with_reason.pem +0 -0
data/spec/fixtures/csr1.der +0 -0
data/spec/fixtures/csr1.pem +0 -0
data/spec/fixtures/csr1_key.der +0 -0
data/spec/fixtures/csr1_key.pem +0 -0
data/spec/fixtures/csr1_key_encrypted_des3.pem +0 -0
data/spec/fixtures/csr1_newlines.pem +0 -0
data/spec/fixtures/csr1_no_begin_end.pem +0 -0
data/spec/fixtures/csr1_public_key_modulus.txt +0 -0
data/spec/fixtures/csr2.pem +0 -0
data/spec/fixtures/csr2_key.pem +0 -0
data/spec/fixtures/csr3.pem +0 -0
data/spec/fixtures/csr4.pem +0 -0
data/spec/fixtures/csr_dsa.pem +0 -0
data/spec/fixtures/csr_invalid_signature.pem +0 -0
data/spec/fixtures/dsa_key.pem +0 -0
data/spec/fixtures/dsa_root.cer +28 -0
data/spec/fixtures/dsa_root.key +20 -0
data/spec/fixtures/ec_csr2.der +0 -0
data/spec/fixtures/ec_csr2.pem +8 -0
data/spec/fixtures/ec_key1.der +0 -0
data/spec/fixtures/ec_key1.pem +6 -0
data/spec/fixtures/ec_key1_encrypted.pem +9 -0
data/spec/fixtures/ec_key2.pem +6 -0
data/spec/fixtures/hmacsha1.sig +1 -0
data/spec/fixtures/hmacsha512.sig +1 -0
data/spec/fixtures/key4.pem +0 -0
data/spec/fixtures/key4_encrypted_des3.pem +0 -0
data/spec/fixtures/missing_key_identifier_ca.cer +0 -0
data/spec/fixtures/missing_key_identifier_ca.key +0 -0
data/spec/fixtures/ocsptest.r509.local.pem +0 -0
data/spec/fixtures/ocsptest.r509.local_ocsp_request.der +0 -0
data/spec/fixtures/ocsptest2.r509.local.pem +0 -0
data/spec/fixtures/second_ca.cer +0 -0
data/spec/fixtures/second_ca.key +0 -0
data/spec/fixtures/spkac.der +0 -0
data/spec/fixtures/spkac.txt +0 -0
data/spec/fixtures/spkac_dsa.txt +1 -1
data/spec/fixtures/spkac_dsa_no_verify.txt +1 -0
data/spec/fixtures/spkac_ec.txt +1 -0
data/spec/fixtures/spkac_rsa_newlines.txt +13 -0
data/spec/fixtures/stca.pem +0 -0
data/spec/fixtures/stca_ocsp_request.der +0 -0
data/spec/fixtures/stca_ocsp_response.der +0 -0
data/spec/fixtures/test1.csr +0 -0
data/spec/fixtures/test_ca.cer +0 -0
data/spec/fixtures/test_ca.key +0 -0
data/spec/fixtures/test_ca.p12 +0 -0
data/spec/fixtures/test_ca_des3.key +0 -0
data/spec/fixtures/test_ca_ec.cer +14 -0
data/spec/fixtures/test_ca_ec.key +6 -0
data/spec/fixtures/test_ca_ec_ee.cer +22 -0
data/spec/fixtures/test_ca_ec_ee.key +6 -0
data/spec/fixtures/test_ca_ocsp.cer +0 -0
data/spec/fixtures/test_ca_ocsp.key +0 -0
data/spec/fixtures/test_ca_ocsp.p12 +0 -0
data/spec/fixtures/test_ca_ocsp_chain.txt +0 -0
data/spec/fixtures/test_ca_ocsp_response.der +0 -0
data/spec/fixtures/test_ca_subroot.cer +0 -0
data/spec/fixtures/test_ca_subroot.key +0 -0
data/spec/fixtures/test_ca_subroot_ocsp.cer +0 -0
data/spec/fixtures/test_ca_subroot_ocsp.key +0 -0
data/spec/fixtures/test_ca_subroot_ocsp_response.der +0 -0
data/spec/fixtures/unknown_oid.csr +0 -0
data/spec/message_digest_spec.rb +104 -84
data/spec/ocsp_spec.rb +105 -105
data/spec/oid_mapper_spec.rb +21 -21
data/spec/private_key_spec.rb +275 -0
data/spec/r509_spec.rb +35 -0
data/spec/spec_helper.rb +15 -6
data/spec/spki_spec.rb +221 -142
data/spec/subject_spec.rb +232 -164
data/spec/validity_spec.rb +91 -91
metadata +79 -25
data/doc/R509/Config/CaProfile.html +0 -651
data/doc/R509/Crl/Administrator.html +0 -2073
data/lib/r509/certificateauthority.rb +0 -290
data/lib/r509/messagedigest.rb +0 -49
data/lib/r509/oidmapper.rb +0 -32
data/lib/r509/privatekey.rb +0 -185
data/spec/privatekey_spec.rb +0 -198

data/doc/R509/R509Error.html CHANGED Viewed

@@ -6,7 +6,7 @@
 <title>
   Exception: R509::R509Error
-    &mdash; Documentation by YARD 0.8.2.1
+    &mdash; Documentation by YARD 0.8.5
 </title>
@@ -125,9 +125,9 @@
 </div>
     <div id="footer">
-  Generated on Thu Nov  8 14:19:27 2012 by
+  Generated on Tue Apr 16 10:49:57 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.2.1 (ruby-1.9.3).
+  0.8.5 (ruby-1.9.3).
 </div>
   </body>

data/doc/R509/{Spki.html → SPKI.html} RENAMED Viewed

@@ -4,9 +4,9 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>
-  Class: R509::Spki
+  Class: R509::SPKI
-    &mdash; Documentation by YARD 0.8.2.1
+    &mdash; Documentation by YARD 0.8.5
 </title>
@@ -34,7 +34,7 @@
     <a href="../_index.html">Index (S)</a> &raquo;
     <span class='title'><span class='object_link'><a href="../R509.html" title="R509 (module)">R509</a></span></span>
      &raquo;
-    <span class="title">Spki</span>
+    <span class="title">SPKI</span>
   <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
@@ -63,7 +63,7 @@
     <iframe id="search_frame"></iframe>
-    <div id="content"><h1>Class: R509::Spki
+    <div id="content"><h1>Class: R509::SPKI
@@ -78,7 +78,7 @@
         <ul class="fullTree">
           <li>Object</li>
-            <li class="next">R509::Spki</li>
+            <li class="next">R509::SPKI</li>
         </ul>
         <a href="#" class="inheritanceTree">show all</a>
@@ -106,8 +106,8 @@
 <h2>Overview</h2><div class="docstring">
   <div class="discussion">
-<p>class for handling SPKAC/SPKI requests (typically generated by the
-&lt;keygen&gt; tag</p>
+<p>class for loading/generating SPKAC/SPKI requests (typically generated by
+the &lt;keygen&gt; tag</p>
   </div>
@@ -125,7 +125,7 @@
       <li class="public ">
   <span class="summary_signature">
-      <a href="#san_names-instance_method" title="#san_names (instance method)">- (Object) <strong>san_names</strong> </a>
+      <a href="#key-instance_method" title="#key (instance method)">- (Object) <strong>key</strong> </a>
@@ -145,7 +145,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>Returns the value of attribute san_names.</p>
+<p>Returns the value of attribute key.</p>
 </div></span>
 </li>
@@ -180,10 +180,23 @@
 </li>
-      <li class="public ">
+  </ul>
+    <h2>
+      Instance Method Summary
+      <small>(<a href="#" class="summary_toggle">collapse</a>)</small>
+    </h2>
+    <ul class="summary">
+        <li class="public ">
   <span class="summary_signature">
-      <a href="#subject-instance_method" title="#subject (instance method)">- (Object) <strong>subject</strong> </a>
+      <a href="#bit_strength-instance_method" title="#bit_strength (instance method)">- (Integer) <strong>bit_strength</strong> </a>
@@ -191,11 +204,6 @@
-      <span class="note title readonly">readonly</span>
@@ -203,29 +211,41 @@
     <span class="summary_desc"><div class='inline'>
-<p>Returns the value of attribute subject.</p>
+<p>Returns the bit strength of the key used to create the SPKI.</p>
 </div></span>
 </li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#curve_name-instance_method" title="#curve_name (instance method)">- (String) <strong>curve_name</strong> </a>
-  </ul>
+  </span>
-    <h2>
-      Instance Method Summary
-      <small>(<a href="#" class="summary_toggle">collapse</a>)</small>
-    </h2>
+    <span class="summary_desc"><div class='inline'>
+<p>Returns the short name of the elliptic curve used to generate the public
+key if the key is EC.</p>
+</div></span>
+</li>
-    <ul class="summary">
         <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="#dsa%3F-instance_method" title="#dsa? (instance method)">- (Boolean) <strong>dsa?</strong> </a>
@@ -240,7 +260,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>Returns the bit strength of the key used to create the SPKI.</p>
+<p>Returns whether the public key is DSA.</p>
 </div></span>
 </li>
@@ -249,7 +269,7 @@
         <li class="public ">
   <span class="summary_signature">
-      <a href="#dsa%3F-instance_method" title="#dsa? (instance method)">- (Boolean) <strong>dsa?</strong> </a>
+      <a href="#ec%3F-instance_method" title="#ec? (instance method)">- (Boolean) <strong>ec?</strong> </a>
@@ -264,7 +284,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>Returns whether the public key is DSA.</p>
+<p>Returns whether the public key is EC.</p>
 </div></span>
 </li>
@@ -273,7 +293,7 @@
         <li class="public ">
   <span class="summary_signature">
-      <a href="#initialize-instance_method" title="#initialize (instance method)">- (Spki) <strong>initialize</strong>(opts = {}) </a>
+      <a href="#initialize-instance_method" title="#initialize (instance method)">- (SPKI) <strong>initialize</strong>(opts = {}) </a>
@@ -290,7 +310,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>you can also pass OIDs (see tests).</p>
+<p>A new instance of SPKI.</p>
 </div></span>
 </li>
@@ -395,10 +415,12 @@
         <li class="public ">
   <span class="summary_signature">
-      <a href="#to_hash-instance_method" title="#to_hash (instance method)">- (Hash) <strong>to_hash</strong> </a>
+      <a href="#to_pem-instance_method" title="#to_pem (instance method)">- (String) <strong>to_pem</strong> </a>
+      (also: #to_s)
   </span>
@@ -410,9 +432,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>Returns a hash structure you can pass to the Ca You will want to call this
-method if you intend to alter the values and then pass them to the Ca
-class.</p>
+<p>Converts the SPKI into the PEM format.</p>
 </div></span>
 </li>
@@ -421,12 +441,10 @@ class.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#to_pem-instance_method" title="#to_pem (instance method)">- (String) <strong>to_pem</strong> </a>
+      <a href="#verify_signature-instance_method" title="#verify_signature (instance method)">- (Boolean) <strong>verify_signature</strong> </a>
-      (also: #to_s)
   </span>
@@ -438,7 +456,7 @@ class.</p>
     <span class="summary_desc"><div class='inline'>
-<p>Converts the SPKI into the PEM format.</p>
+<p>Verifies the integrity of the signature on the SPKI.</p>
 </div></span>
 </li>
@@ -512,7 +530,7 @@ class.</p>
     <div class="method_details first">
   <h3 class="signature first" id="initialize-instance_method">
-    - (<tt><span class='object_link'><a href="" title="R509::Spki (class)">Spki</a></span></tt>) <strong>initialize</strong>(opts = {})
+    - (<tt><span class='object_link'><a href="" title="R509::SPKI (class)">SPKI</a></span></tt>) <strong>initialize</strong>(opts = {})
@@ -521,25 +539,13 @@ class.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>you can also pass OIDs (see tests)</p>
+<p>A new instance of SPKI</p>
   </div>
 </div>
 <div class="tags">
-  <div class="examples">
-    <p class="tag_title">Examples:</p>
-        <p class="example_title"><div class='inline'><dl class="rdoc-list"><dt>['<a href="http://'ST','Illinois'">CN','langui.sh'],</a>,['<a href="http://'C','US'">L','Chicago'],</a>,['emailAddress','ca@langui.sh']</dt>
-<dd></dd></dl>
-</div></p>
-      <pre class="example code"></pre>
-  </div>
-<p class="tag_title">Parameters:</p>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -582,27 +588,30 @@ class.</p>
         </li>
         <li>
-          <span class="name">:subject</span>
-          <span class="type">(<tt><span class='object_link'><a href="Subject.html" title="R509::Subject (class)">R509::Subject</a></span></tt>, <tt>Array</tt>, <tt>OpenSSL::X509::Name</tt>)</span>
+          <span class="name">:key</span>
+          <span class="type">(<tt><span class='object_link'><a href="PrivateKey.html" title="R509::PrivateKey (class)">R509::PrivateKey</a></span></tt>, <tt>String</tt>)</span>
           <span class="default">
           </span>
             &mdash; <div class='inline'>
-<p>array of subject items</p>
+<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). if supplied you do not need to pass an spki.</p>
 </div>
         </li>
         <li>
-          <span class="name">:san_names</span>
-          <span class="type">(<tt>Array</tt>)</span>
+          <span class="name">:message_digest</span>
+          <span class="type">(<tt>String</tt>)</span>
           <span class="default">
           </span>
             &mdash; <div class='inline'>
-<p>array of SAN names</p>
+<p>Optional digest. sha1, sha224, sha256, sha384, sha512, md5. Defaults to
+sha1. Only used if you supply a :key and no :spki</p>
 </div>
         </li>
@@ -617,6 +626,8 @@ class.</p>
       <pre class="lines">
+14
+15
 16
 17
 18
@@ -630,24 +641,90 @@ class.</p>
 26
 27
 28
-29</pre>
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 16</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 14</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='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='kw'>elsif</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'>:spki</span><span class='rparen'>)</span> <span class='kw'>and</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'>:key</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 either :spki or :key</span><span class='tstring_end'>'</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'>: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'>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'>:spki</span><span class='rparen'>)</span> <span class='kw'>and</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'>:subject</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'>Must provide both spki and subject</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'>:spki</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_spki'>spki</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:spki</span><span class='rbracket'>]</span>
+    <span class='comment'># first let's try cleaning up the input a bit so OpenSSL is happy with it
+</span>    <span class='comment'># OpenSSL hates SPKAC=
+</span>    <span class='id identifier rubyid_spki'>spki</span><span class='period'>.</span><span class='id identifier rubyid_sub!'>sub!</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>SPKAC=</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+    <span class='comment'># it really hates newlines (Firefox loves 'em)
+</span>    <span class='comment'># so let's normalize line endings
+</span>    <span class='id identifier rubyid_spki'>spki</span><span class='period'>.</span><span class='id identifier rubyid_gsub!'>gsub!</span><span class='lparen'>(</span><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>\r\n?</span><span class='regexp_end'>/</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>\n</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+    <span class='comment'># and nuke 'em
+</span>    <span class='id identifier rubyid_spki'>spki</span><span class='period'>.</span><span class='id identifier rubyid_gsub!'>gsub!</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>\n</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+    <span class='comment'># ...and leading/trailing whitespace
+</span>    <span class='id identifier rubyid_spki'>spki</span><span class='period'>.</span><span class='id identifier rubyid_strip!'>strip!</span>
+    <span class='ivar'>@spki</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Netscape</span><span class='op'>::</span><span class='const'>SPKI</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_spki'>spki</span><span class='rparen'>)</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'>@spki</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 SPKI.</span><span class='tstring_end'>'</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'>:san_names</span><span class='rparen'>)</span> <span class='kw'>and</span> <span class='kw'>not</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='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span><span class='const'>Array</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'>if san_names are provided they must be in an Array</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>
+  <span class='comment'># create the SPKI from the private key if it wasn't passed in
+</span>  <span class='kw'>if</span> <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
+    <span class='ivar'>@spki</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Netscape</span><span class='op'>::</span><span class='const'>SPKI</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
+    <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span> <span class='op'>=</span> <span class='ivar'>@key</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span>
+    <span class='kw'>if</span> <span class='ivar'>@key</span><span class='period'>.</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'>#see: http://www.ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/PKey/DSA.html
+</span>      <span class='id identifier rubyid_message_digest'>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='id identifier rubyid_message_digest'>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'>else</span>
+      <span class='id identifier rubyid_message_digest'>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='kw'>end</span>
-    <span class='ivar'>@spki</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Netscape</span><span class='op'>::</span><span class='const'>SPKI</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'>:spki</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_sub'>sub</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>SPKAC=</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='rparen'>)</span>
-    <span class='ivar'>@subject</span> <span class='op'>=</span> <span class='const'>R509</span><span class='op'>::</span><span class='const'>Subject</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'>:subject</span><span class='rbracket'>]</span><span class='rparen'>)</span>
-    <span class='ivar'>@san_names</span> <span class='op'>=</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='ivar'>@spki</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='id identifier rubyid_message_digest'>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'>end</span></pre>
     </td>
   </tr>
@@ -662,9 +739,9 @@ class.</p>
       <span id=""></span>
       <div class="method_details first">
-  <h3 class="signature first" id="san_names-instance_method">
+  <h3 class="signature first" id="key-instance_method">
-    - (<tt>Object</tt>) <strong>san_names</strong>  <span class="extras">(readonly)</span>
+    - (<tt>Object</tt>) <strong>key</strong>  <span class="extras">(readonly)</span>
@@ -673,7 +750,7 @@ class.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Returns the value of attribute san_names</p>
+<p>Returns the value of attribute key</p>
   </div>
@@ -694,8 +771,8 @@ class.</p>
     <td>
       <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 10</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_san_names'>san_names</span>
-  <span class='ivar'>@san_names</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_key'>key</span>
+  <span class='ivar'>@key</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -745,12 +822,17 @@ class.</p>
 </table>
 </div>
-      <span id=""></span>
-      <div class="method_details ">
-  <h3 class="signature " id="subject-instance_method">
+  </div>
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+      <div class="method_details first">
+  <h3 class="signature first" id="bit_strength-instance_method">
-    - (<tt>Object</tt>) <strong>subject</strong>  <span class="extras">(readonly)</span>
+    - (<tt>Integer</tt>) <strong>bit_strength</strong>
@@ -759,13 +841,31 @@ class.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Returns the value of attribute subject</p>
+<p>Returns the bit strength of the key used to create the SPKI</p>
   </div>
 </div>
 <div class="tags">
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>Integer</tt>)</span>
+        &mdash;
+        <div class='inline'>
+<p>the integer bit strength.</p>
+</div>
+    </li>
+</ul>
 </div><table class="source_code">
   <tr>
@@ -773,32 +873,105 @@ class.</p>
       <pre class="lines">
-10
-11
-12</pre>
+129
+130
+131
+132
+133
+134
+135
+136
+137</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 10</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 129</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_subject'>subject</span>
-  <span class='ivar'>@subject</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'>@spki</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'>@spki</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 class="method_details ">
+  <h3 class="signature " id="curve_name-instance_method">
+    - (<tt>String</tt>) <strong>curve_name</strong>
+</h3><div class="docstring">
+  <div class="discussion">
+<p>Returns the short name of the elliptic curve used to generate the public
+key if the key is EC. If not, raises an error.</p>
   </div>
+</div>
+<div class="tags">
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>String</tt>)</span>
+        &mdash;
+        <div class='inline'>
+<p>elliptic curve name</p>
+</div>
+    </li>
+</ul>
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
-  <div id="instance_method_details" class="method_details_list">
-    <h2>Instance Method Details</h2>
+143
+144
+145
+146
+147
+148
+149</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 143</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='ivar'>@spki</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 SPKIs</span><span class='tstring_end'>'</span></span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
-      <div class="method_details first">
-  <h3 class="signature first" id="bit_strength-instance_method">
+      <div class="method_details ">
+  <h3 class="signature " id="dsa?-instance_method">
-    - (<tt>Integer</tt>) <strong>bit_strength</strong>
+    - (<tt>Boolean</tt>) <strong>dsa?</strong>
@@ -807,7 +980,7 @@ class.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Returns the bit strength of the key used to create the SPKI</p>
+<p>Returns whether the public key is DSA</p>
   </div>
@@ -820,13 +993,13 @@ class.</p>
     <li>
-        <span class='type'>(<tt>Integer</tt>)</span>
+        <span class='type'>(<tt>Boolean</tt>)</span>
         &mdash;
         <div class='inline'>
-<p>the integer bit strength.</p>
+<p>true if the public key is DSA, false otherwise</p>
 </div>
     </li>
@@ -839,23 +1012,15 @@ class.</p>
       <pre class="lines">
-84
-85
-86
-87
-88
-89
-90</pre>
+116
+117
+118</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 84</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 116</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'>@spki</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'>@spki</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'>end</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_dsa?'>dsa?</span>
+  <span class='ivar'>@spki</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>
@@ -863,9 +1028,9 @@ class.</p>
 </div>
       <div class="method_details ">
-  <h3 class="signature " id="dsa?-instance_method">
+  <h3 class="signature " id="ec?-instance_method">
-    - (<tt>Boolean</tt>) <strong>dsa?</strong>
+    - (<tt>Boolean</tt>) <strong>ec?</strong>
@@ -874,7 +1039,7 @@ class.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Returns whether the public key is DSA</p>
+<p>Returns whether the public key is EC</p>
   </div>
@@ -893,7 +1058,7 @@ class.</p>
         &mdash;
         <div class='inline'>
-<p>true if the public key is DSA, false otherwise</p>
+<p>true if the public key is EC, false otherwise</p>
 </div>
     </li>
@@ -906,15 +1071,15 @@ class.</p>
       <pre class="lines">
-78
-79
-80</pre>
+123
+124
+125</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 78</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 123</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_dsa?'>dsa?</span>
-    <span class='ivar'>@spki</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'>def</span> <span class='id identifier rubyid_ec?'>ec?</span>
+  <span class='ivar'>@spki</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>
@@ -965,23 +1130,27 @@ class.</p>
       <pre class="lines">
-95
-96
-97
-98
-99
-100
-101</pre>
+154
+155
+156
+157
+158
+159
+160
+161
+162</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 95</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 154</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_key_algorithm'>key_algorithm</span>
-    <span class='kw'>if</span> <span class='ivar'>@spki</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='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>RSA</span><span class='tstring_end'>'</span></span>
-    <span class='kw'>elsif</span> <span class='ivar'>@spki</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='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>DSA</span><span class='tstring_end'>'</span></span>
-    <span class='kw'>end</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='symbol'>:rsa</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='symbol'>:dsa</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='symbol'>:ec</span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1032,15 +1201,15 @@ class.</p>
       <pre class="lines">
-32
-33
-34</pre>
+64
+65
+66</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 32</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 64</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_public_key'>public_key</span>
-    <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span>
+  <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_public_key'>public_key</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1091,15 +1260,15 @@ class.</p>
       <pre class="lines">
-71
-72
-73</pre>
+109
+110
+111</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 71</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 109</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_rsa?'>rsa?</span>
-    <span class='ivar'>@spki</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='ivar'>@spki</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>
@@ -1150,15 +1319,15 @@ class.</p>
       <pre class="lines">
-48
-49
-50</pre>
+86
+87
+88</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 48</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 86</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_to_der'>to_der</span>
-    <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span>
+  <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1166,20 +1335,22 @@ class.</p>
 </div>
       <div class="method_details ">
-  <h3 class="signature " id="to_hash-instance_method">
+  <h3 class="signature " id="to_pem-instance_method">
-    - (<tt>Hash</tt>) <strong>to_hash</strong>
+    - (<tt>String</tt>) <strong>to_pem</strong>
+    <span class="aliases">Also known as:
+    <span class="names"><span id='to_s-instance_method'>to_s</span></span>
+    </span>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Returns a hash structure you can pass to the Ca You will want to call this
-method if you intend to alter the values and then pass them to the Ca
-class.</p>
+<p>Converts the SPKI into the PEM format</p>
   </div>
@@ -1192,13 +1363,13 @@ class.</p>
     <li>
-        <span class='type'>(<tt>Hash</tt>)</span>
+        <span class='type'>(<tt>String</tt>)</span>
         &mdash;
         <div class='inline'>
-<p>:subject and :san_names you can pass to Ca</p>
+<p>the SPKI converted into PEM format.</p>
 </div>
     </li>
@@ -1211,15 +1382,15 @@ class.</p>
       <pre class="lines">
-108
-109
-110</pre>
+77
+78
+79</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 108</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 77</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_to_hash'>to_hash</span>
-    <span class='lbrace'>{</span> <span class='symbol'>:subject</span> <span class='op'>=&gt;</span> <span class='ivar'>@subject</span><span class='period'>.</span><span class='id identifier rubyid_dup'>dup</span> <span class='comma'>,</span> <span class='symbol'>:san_names</span> <span class='op'>=&gt;</span> <span class='ivar'>@san_names</span><span class='period'>.</span><span class='id identifier rubyid_dup'>dup</span> <span class='rbrace'>}</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_to_pem'>to_pem</span>
+  <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1227,22 +1398,18 @@ class.</p>
 </div>
       <div class="method_details ">
-  <h3 class="signature " id="to_pem-instance_method">
+  <h3 class="signature " id="verify_signature-instance_method">
-    - (<tt>String</tt>) <strong>to_pem</strong>
+    - (<tt>Boolean</tt>) <strong>verify_signature</strong>
-    <span class="aliases">Also known as:
-    <span class="names"><span id='to_s-instance_method'>to_s</span></span>
-    </span>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Converts the SPKI into the PEM format</p>
+<p>Verifies the integrity of the signature on the SPKI</p>
   </div>
@@ -1255,15 +1422,10 @@ class.</p>
     <li>
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>Boolean</tt>)</span>
-        &mdash;
-        <div class='inline'>
-<p>the SPKI converted into PEM format.</p>
-</div>
     </li>
 </ul>
@@ -1274,15 +1436,15 @@ class.</p>
       <pre class="lines">
-39
-40
-41</pre>
+70
+71
+72</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 70</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_to_pem'>to_pem</span>
-    <span class='ivar'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_verify_signature'>verify_signature</span>
+  <span class='ivar'>@spki</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>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1336,15 +1498,15 @@ IO-like object.</p>
       <pre class="lines">
-64
-65
-66</pre>
+102
+103
+104</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 64</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 102</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'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_der'>to_der</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'>@spki</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>
@@ -1398,15 +1560,15 @@ IO-like object.</p>
       <pre class="lines">
-56
-57
-58</pre>
+94
+95
+96</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 56</span>
+      <pre class="code"><span class="info file"># File 'lib/r509/spki.rb', line 94</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'>@spki</span><span class='period'>.</span><span class='id identifier rubyid_to_pem'>to_pem</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'>@spki</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>
@@ -1418,9 +1580,9 @@ IO-like object.</p>
 </div>
     <div id="footer">
-  Generated on Thu Nov  8 14:19:26 2012 by
+  Generated on Tue Apr 16 10:49:56 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.2.1 (ruby-1.9.3).
+  0.8.5 (ruby-1.9.3).
 </div>
   </body>