[] (0) Change how <keygen> is made optional so that support is detect…

…able from script. git-svn-id: http://svn.whatwg.org/webapps@3868 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 16, 2009 · f3eddbc · f3eddbc
1 parent 2e94aa6
commit f3eddbc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/index b/index
@@ -36937,7 +36937,9 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
   attribute is an <a href=#enumerated-attribute>enumerated attribute</a>. The following
   table lists the keywords and states for the attribute &mdash; the
   keywords in the left column map to the states listed in the cell in
-  the second column on the same row as the keyword.</p>
+  the second column on the same row as the keyword. User agents are
+  not required to support these values, and must only recognise values
+  whose corresponding algorithms they support.</p>
 
   <table><thead><tr><th> Keyword <th> State
    <tbody><tr><td> <code title="">rsa</code>
@@ -36948,7 +36950,7 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
      <td> <i title="">EC</i>
 -->
   </table><p>The <i>invalid value default</i> state is the <i title="">unknown</i> state. The <i>missing value default</i> state
-  is the <i title="">RSA</i> state.</p>
+  is the <i title="">RSA</i> state, if it is supported, or the <i title="">unknown</i> state otherwise.</p>
 
   <p class=note>This specification does not specify what key types
   user agents are to support &mdash; it is possible for a user agent
@@ -36974,8 +36976,7 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
     <dl class=switch><!-- v2 (see above)
 
      <dt>If the <code title="attr-keygen-keytype">keytype</code>
-     attribute is in the <i title="">EC</i> state and the user agent
-     supports an EC signature algorithm</dt>
+     attribute is in the <i title="">EC</i> state</dt>
 
      <dd>
 
@@ -36986,8 +36987,7 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
      </dd>
 
      --><dt>If the <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keytype</a></code>
-     attribute is in the <i title="">RSA</i> state, and the user agent
-     supports an RSA signature algorithm</dt>
+     attribute is in the <i title="">RSA</i> state</dt>
 
      <dd>
 
@@ -36999,8 +36999,7 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
 
      </dd>
 
-     <dt>Otherwise, the <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keytype</a></code> attribute is in the <i title="">unknown</i> state, or the user agent does not support
-     the selected key type</dt>
+     <dt>Otherwise, the <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keytype</a></code> attribute is in the <i title="">unknown</i> state</dt>
 
      <dd>
 
@@ -37123,10 +37122,14 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
 
   </dl><div class=impl>
 
-  <p>The <dfn id=dom-keygen-challenge title=dom-keygen-challenge><code>challenge</code></dfn> and <dfn id=dom-keygen-keytype title=dom-keygen-keytype><code>keytype</code></dfn> IDL attributes
-  must <a href=#reflect>reflect</a> the respective content attributes of the
+  <p>The <dfn id=dom-keygen-challenge title=dom-keygen-challenge><code>challenge</code></dfn> IDL
+  attribute must <a href=#reflect>reflect</a> the content attributes of the
   same name.</p>
 
+  <p>The <dfn id=dom-keygen-keytype title=dom-keygen-keytype><code>keytype</code></dfn>
+  IDL attribute must <a href=#reflect>reflect</a> the content attributes of
+  the same name, <a href=#limited-to-only-known-values>limited to only known values</a>.</p>
+
   <p>The <dfn id=dom-keygen-type title=dom-keygen-type><code>type</code></dfn> IDL
   attribute must return the value "<code title="">keygen</code>".</p>
 

diff --git a/source b/source
@@ -41281,7 +41281,9 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   attribute is an <span>enumerated attribute</span>. The following
   table lists the keywords and states for the attribute &mdash; the
   keywords in the left column map to the states listed in the cell in
-  the second column on the same row as the keyword.</p>
+  the second column on the same row as the keyword. User agents are
+  not required to support these values, and must only recognise values
+  whose corresponding algorithms they support.</p>
 
   <table>
    <thead> <tr> <th> Keyword <th> State
@@ -41298,7 +41300,8 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
 
   <p>The <i>invalid value default</i> state is the <i
   title="">unknown</i> state. The <i>missing value default</i> state
-  is the <i title="">RSA</i> state.</p>
+  is the <i title="">RSA</i> state, if it is supported, or the <i
+  title="">unknown</i> state otherwise.</p>
 
   <p class="note">This specification does not specify what key types
   user agents are to support &mdash; it is possible for a user agent
@@ -41328,8 +41331,7 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
      <!-- v2 (see above)
 
      <dt>If the <code title="attr-keygen-keytype">keytype</code>
-     attribute is in the <i title="">EC</i> state and the user agent
-     supports an EC signature algorithm</dt>
+     attribute is in the <i title="">EC</i> state</dt>
 
      <dd>
 
@@ -41342,8 +41344,7 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
      -->
 
      <dt>If the <code title="attr-keygen-keytype">keytype</code>
-     attribute is in the <i title="">RSA</i> state, and the user agent
-     supports an RSA signature algorithm</dt>
+     attribute is in the <i title="">RSA</i> state</dt>
 
      <dd>
 
@@ -41358,8 +41359,7 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
 
      <dt>Otherwise, the <code
      title="attr-keygen-keytype">keytype</code> attribute is in the <i
-     title="">unknown</i> state, or the user agent does not support
-     the selected key type</dt>
+     title="">unknown</i> state</dt>
 
      <dd>
 
@@ -41513,11 +41513,14 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   <div class="impl">
 
   <p>The <dfn
-  title="dom-keygen-challenge"><code>challenge</code></dfn> and <dfn
-  title="dom-keygen-keytype"><code>keytype</code></dfn> IDL attributes
-  must <span>reflect</span> the respective content attributes of the
+  title="dom-keygen-challenge"><code>challenge</code></dfn> IDL
+  attribute must <span>reflect</span> the content attributes of the
   same name.</p>
 
+  <p>The <dfn title="dom-keygen-keytype"><code>keytype</code></dfn>
+  IDL attribute must <span>reflect</span> the content attributes of
+  the same name, <span>limited to only known values</span>.</p>
+
   <p>The <dfn title="dom-keygen-type"><code>type</code></dfn> IDL
   attribute must return the value "<code title="">keygen</code>".</p>