<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160491] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160491">160491</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 10:21:30 -0800 (Thu, 12 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make algorithm.name return registered name, not normalized one
https://bugs.webkit.org/show_bug.cgi?id=125641

Reviewed by Anders Carlsson.

Source/WebCore: 

Currently, WebCrypto editor's draft stipulates that algorithm name is lowercased
as part of normalization.

But it makes little sense to register algorithms as mixed (mostly upper) case, yet
return the name lowercased. Other implementations don't bother respecting this,
and signs are that the spec will change.

I'd like to match other implementations here, because sticking to the spec only
makes us fail 3rd party test suites for no good reason.

Updated many existing tests.

* crypto/CryptoAlgorithmRegistry.cpp:
(WebCore::CryptoAlgorithmRegistry::getIdentifierForName):
(WebCore::CryptoAlgorithmRegistry::registerAlgorithm):
* crypto/CryptoAlgorithmRegistry.h:
* crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
* crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
* crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
* crypto/algorithms/CryptoAlgorithmSHA1.cpp:
* crypto/algorithms/CryptoAlgorithmSHA224.cpp:
* crypto/algorithms/CryptoAlgorithmSHA256.cpp:
* crypto/algorithms/CryptoAlgorithmSHA384.cpp:
* crypto/algorithms/CryptoAlgorithmSHA512.cpp:

LayoutTests: 

* crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt:
* crypto/subtle/aes-cbc-192-encrypt-decrypt.html:
* crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt:
* crypto/subtle/aes-cbc-256-encrypt-decrypt.html:
* crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt:
* crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt:
* crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html:
* crypto/subtle/aes-cbc-encrypt-decrypt.html:
* crypto/subtle/aes-cbc-generate-key-expected.txt:
* crypto/subtle/aes-cbc-generate-key.html:
* crypto/subtle/aes-cbc-import-jwk-expected.txt:
* crypto/subtle/aes-cbc-import-jwk.html:
* crypto/subtle/aes-cbc-invalid-length-expected.txt:
* crypto/subtle/aes-cbc-invalid-length.html:
* crypto/subtle/aes-cbc-unwrap-failure-expected.txt:
* crypto/subtle/aes-cbc-unwrap-failure.html:
* crypto/subtle/aes-cbc-unwrap-rsa-expected.txt:
* crypto/subtle/aes-cbc-unwrap-rsa.html:
* crypto/subtle/aes-cbc-wrap-rsa-expected.txt:
* crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt:
* crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html:
* crypto/subtle/aes-cbc-wrap-rsa.html:
* crypto/subtle/aes-kw-key-manipulation-expected.txt:
* crypto/subtle/aes-kw-key-manipulation.html:
* crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt:
* crypto/subtle/aes-kw-wrap-unwrap-aes.html:
* crypto/subtle/aes-postMessage-expected.txt:
* crypto/subtle/aes-postMessage.html:
* crypto/subtle/hmac-generate-key-expected.txt:
* crypto/subtle/hmac-generate-key.html:
* crypto/subtle/hmac-import-jwk-expected.txt:
* crypto/subtle/hmac-import-jwk.html:
* crypto/subtle/hmac-postMessage-expected.txt:
* crypto/subtle/hmac-postMessage.html:
* crypto/subtle/hmac-sign-verify-empty-key-expected.txt:
* crypto/subtle/hmac-sign-verify-empty-key.html:
* crypto/subtle/hmac-sign-verify-expected.txt:
* crypto/subtle/hmac-sign-verify.html:
* crypto/subtle/postMessage-worker-expected.txt:
* crypto/subtle/postMessage-worker.html:
* crypto/subtle/resources/postMessage-worker.js:
* crypto/subtle/rsa-oaep-key-manipulation-expected.txt:
* crypto/subtle/rsa-oaep-key-manipulation.html:
* crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt:
* crypto/subtle/rsa-oaep-wrap-unwrap-aes.html:
* crypto/subtle/rsa-postMessage-expected.txt:
* crypto/subtle/rsa-postMessage.html:
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt:
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html:
* crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt:
* crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbc192encryptdecryptexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbc192encryptdecrypthtml">trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbc256encryptdecryptexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbc256encryptdecrypthtml">trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcencryptdecryptexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcencryptdecryptwithpaddingexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcencryptdecryptwithpaddinghtml">trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcencryptdecrypthtml">trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcgeneratekeyexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcgeneratekeyhtml">trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcimportjwkexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcimportjwkhtml">trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcinvalidlengthexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcinvalidlengthhtml">trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcunwrapfailureexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcunwrapfailurehtml">trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcunwraprsaexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcunwraprsahtml">trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcwraprsaexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcwraprsanonextractableexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcwraprsanonextractablehtml">trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaescbcwraprsahtml">trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaeskwkeymanipulationexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaeskwkeymanipulationhtml">trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaeskwwrapunwrapaesexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaeskwwrapunwrapaeshtml">trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaespostMessageexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-postMessage-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaespostMessagehtml">trunk/LayoutTests/crypto/subtle/aes-postMessage.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacgeneratekeyexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-generate-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacgeneratekeyhtml">trunk/LayoutTests/crypto/subtle/hmac-generate-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacimportjwkexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-import-jwk-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacimportjwkhtml">trunk/LayoutTests/crypto/subtle/hmac-import-jwk.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacpostMessageexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-postMessage-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacpostMessagehtml">trunk/LayoutTests/crypto/subtle/hmac-postMessage.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacsignverifyemptykeyexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacsignverifyemptykeyhtml">trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacsignverifyexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-sign-verify-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacsignverifyhtml">trunk/LayoutTests/crypto/subtle/hmac-sign-verify.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlepostMessageworkerexpectedtxt">trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlepostMessageworkerhtml">trunk/LayoutTests/crypto/subtle/postMessage-worker.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleresourcespostMessageworkerjs">trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepkeymanipulationexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepkeymanipulationhtml">trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepwrapunwrapaesexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepwrapunwrapaeshtml">trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersapostMessageexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-postMessage-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersapostMessagehtml">trunk/LayoutTests/crypto/subtle/rsa-postMessage.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersassapkcs1v1_5generatekeyexpectedtxt">trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersassapkcs1v1_5generatekeyhtml">trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersassapkcs1v1_5importjwkexpectedtxt">trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersassapkcs1v1_5importjwkhtml">trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistryh">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_CBCcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSASSA_PKCS1_v1_5cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSA_OAEPcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA1cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA224cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA256cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA384cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA512cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/ChangeLog        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2013-12-12  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        Make algorithm.name return registered name, not normalized one
+        https://bugs.webkit.org/show_bug.cgi?id=125641
+
+        Reviewed by Anders Carlsson.
+
+        * crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt:
+        * crypto/subtle/aes-cbc-192-encrypt-decrypt.html:
+        * crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt:
+        * crypto/subtle/aes-cbc-256-encrypt-decrypt.html:
+        * crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt:
+        * crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt:
+        * crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html:
+        * crypto/subtle/aes-cbc-encrypt-decrypt.html:
+        * crypto/subtle/aes-cbc-generate-key-expected.txt:
+        * crypto/subtle/aes-cbc-generate-key.html:
+        * crypto/subtle/aes-cbc-import-jwk-expected.txt:
+        * crypto/subtle/aes-cbc-import-jwk.html:
+        * crypto/subtle/aes-cbc-invalid-length-expected.txt:
+        * crypto/subtle/aes-cbc-invalid-length.html:
+        * crypto/subtle/aes-cbc-unwrap-failure-expected.txt:
+        * crypto/subtle/aes-cbc-unwrap-failure.html:
+        * crypto/subtle/aes-cbc-unwrap-rsa-expected.txt:
+        * crypto/subtle/aes-cbc-unwrap-rsa.html:
+        * crypto/subtle/aes-cbc-wrap-rsa-expected.txt:
+        * crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt:
+        * crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html:
+        * crypto/subtle/aes-cbc-wrap-rsa.html:
+        * crypto/subtle/aes-kw-key-manipulation-expected.txt:
+        * crypto/subtle/aes-kw-key-manipulation.html:
+        * crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt:
+        * crypto/subtle/aes-kw-wrap-unwrap-aes.html:
+        * crypto/subtle/aes-postMessage-expected.txt:
+        * crypto/subtle/aes-postMessage.html:
+        * crypto/subtle/hmac-generate-key-expected.txt:
+        * crypto/subtle/hmac-generate-key.html:
+        * crypto/subtle/hmac-import-jwk-expected.txt:
+        * crypto/subtle/hmac-import-jwk.html:
+        * crypto/subtle/hmac-postMessage-expected.txt:
+        * crypto/subtle/hmac-postMessage.html:
+        * crypto/subtle/hmac-sign-verify-empty-key-expected.txt:
+        * crypto/subtle/hmac-sign-verify-empty-key.html:
+        * crypto/subtle/hmac-sign-verify-expected.txt:
+        * crypto/subtle/hmac-sign-verify.html:
+        * crypto/subtle/postMessage-worker-expected.txt:
+        * crypto/subtle/postMessage-worker.html:
+        * crypto/subtle/resources/postMessage-worker.js:
+        * crypto/subtle/rsa-oaep-key-manipulation-expected.txt:
+        * crypto/subtle/rsa-oaep-key-manipulation.html:
+        * crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt:
+        * crypto/subtle/rsa-oaep-wrap-unwrap-aes.html:
+        * crypto/subtle/rsa-postMessage-expected.txt:
+        * crypto/subtle/rsa-postMessage.html:
+        * crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt:
+        * crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html:
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt:
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html:
+
</ins><span class="cx"> 2013-12-12  Michał Pakuła vel Rutka  &lt;m.pakula@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbc192encryptdecryptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Importing a raw AES key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 192
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Using the key to encrypt plaintext...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbc192encryptdecrypthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-192-encrypt-decrypt.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;192&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbc256encryptdecryptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Importing a raw AES key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 256
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Using the key to encrypt plaintext...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbc256encryptdecrypthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-256-encrypt-decrypt.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;256&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcencryptdecryptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Importing a raw AES key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 128
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Using the key to encrypt plaintext...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcencryptdecryptwithpaddingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Importing a raw AES key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 128
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Using the key to encrypt plaintext...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcencryptdecryptwithpaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt-with-padding.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcencryptdecrypthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-encrypt-decrypt.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcgeneratekeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> Generating a key...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 128
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcgeneratekeyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-generate-key.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcimportjwkexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> 
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is false
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 192
</span><span class="cx"> PASS key.usages is [&quot;encrypt&quot;]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcimportjwkhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-import-jwk.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;false&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;192&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;encrypt&quot;]');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcinvalidlengthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Importing a raw AES key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 176
</span><span class="cx"> PASS key.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Using the key to encrypt plaintext...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcinvalidlengthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-invalid-length.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;176&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcunwrapfailureexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Importing an unwrapping key...
</span><del>-PASS unwrappingKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappingKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> Unwrapping a key...
</span><span class="cx"> PASS Promise rejected
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcunwrapfailurehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-failure.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> debug(&quot;Importing an unwrapping key...&quot;);
</span><span class="cx"> crypto.subtle.importKey(&quot;raw&quot;, unwrappingKeyOctets, &quot;AES-CBC&quot;, nonExtractable, [&quot;unwrapKey&quot;]).then(function(result) {
</span><span class="cx">     unwrappingKey = result;
</span><del>-    shouldBe(&quot;unwrappingKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappingKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     var unwrapAlgorithm = {name: &quot;AES-CBC&quot;, iv: hexStringToUint8Array(&quot;000102030405060708090a0b0c0d0e0f&quot;)};
</span><span class="cx">     debug(&quot;Unwrapping a key...&quot;);
</span><span class="cx">     return crypto.subtle.unwrapKey(&quot;jwk&quot;, wrappedKey, unwrappingKey, unwrapAlgorithm, null, extractable, [&quot;sign&quot;, &quot;verify&quot;, &quot;encrypt&quot;, &quot;decrypt&quot;, &quot;wrap&quot;, &quot;unwrap&quot;]);
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcunwraprsaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Importing an unwrapping key...
</span><del>-PASS unwrappingKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappingKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> Unwrapping a key...
</span><span class="cx"> PASS unwrappedKey.toString() is '[object Key]'
</span><span class="cx"> PASS unwrappedKey.type is 'public'
</span><span class="cx"> PASS unwrappedKey.usages is ['sign','verify']
</span><del>-PASS unwrappedKey.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS unwrappedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS unwrappedKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS Base64URL.stringify(unwrappedKey.algorithm.publicExponent) is publicKeyJSON.e
</span><del>-PASS unwrappedKey.algorithm.hash.name is 'sha-256'
</del><ins>+PASS unwrappedKey.algorithm.hash.name is 'SHA-256'
</ins><span class="cx"> PASS unwrappedKey.extractable is false
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcunwraprsahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> debug(&quot;Importing an unwrapping key...&quot;);
</span><span class="cx"> crypto.subtle.importKey(&quot;raw&quot;, unwrappingKeyOctets, &quot;AES-CBC&quot;, nonExtractable, [&quot;unwrapKey&quot;]).then(function(result) {
</span><span class="cx">     unwrappingKey = result;
</span><del>-    shouldBe(&quot;unwrappingKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappingKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     var unwrapAlgorithm = {name: &quot;AES-CBC&quot;, iv: hexStringToUint8Array(&quot;000102030405060708090a0b0c0d0e0f&quot;)};
</span><span class="cx">     debug(&quot;Unwrapping a key...&quot;);
</span><span class="cx">     return crypto.subtle.unwrapKey(&quot;jwk&quot;, wrappedKey, unwrappingKey, unwrapAlgorithm, null, extractable, [&quot;sign&quot;, &quot;verify&quot;, &quot;encrypt&quot;, &quot;decrypt&quot;, &quot;wrap&quot;, &quot;unwrap&quot;]);
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">     shouldBe(&quot;unwrappedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.type&quot;, &quot;'public'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.usages&quot;, &quot;['sign','verify']&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;Base64URL.stringify(unwrappedKey.algorithm.publicExponent)&quot;, &quot;publicKeyJSON.e&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.hash.name&quot;, &quot;'sha-256'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.hash.name&quot;, &quot;'SHA-256'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.extractable&quot;, &quot;false&quot;);
</span><span class="cx">     finishJSTest();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcwraprsaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Importing a key to wrap...
</span><del>-PASS key.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS key.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> Importing a key encryption key...
</span><del>-PASS wrappingKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS wrappingKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS wrappedKey.toString() is '[object ArrayBuffer]'
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcwraprsanonextractableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Importing a key to wrap...
</span><del>-PASS key.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS key.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> Importing a key encryption key...
</span><del>-PASS wrappingKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS wrappingKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> wrapping the key...
</span><span class="cx"> PASS Rejected
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcwraprsanonextractablehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa-non-extractable.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> debug(&quot;Importing a key to wrap...&quot;);
</span><span class="cx"> crypto.subtle.importKey(&quot;jwk&quot;, jwkKeyAsArrayBuffer, null, extractable, [&quot;sign&quot;, &quot;verify&quot;]).then(function(result) {
</span><span class="cx">     key = result;
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     debug(&quot;Importing a key encryption key...&quot;);
</span><span class="cx">     return crypto.subtle.importKey(&quot;raw&quot;, wrappingKeyOctets, &quot;AES-CBC&quot;, nonExtractable, [&quot;wrapKey&quot;]);
</span><span class="cx"> }).then(function(result) {
</span><span class="cx">     wrappingKey = result;
</span><del>-    shouldBe(&quot;wrappingKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;wrappingKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     var wrapAlgorithm = {name: &quot;AES-CBC&quot;, iv: hexStringToUint8Array(&quot;000102030405060708090a0b0c0d0e0f&quot;)};
</span><span class="cx">     debug(&quot;wrapping the key...&quot;);
</span><span class="cx">     return crypto.subtle.wrapKey(&quot;jwk&quot;, key, wrappingKey, wrapAlgorithm);
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaescbcwraprsahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-cbc-wrap-rsa.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> debug(&quot;Importing a key to wrap...&quot;);
</span><span class="cx"> crypto.subtle.importKey(&quot;jwk&quot;, jwkKeyAsArrayBuffer, null, extractable, [&quot;sign&quot;, &quot;verify&quot;]).then(function(result) {
</span><span class="cx">     key = result;
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     debug(&quot;Importing a key encryption key...&quot;);
</span><span class="cx">     return crypto.subtle.importKey(&quot;raw&quot;, wrappingKeyOctets, &quot;AES-CBC&quot;, nonExtractable, [&quot;wrapKey&quot;]);
</span><span class="cx"> }).then(function(result) {
</span><span class="cx">     wrappingKey = result;
</span><del>-    shouldBe(&quot;wrappingKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;wrappingKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     var wrapAlgorithm = {name: &quot;AES-CBC&quot;, iv: hexStringToUint8Array(&quot;000102030405060708090a0b0c0d0e0f&quot;)};
</span><span class="cx">     return crypto.subtle.wrapKey(&quot;jwk&quot;, key, wrappingKey, wrapAlgorithm);
</span><span class="cx"> }).then(function(result) {
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaeskwkeymanipulationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Generating a key...
</span><span class="cx"> PASS key.toString() is '[object Key]'
</span><span class="cx"> PASS key.type is 'secret'
</span><del>-PASS key.algorithm.name is 'aes-kw'
</del><ins>+PASS key.algorithm.name is 'AES-KW'
</ins><span class="cx"> PASS key.algorithm.length is 256
</span><span class="cx"> 
</span><span class="cx"> Testing that the key can't be used with AES-CBC...
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> Importing it back...
</span><span class="cx"> PASS importedKey.toString() is '[object Key]'
</span><span class="cx"> PASS importedKey.type is 'secret'
</span><del>-PASS importedKey.algorithm.name is 'aes-kw'
</del><ins>+PASS importedKey.algorithm.name is 'AES-KW'
</ins><span class="cx"> PASS importedKey.algorithm.length is 256
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaeskwkeymanipulationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-kw'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-KW'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;256&quot;);
</span><span class="cx"> 
</span><span class="cx">     debug(&quot;\nTesting that the key can't be used with AES-CBC...&quot;);
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;importedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;importedKey.type&quot;, &quot;'secret'&quot;);
</span><del>-    shouldBe(&quot;importedKey.algorithm.name&quot;, &quot;'aes-kw'&quot;);
</del><ins>+    shouldBe(&quot;importedKey.algorithm.name&quot;, &quot;'AES-KW'&quot;);
</ins><span class="cx">     shouldBe(&quot;importedKey.algorithm.length&quot;, &quot;256&quot;);
</span><span class="cx"> 
</span><span class="cx">     finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaeskwwrapunwrapaesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> PASS unwrappedKey.toString() is '[object Key]'
</span><span class="cx"> PASS unwrappedKey.type is 'secret'
</span><span class="cx"> PASS unwrappedKey.extractable is true
</span><del>-PASS unwrappedKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappedKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS unwrappedKey.algorithm.length is 128
</span><span class="cx"> PASS unwrappedKey.usages is ['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']
</span><span class="cx"> Exporting it...
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> PASS unwrappedKey.toString() is '[object Key]'
</span><span class="cx"> PASS unwrappedKey.type is 'secret'
</span><span class="cx"> PASS unwrappedKey.extractable is true
</span><del>-PASS unwrappedKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappedKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS unwrappedKey.algorithm.length is 128
</span><span class="cx"> PASS unwrappedKey.usages is ['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']
</span><span class="cx"> Exporting it...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaeskwwrapunwrapaeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">     shouldBe(&quot;unwrappedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.usages&quot;, &quot;['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']&quot;);
</span><span class="cx"> 
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">     shouldBe(&quot;unwrappedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.usages&quot;, &quot;['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaespostMessageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-postMessage-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-postMessage-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-postMessage-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'aes-cbc'
</del><ins>+PASS key.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS key.algorithm.length is 128
</span><span class="cx"> PASS key.usages is [&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaespostMessagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-postMessage.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-postMessage.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/aes-postMessage.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">     key = evt.data;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;128&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacgeneratekeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-generate-key-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-generate-key-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-generate-key-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -11,14 +11,14 @@
</span><span class="cx"> Generating a key with default length...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 64
</span><span class="cx"> PASS key.usages is [&quot;sign&quot;, &quot;verify&quot;]
</span><span class="cx"> 
</span><span class="cx"> Generating a key with custom length...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 5
</span><span class="cx"> PASS key.usages is [&quot;sign&quot;]
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacgeneratekeyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-generate-key.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-generate-key.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-generate-key.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;64&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;sign&quot;, &quot;verify&quot;]');
</span><span class="cx"> 
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;5&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;sign&quot;]');
</span><span class="cx">     finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacimportjwkexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-import-jwk-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-import-jwk-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-import-jwk-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> 
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is false
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 32
</span><span class="cx"> PASS key.usages is [&quot;sign&quot;, &quot;verify&quot;]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacimportjwkhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-import-jwk.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-import-jwk.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-import-jwk.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;false&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;32&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;sign&quot;, &quot;verify&quot;]');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacpostMessageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-postMessage-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-postMessage-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-postMessage-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 16
</span><span class="cx"> PASS key.usages is [&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacpostMessagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-postMessage.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-postMessage.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-postMessage.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">     key = evt.data;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;16&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacsignverifyemptykeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> Importing a raw HMAC key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 0
</span><del>-PASS key.algorithm.hash.name is 'sha-1'
</del><ins>+PASS key.algorithm.hash.name is 'SHA-1'
</ins><span class="cx"> PASS key.usages is ['sign', 'verify']
</span><span class="cx"> Using the key to sign 'foo'...
</span><span class="cx"> PASS bytesToHexString(new Uint8Array(signature)) is 'a3cc770fc033e2cb419d42b64e0081a3bd3be30e'
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacsignverifyemptykeyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-sign-verify-empty-key.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;0&quot;); // See &lt;https://www.w3.org/Bugs/Public/show_bug.cgi?id=23098&gt;.
</span><del>-    shouldBe(&quot;key.algorithm.hash.name&quot;, &quot;'sha-1'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.hash.name&quot;, &quot;'SHA-1'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['sign', 'verify']&quot;);
</span><span class="cx"> 
</span><span class="cx">     debug(&quot;Using the key to sign 'foo'...&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacsignverifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-sign-verify-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-sign-verify-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-sign-verify-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> Importing a raw HMAC key from string literal...
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 1
</span><del>-PASS key.algorithm.hash.name is 'sha-1'
</del><ins>+PASS key.algorithm.hash.name is 'SHA-1'
</ins><span class="cx"> PASS key.usages is ['sign', 'verify']
</span><span class="cx"> Using the key to sign 'foo'...
</span><span class="cx"> PASS bytesToHexString(new Uint8Array(signature)) is 'bebbc02e46b0f81183f40c25dce23e5045d65519'
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacsignverifyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-sign-verify.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-sign-verify.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/hmac-sign-verify.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx">     key = result;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.length&quot;, &quot;1&quot;); // See &lt;https://www.w3.org/Bugs/Public/show_bug.cgi?id=23098&gt;.
</span><del>-    shouldBe(&quot;key.algorithm.hash.name&quot;, &quot;'sha-1'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.hash.name&quot;, &quot;'SHA-1'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.usages&quot;, &quot;['sign', 'verify']&quot;);
</span><span class="cx"> 
</span><span class="cx">     debug(&quot;Using the key to sign 'foo'...&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlepostMessageworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/postMessage-worker-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PASS All checks passed in worker
</span><span class="cx"> PASS key.type is 'secret'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'hmac'
</del><ins>+PASS key.algorithm.name is 'HMAC'
</ins><span class="cx"> PASS key.algorithm.length is 16
</span><span class="cx"> PASS key.usages is [&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlepostMessageworkerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/postMessage-worker.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/postMessage-worker.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/postMessage-worker.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">             key = evt.data.key;
</span><span class="cx">             shouldBe(&quot;key.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">             shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-            shouldBe(&quot;key.algorithm.name&quot;, &quot;'hmac'&quot;);
</del><ins>+            shouldBe(&quot;key.algorithm.name&quot;, &quot;'HMAC'&quot;);
</ins><span class="cx">             shouldBe(&quot;key.algorithm.length&quot;, &quot;16&quot;);
</span><span class="cx">             shouldBe(&quot;key.usages&quot;, '[&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]');
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleresourcespostMessageworkerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/resources/postMessage-worker.js        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx">         postMessage({ result:false, message:'key.type should be &quot;secret&quot;' });
</span><span class="cx">     else if (!key.extractable)
</span><span class="cx">         postMessage({ result:false, message:'key.extractable should be true' });
</span><del>-    else if (key.algorithm.name != &quot;hmac&quot;)
-        postMessage({ result:false, message:'key.algorithm.name should be &quot;hmac&quot;' });
</del><ins>+    else if (key.algorithm.name != &quot;HMAC&quot;)
+        postMessage({ result:false, message:'key.algorithm.name should be &quot;HMAC&quot;' });
</ins><span class="cx">     else if (key.usages.toString() != &quot;encrypt,decrypt,sign,verify&quot;)
</span><span class="cx">         postMessage({ result:false, message:'key.usages should be [&quot;encrypt&quot;, &quot;decrypt&quot;, &quot;sign&quot;, &quot;verify&quot;]' });
</span><span class="cx">     else
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepkeymanipulationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,12 +6,12 @@
</span><span class="cx"> Generating a key pair...
</span><span class="cx"> PASS keyPair.toString() is '[object KeyPair]'
</span><span class="cx"> PASS keyPair.publicKey.type is 'public'
</span><del>-PASS keyPair.publicKey.algorithm.name is 'rsa-oaep'
</del><ins>+PASS keyPair.publicKey.algorithm.name is 'RSA-OAEP'
</ins><span class="cx"> PASS keyPair.publicKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(keyPair.publicKey.algorithm.publicExponent) is '010001'
</span><span class="cx"> PASS keyPair.publicKey.algorithm.hash is undefined.
</span><span class="cx"> PASS keyPair.privateKey.type is 'private'
</span><del>-PASS keyPair.privateKey.algorithm.name is 'rsa-oaep'
</del><ins>+PASS keyPair.privateKey.algorithm.name is 'RSA-OAEP'
</ins><span class="cx"> PASS keyPair.privateKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(keyPair.privateKey.algorithm.publicExponent) is '010001'
</span><span class="cx"> PASS keyPair.privateKey.algorithm.hash is undefined.
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> 
</span><span class="cx"> Importing it back...
</span><span class="cx"> PASS exportedPublicKey.type is 'public'
</span><del>-PASS exportedPublicKey.algorithm.name is 'rsa-oaep'
</del><ins>+PASS exportedPublicKey.algorithm.name is 'RSA-OAEP'
</ins><span class="cx"> PASS exportedPublicKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(exportedPublicKey.algorithm.publicExponent) is '010001'
</span><del>-PASS exportedPublicKey.algorithm.hash.name is 'sha-1'
</del><ins>+PASS exportedPublicKey.algorithm.hash.name is 'SHA-1'
</ins><span class="cx"> PASS exportedPublicKey.extractable is true
</span><span class="cx"> PASS exportedPublicKey.usages is ['encrypt','decrypt','wrapKey','unwrapKey']
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepkeymanipulationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx">     keyPair = result;
</span><span class="cx">     shouldBe(&quot;keyPair.toString()&quot;, &quot;'[object KeyPair]'&quot;);
</span><span class="cx">     shouldBe(&quot;keyPair.publicKey.type&quot;, &quot;'public'&quot;);
</span><del>-    shouldBe(&quot;keyPair.publicKey.algorithm.name&quot;, &quot;'rsa-oaep'&quot;);
</del><ins>+    shouldBe(&quot;keyPair.publicKey.algorithm.name&quot;, &quot;'RSA-OAEP'&quot;);
</ins><span class="cx">     shouldBe(&quot;keyPair.publicKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(keyPair.publicKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><span class="cx">     shouldBeUndefined(&quot;keyPair.publicKey.algorithm.hash&quot;);
</span><span class="cx">     shouldBe(&quot;keyPair.privateKey.type&quot;, &quot;'private'&quot;);
</span><del>-    shouldBe(&quot;keyPair.privateKey.algorithm.name&quot;, &quot;'rsa-oaep'&quot;);
</del><ins>+    shouldBe(&quot;keyPair.privateKey.algorithm.name&quot;, &quot;'RSA-OAEP'&quot;);
</ins><span class="cx">     shouldBe(&quot;keyPair.privateKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(keyPair.privateKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><span class="cx">     shouldBeUndefined(&quot;keyPair.privateKey.algorithm.hash&quot;);
</span><span class="lines">@@ -65,10 +65,10 @@
</span><span class="cx"> }).then(function(result) {
</span><span class="cx">     exportedPublicKey = result;
</span><span class="cx">     shouldBe(&quot;exportedPublicKey.type&quot;, &quot;'public'&quot;);
</span><del>-    shouldBe(&quot;exportedPublicKey.algorithm.name&quot;, &quot;'rsa-oaep'&quot;);
</del><ins>+    shouldBe(&quot;exportedPublicKey.algorithm.name&quot;, &quot;'RSA-OAEP'&quot;);
</ins><span class="cx">     shouldBe(&quot;exportedPublicKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(exportedPublicKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><del>-    shouldBe(&quot;exportedPublicKey.algorithm.hash.name&quot;, &quot;'sha-1'&quot;);
</del><ins>+    shouldBe(&quot;exportedPublicKey.algorithm.hash.name&quot;, &quot;'SHA-1'&quot;);
</ins><span class="cx">     shouldBe(&quot;exportedPublicKey.extractable&quot;, &quot;true&quot;);
</span><span class="cx">     shouldBe(&quot;exportedPublicKey.usages&quot;, &quot;['encrypt','decrypt','wrapKey','unwrapKey']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepwrapunwrapaesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> PASS unwrappedKey.toString() is '[object Key]'
</span><span class="cx"> PASS unwrappedKey.type is 'secret'
</span><span class="cx"> PASS unwrappedKey.extractable is true
</span><del>-PASS unwrappedKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappedKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS unwrappedKey.algorithm.length is 256
</span><span class="cx"> PASS unwrappedKey.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Exporting it...
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> PASS unwrappedKey.toString() is '[object Key]'
</span><span class="cx"> PASS unwrappedKey.type is 'secret'
</span><span class="cx"> PASS unwrappedKey.extractable is true
</span><del>-PASS unwrappedKey.algorithm.name is 'aes-cbc'
</del><ins>+PASS unwrappedKey.algorithm.name is 'AES-CBC'
</ins><span class="cx"> PASS unwrappedKey.algorithm.length is 256
</span><span class="cx"> PASS unwrappedKey.usages is ['encrypt', 'decrypt']
</span><span class="cx"> Exporting it...
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepwrapunwrapaeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">     shouldBe(&quot;unwrappedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.algorithm.length&quot;, &quot;256&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">     shouldBe(&quot;unwrappedKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.type&quot;, &quot;'secret'&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'aes-cbc'&quot;);
</del><ins>+    shouldBe(&quot;unwrappedKey.algorithm.name&quot;, &quot;'AES-CBC'&quot;);
</ins><span class="cx">     shouldBe(&quot;unwrappedKey.algorithm.length&quot;, &quot;256&quot;);
</span><span class="cx">     shouldBe(&quot;unwrappedKey.usages&quot;, &quot;['encrypt', 'decrypt']&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersapostMessageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-postMessage-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-postMessage-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-postMessage-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> Key received in a message:
</span><span class="cx"> PASS key.type is 'private'
</span><span class="cx"> PASS key.extractable is true
</span><del>-PASS key.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS key.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS key.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(key.algorithm.publicExponent) is '010001'
</span><span class="cx"> PASS key.usages is [&quot;sign&quot;, &quot;verify&quot;]
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersapostMessagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-postMessage.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-postMessage.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsa-postMessage.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">     key = evt.data;
</span><span class="cx">     shouldBe(&quot;key.type&quot;, &quot;'private'&quot;);
</span><span class="cx">     shouldBe(&quot;key.extractable&quot;, &quot;true&quot;);
</span><del>-    shouldBe(&quot;key.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;key.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;key.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(key.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><span class="cx">     shouldBe(&quot;key.usages&quot;, '[&quot;sign&quot;, &quot;verify&quot;]');
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersassapkcs1v1_5generatekeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -6,12 +6,12 @@
</span><span class="cx"> Generating a key pair...
</span><span class="cx"> PASS keyPair.toString() is '[object KeyPair]'
</span><span class="cx"> PASS keyPair.publicKey.type is 'public'
</span><del>-PASS keyPair.publicKey.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS keyPair.publicKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS keyPair.publicKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(keyPair.publicKey.algorithm.publicExponent) is '010001'
</span><span class="cx"> PASS keyPair.publicKey.algorithm.hash is undefined.
</span><span class="cx"> PASS keyPair.privateKey.type is 'private'
</span><del>-PASS keyPair.privateKey.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS keyPair.privateKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS keyPair.privateKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(keyPair.privateKey.algorithm.publicExponent) is '010001'
</span><span class="cx"> PASS keyPair.privateKey.algorithm.hash is undefined.
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersassapkcs1v1_5generatekeyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx">     keyPair = result;
</span><span class="cx">     shouldBe(&quot;keyPair.toString()&quot;, &quot;'[object KeyPair]'&quot;);
</span><span class="cx">     shouldBe(&quot;keyPair.publicKey.type&quot;, &quot;'public'&quot;);
</span><del>-    shouldBe(&quot;keyPair.publicKey.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;keyPair.publicKey.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;keyPair.publicKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(keyPair.publicKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><span class="cx">     shouldBeUndefined(&quot;keyPair.publicKey.algorithm.hash&quot;);
</span><span class="cx">     shouldBe(&quot;keyPair.privateKey.type&quot;, &quot;'private'&quot;);
</span><del>-    shouldBe(&quot;keyPair.privateKey.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;keyPair.privateKey.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;keyPair.privateKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(keyPair.privateKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><span class="cx">     shouldBeUndefined(&quot;keyPair.privateKey.algorithm.hash&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersassapkcs1v1_5importjwkexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -7,19 +7,19 @@
</span><span class="cx"> PASS publicKey.toString() is '[object Key]'
</span><span class="cx"> PASS publicKey.type is 'public'
</span><span class="cx"> PASS publicKey.usages is ['sign','verify']
</span><del>-PASS publicKey.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS publicKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS publicKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(publicKey.algorithm.publicExponent) is '010001'
</span><del>-PASS publicKey.algorithm.hash.name is 'sha-256'
</del><ins>+PASS publicKey.algorithm.hash.name is 'SHA-256'
</ins><span class="cx"> 
</span><span class="cx"> Importing a private key...
</span><span class="cx"> PASS privateKey.toString() is '[object Key]'
</span><span class="cx"> PASS privateKey.type is 'private'
</span><span class="cx"> PASS privateKey.usages is ['sign','verify']
</span><del>-PASS privateKey.algorithm.name is 'rsassa-pkcs1-v1_5'
</del><ins>+PASS privateKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
</ins><span class="cx"> PASS privateKey.algorithm.modulusLength is 2048
</span><span class="cx"> PASS bytesToHexString(privateKey.algorithm.publicExponent) is '010001'
</span><del>-PASS privateKey.algorithm.hash.name is 'sha-256'
</del><ins>+PASS privateKey.algorithm.hash.name is 'SHA-256'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersassapkcs1v1_5importjwkhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">     shouldBe(&quot;publicKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;publicKey.type&quot;, &quot;'public'&quot;);
</span><span class="cx">     shouldBe(&quot;publicKey.usages&quot;, &quot;['sign','verify']&quot;);
</span><del>-    shouldBe(&quot;publicKey.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;publicKey.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;publicKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(publicKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><del>-    shouldBe(&quot;publicKey.algorithm.hash.name&quot;, &quot;'sha-256'&quot;);
</del><ins>+    shouldBe(&quot;publicKey.algorithm.hash.name&quot;, &quot;'SHA-256'&quot;);
</ins><span class="cx">     debug(&quot;\nImporting a private key...&quot;);
</span><span class="cx">     return crypto.subtle.importKey(&quot;jwk&quot;, asciiToUint8Array(JSON.stringify(privateKeyJSON)), null, extractable, [&quot;sign&quot;, &quot;verify&quot;]);
</span><span class="cx"> }).then(function(result) {
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx">     shouldBe(&quot;privateKey.toString()&quot;, &quot;'[object Key]'&quot;);
</span><span class="cx">     shouldBe(&quot;privateKey.type&quot;, &quot;'private'&quot;);
</span><span class="cx">     shouldBe(&quot;privateKey.usages&quot;, &quot;['sign','verify']&quot;);
</span><del>-    shouldBe(&quot;privateKey.algorithm.name&quot;, &quot;'rsassa-pkcs1-v1_5'&quot;);
</del><ins>+    shouldBe(&quot;privateKey.algorithm.name&quot;, &quot;'RSASSA-PKCS1-v1_5'&quot;);
</ins><span class="cx">     shouldBe(&quot;privateKey.algorithm.modulusLength&quot;, &quot;2048&quot;);
</span><span class="cx">     shouldBe(&quot;bytesToHexString(privateKey.algorithm.publicExponent)&quot;, &quot;'010001'&quot;);
</span><del>-    shouldBe(&quot;privateKey.algorithm.hash.name&quot;, &quot;'sha-256'&quot;);
</del><ins>+    shouldBe(&quot;privateKey.algorithm.hash.name&quot;, &quot;'SHA-256'&quot;);
</ins><span class="cx">     finishJSTest();
</span><span class="cx"> });
</span><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/ChangeLog        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2013-12-12  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        Make algorithm.name return registered name, not normalized one
+        https://bugs.webkit.org/show_bug.cgi?id=125641
+
+        Reviewed by Anders Carlsson.
+
+        Currently, WebCrypto editor's draft stipulates that algorithm name is lowercased
+        as part of normalization.
+
+        But it makes little sense to register algorithms as mixed (mostly upper) case, yet
+        return the name lowercased. Other implementations don't bother respecting this,
+        and signs are that the spec will change.
+
+        I'd like to match other implementations here, because sticking to the spec only
+        makes us fail 3rd party test suites for no good reason.
+
+        Updated many existing tests.
+
+        * crypto/CryptoAlgorithmRegistry.cpp:
+        (WebCore::CryptoAlgorithmRegistry::getIdentifierForName):
+        (WebCore::CryptoAlgorithmRegistry::registerAlgorithm):
+        * crypto/CryptoAlgorithmRegistry.h:
+        * crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
+        * crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
+        * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
+        * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
+        * crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA1.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA224.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA256.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA384.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA512.cpp:
+
</ins><span class="cx"> 2013-12-12  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Move CertificateInfo to WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> 
</span><span class="cx">     MutexLocker lock(registryMutex());
</span><span class="cx"> 
</span><del>-    auto iter = m_nameToIdentifierMap.find(name.isolatedCopy().lower());
</del><ins>+    auto iter = m_nameToIdentifierMap.find(name.isolatedCopy());
</ins><span class="cx">     if (iter == m_nameToIdentifierMap.end())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> 
</span><span class="cx"> void CryptoAlgorithmRegistry::registerAlgorithm(const String&amp; name, CryptoAlgorithmIdentifier identifier, CryptoAlgorithmConstructor constructor)
</span><span class="cx"> {
</span><del>-    ASSERT(name == name.lower());
-
</del><span class="cx">     MutexLocker lock(registryMutex());
</span><span class="cx"> 
</span><span class="cx">     bool added = m_nameToIdentifierMap.add(name, identifier).isNewEntry;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void registerAlgorithm(const String&amp; name, CryptoAlgorithmIdentifier, CryptoAlgorithmConstructor);
</span><del>-    HashMap&lt;String, CryptoAlgorithmIdentifier&gt; m_nameToIdentifierMap;
</del><ins>+    HashMap&lt;String, CryptoAlgorithmIdentifier, CaseFoldingHash&gt; m_nameToIdentifierMap;
</ins><span class="cx">     HashMap&lt;unsigned, String&gt; m_identifierToNameMap;
</span><span class="cx">     HashMap&lt;unsigned, CryptoAlgorithmConstructor&gt; m_identifierToConstructorMap;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_CBCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmAES_CBC::s_name = &quot;aes-cbc&quot;;
</del><ins>+const char* const CryptoAlgorithmAES_CBC::s_name = &quot;AES-CBC&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmAES_CBC::CryptoAlgorithmAES_CBC()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmAES_KW::s_name = &quot;aes-kw&quot;;
</del><ins>+const char* const CryptoAlgorithmAES_KW::s_name = &quot;AES-KW&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmAES_KW::CryptoAlgorithmAES_KW()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmHMAC::s_name = &quot;hmac&quot;;
</del><ins>+const char* const CryptoAlgorithmHMAC::s_name = &quot;HMAC&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmHMAC::CryptoAlgorithmHMAC()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSASSA_PKCS1_v1_5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmRSASSA_PKCS1_v1_5::s_name = &quot;rsassa-pkcs1-v1_5&quot;;
</del><ins>+const char* const CryptoAlgorithmRSASSA_PKCS1_v1_5::s_name = &quot;RSASSA-PKCS1-v1_5&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmRSASSA_PKCS1_v1_5::CryptoAlgorithmRSASSA_PKCS1_v1_5()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSA_OAEPcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmRSA_OAEP::s_name = &quot;rsa-oaep&quot;;
</del><ins>+const char* const CryptoAlgorithmRSA_OAEP::s_name = &quot;RSA-OAEP&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmRSA_OAEP::CryptoAlgorithmRSA_OAEP()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA1cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmSHA1::s_name = &quot;sha-1&quot;;
</del><ins>+const char* const CryptoAlgorithmSHA1::s_name = &quot;SHA-1&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmSHA1::CryptoAlgorithmSHA1()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA224cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmSHA224::s_name = &quot;sha-224&quot;;
</del><ins>+const char* const CryptoAlgorithmSHA224::s_name = &quot;SHA-224&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmSHA224::CryptoAlgorithmSHA224()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA256cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmSHA256::s_name = &quot;sha-256&quot;;
</del><ins>+const char* const CryptoAlgorithmSHA256::s_name = &quot;SHA-256&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmSHA256::CryptoAlgorithmSHA256()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA384cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmSHA384::s_name = &quot;sha-384&quot;;
</del><ins>+const char* const CryptoAlgorithmSHA384::s_name = &quot;SHA-384&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmSHA384::CryptoAlgorithmSHA384()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmSHA512cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp (160490 => 160491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp        2013-12-12 17:21:34 UTC (rev 160490)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp        2013-12-12 18:21:30 UTC (rev 160491)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const char* const CryptoAlgorithmSHA512::s_name = &quot;sha-512&quot;;
</del><ins>+const char* const CryptoAlgorithmSHA512::s_name = &quot;SHA-512&quot;;
</ins><span class="cx"> 
</span><span class="cx"> CryptoAlgorithmSHA512::CryptoAlgorithmSHA512()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>