<!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>[213560] 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/213560">213560</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 18:09:38 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebCrypto] Implement ECDH ImportKey/ExportKey operations
https://bugs.webkit.org/show_bug.cgi?id=169257
<rdar://problem/23789585>
Reviewed by Brent Fulgham.
LayoutTests/imported/w3c:
* web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt:
* web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt:
Source/WebCore:
This patch implements ECDH ImportKey/ExportKey operations according to:
https://www.w3.org/TR/WebCryptoAPI/#ecdh-operations. Sad that we can't
support SPKI/PKCS8 formats at this moment due to lack of necessary
support in the underlying crypto library. Bug 169318 is tracking the
issue. Also, this patch fixes minor bugs while importing JWK keys for
HMAC/RSA.
Tests: crypto/subtle/ec-export-key-malformed-parameters.html
crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html
crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html
crypto/subtle/ec-import-jwk-key-export-raw-key.html
crypto/subtle/ec-import-key-malformed-parameters.html
crypto/subtle/ec-import-raw-key-export-jwk-key.html
crypto/subtle/ec-import-raw-key-export-raw-key.html
crypto/subtle/ecdh-generate-export-jwk-key-p256.html
crypto/subtle/ecdh-generate-export-jwk-key-p384.html
crypto/subtle/ecdh-generate-export-key-raw-p256.html
crypto/subtle/ecdh-generate-export-key-raw-p384.html
crypto/subtle/ecdh-import-jwk-key-minimum.html
crypto/subtle/ecdh-import-jwk-private-key-p256.html
crypto/subtle/ecdh-import-jwk-private-key-p384.html
crypto/subtle/ecdh-import-jwk-public-key-p256.html
crypto/subtle/ecdh-import-jwk-public-key-p384.html
crypto/subtle/ecdh-import-raw-key-p256.html
crypto/subtle/ecdh-import-raw-key-p384.html
crypto/workers/subtle/ec-generate-export-jwk-key.html
crypto/workers/subtle/ec-generate-export-raw-key.html
crypto/workers/subtle/ec-import-jwk-key-private.html
crypto/workers/subtle/ec-import-jwk-key-public.html
crypto/workers/subtle/ec-import-raw-key.html
* bindings/js/JSSubtleCryptoCustom.cpp:
(WebCore::normalizeCryptoAlgorithmParameters):
(WebCore::supportExportKeyThrow):
Added EC family support.
* crypto/CommonCryptoUtilities.h:
Added needed CommonCrypto SPIs.
* crypto/CryptoAlgorithm.h:
* crypto/algorithms/CryptoAlgorithmECDH.cpp:
(WebCore::CryptoAlgorithmECDH::importKey):
(WebCore::CryptoAlgorithmECDH::exportKey):
* crypto/algorithms/CryptoAlgorithmECDH.h:
* crypto/gnutls/CryptoKeyECGnuTLS.cpp:
(WebCore::CryptoKeyEC::keySizeInBits):
(WebCore::CryptoKeyEC::exportRaw):
(WebCore::CryptoKeyEC::platformImportRaw):
(WebCore::CryptoKeyEC::platformImportJWKPublic):
(WebCore::CryptoKeyEC::platformImportJWKPrivate):
(WebCore::CryptoKeyEC::platformAddFieldElements):
Faked implementations for GTK+.
* crypto/keys/CryptoKeyEC.cpp:
(WebCore::toNamedCurve):
(WebCore::CryptoKeyEC::generatePair):
(WebCore::CryptoKeyEC::importRaw):
(WebCore::CryptoKeyEC::importJwk):
(WebCore::CryptoKeyEC::exportJwk):
* crypto/keys/CryptoKeyEC.h:
* crypto/keys/CryptoKeyHMAC.cpp:
(WebCore::CryptoKeyHMAC::importJwk):
Fixed a bug.
* crypto/keys/CryptoKeyRSA.cpp:
(WebCore::CryptoKeyRSA::importJwk):
Fixed a bug.
* crypto/mac/CryptoKeyECMac.cpp:
(WebCore::doesUncompressedPointMatchNamedCurve):
(WebCore::doesFieldElementMatchNamedCurve):
(WebCore::getKeySizeFromNamedCurve):
(WebCore::CryptoKeyEC::~CryptoKeyEC):
(WebCore::CryptoKeyEC::keySizeInBits):
(WebCore::CryptoKeyEC::exportRaw):
(WebCore::CryptoKeyEC::platformGeneratePair):
(WebCore::CryptoKeyEC::platformImportRaw):
(WebCore::CryptoKeyEC::platformImportJWKPublic):
(WebCore::CryptoKeyEC::platformImportJWKPrivate):
(WebCore::CryptoKeyEC::platformAddFieldElements):
LayoutTests:
* crypto/subtle/ec-export-key-malformed-parameters-expected.txt: Added.
* crypto/subtle/ec-export-key-malformed-parameters.html: Added.
* crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt: Added.
* crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html: Added.
* crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt: Added.
* crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html: Added.
* crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt: Added.
* crypto/subtle/ec-import-jwk-key-export-raw-key.html: Added.
* crypto/subtle/ec-import-key-malformed-parameters-expected.txt: Added.
* crypto/subtle/ec-import-key-malformed-parameters.html: Added.
* crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt: Added.
* crypto/subtle/ec-import-raw-key-export-jwk-key.html: Added.
* crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt: Added.
* crypto/subtle/ec-import-raw-key-export-raw-key.html: Added.
* crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt: Added.
* crypto/subtle/ecdh-generate-export-jwk-key-p256.html: Added.
* crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt: Added.
* crypto/subtle/ecdh-generate-export-jwk-key-p384.html: Added.
* crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt: Added.
* crypto/subtle/ecdh-generate-export-key-raw-p256.html: Added.
* crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt: Added.
* crypto/subtle/ecdh-generate-export-key-raw-p384.html: Added.
* crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt: Added.
* crypto/subtle/ecdh-import-jwk-key-minimum.html: Added.
* crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt: Added.
* crypto/subtle/ecdh-import-jwk-private-key-p256.html: Added.
* crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt: Added.
* crypto/subtle/ecdh-import-jwk-private-key-p384.html: Added.
* crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt: Added.
* crypto/subtle/ecdh-import-jwk-public-key-p256.html: Added.
* crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt: Added.
* crypto/subtle/ecdh-import-jwk-public-key-p384.html: Added.
* crypto/subtle/ecdh-import-raw-key-p256-expected.txt: Added.
* crypto/subtle/ecdh-import-raw-key-p256.html: Added.
* crypto/subtle/ecdh-import-raw-key-p384-expected.txt: Added.
* crypto/subtle/ecdh-import-raw-key-p384.html: Added.
* crypto/subtle/hmac-import-key-malformed-parameters-expected.txt:
* crypto/subtle/hmac-import-key-malformed-parameters.html:
* crypto/subtle/rsa-import-key-malformed-parameters-expected.txt:
* crypto/subtle/rsa-import-key-malformed-parameters.html:
Fixed some minor bugs.
* crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt: Added.
* crypto/workers/subtle/ec-generate-export-jwk-key.html: Added.
* crypto/workers/subtle/ec-generate-export-raw-key-expected.txt: Added.
* crypto/workers/subtle/ec-generate-export-raw-key.html: Added.
* crypto/workers/subtle/ec-import-jwk-key-private-expected.txt: Added.
* crypto/workers/subtle/ec-import-jwk-key-private.html: Added.
* crypto/workers/subtle/ec-import-jwk-key-public-expected.txt: Added.
* crypto/workers/subtle/ec-import-jwk-key-public.html: Added.
* crypto/workers/subtle/ec-import-raw-key-expected.txt: Added.
* crypto/workers/subtle/ec-import-raw-key.html: Added.
* crypto/workers/subtle/resources/ec-generate-export-jwk-key.js: Added.
* crypto/workers/subtle/resources/ec-generate-export-raw-key.js: Added.
* crypto/workers/subtle/resources/ec-import-jwk-key-private.js: Added.
* crypto/workers/subtle/resources/ec-import-jwk-key-public.js: Added.
* crypto/workers/subtle/resources/ec-import-raw-key.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacimportkeymalformedparametersexpectedtxt">trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlehmacimportkeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaimportkeymalformedparametersexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaimportkeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsWebCryptoAPIimport_exportec_importKeyworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsWebCryptoAPIimport_exporttest_ec_importKeyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCommonCryptoUtilitiesh">trunk/Source/WebCore/crypto/CommonCryptoUtilities.h</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmh">trunk/Source/WebCore/crypto/CryptoAlgorithm.h</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHh">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.h</a></li>
<li><a href="#trunkSourceWebCorecryptognutlsCryptoKeyECGnuTLScpp">trunk/Source/WebCore/crypto/gnutls/CryptoKeyECGnuTLS.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyECcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyEC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyECh">trunk/Source/WebCore/crypto/keys/CryptoKeyEC.h</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyHMACcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyRSAcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoKeyECMaccpp">trunk/Source/WebCore/crypto/mac/CryptoKeyECMac.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscryptosubtleecexportkeymalformedparametersexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecexportkeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeyprivateexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeyprivatehtml">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeypublicexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeypublichtml">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportrawkeyexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportjwkkeyexportrawkeyhtml">trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportkeymalformedparametersexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportkeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportrawkeyexportjwkkeyexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportrawkeyexportjwkkeyhtml">trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportrawkeyexportrawkeyexpectedtxt">trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecimportrawkeyexportrawkeyhtml">trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp256expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp256html">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp384expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp384html">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp256expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp256html">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp384expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp384html">trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkkeyminimumexpectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkkeyminimumhtml">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp256expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp256html">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp384expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp384html">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp256expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp256html">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp384expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp384html">trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportrawkeyp256expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportrawkeyp256html">trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportrawkeyp384expectedtxt">trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleecdhimportrawkeyp384html">trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecgenerateexportjwkkeyexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecgenerateexportjwkkeyhtml">trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecgenerateexportrawkeyexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecgenerateexportrawkeyhtml">trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportjwkkeyprivateexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportjwkkeyprivatehtml">trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportjwkkeypublicexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportjwkkeypublichtml">trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportrawkeyexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleecimportrawkeyhtml">trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesecgenerateexportjwkkeyjs">trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-jwk-key.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesecgenerateexportrawkeyjs">trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-raw-key.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesecimportjwkkeyprivatejs">trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-private.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesecimportjwkkeypublicjs">trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-public.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesecimportrawkeyjs">trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-raw-key.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/ChangeLog 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -1,3 +1,68 @@
</span><ins>+2017-03-07 Jiewen Tan <jiewen_tan@apple.com>
+
+ [WebCrypto] Implement ECDH ImportKey/ExportKey operations
+ https://bugs.webkit.org/show_bug.cgi?id=169257
+ <rdar://problem/23789585>
+
+ Reviewed by Brent Fulgham.
+
+ * crypto/subtle/ec-export-key-malformed-parameters-expected.txt: Added.
+ * crypto/subtle/ec-export-key-malformed-parameters.html: Added.
+ * crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt: Added.
+ * crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html: Added.
+ * crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt: Added.
+ * crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html: Added.
+ * crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt: Added.
+ * crypto/subtle/ec-import-jwk-key-export-raw-key.html: Added.
+ * crypto/subtle/ec-import-key-malformed-parameters-expected.txt: Added.
+ * crypto/subtle/ec-import-key-malformed-parameters.html: Added.
+ * crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt: Added.
+ * crypto/subtle/ec-import-raw-key-export-jwk-key.html: Added.
+ * crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt: Added.
+ * crypto/subtle/ec-import-raw-key-export-raw-key.html: Added.
+ * crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt: Added.
+ * crypto/subtle/ecdh-generate-export-jwk-key-p256.html: Added.
+ * crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt: Added.
+ * crypto/subtle/ecdh-generate-export-jwk-key-p384.html: Added.
+ * crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt: Added.
+ * crypto/subtle/ecdh-generate-export-key-raw-p256.html: Added.
+ * crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt: Added.
+ * crypto/subtle/ecdh-generate-export-key-raw-p384.html: Added.
+ * crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt: Added.
+ * crypto/subtle/ecdh-import-jwk-key-minimum.html: Added.
+ * crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt: Added.
+ * crypto/subtle/ecdh-import-jwk-private-key-p256.html: Added.
+ * crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt: Added.
+ * crypto/subtle/ecdh-import-jwk-private-key-p384.html: Added.
+ * crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt: Added.
+ * crypto/subtle/ecdh-import-jwk-public-key-p256.html: Added.
+ * crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt: Added.
+ * crypto/subtle/ecdh-import-jwk-public-key-p384.html: Added.
+ * crypto/subtle/ecdh-import-raw-key-p256-expected.txt: Added.
+ * crypto/subtle/ecdh-import-raw-key-p256.html: Added.
+ * crypto/subtle/ecdh-import-raw-key-p384-expected.txt: Added.
+ * crypto/subtle/ecdh-import-raw-key-p384.html: Added.
+ * crypto/subtle/hmac-import-key-malformed-parameters-expected.txt:
+ * crypto/subtle/hmac-import-key-malformed-parameters.html:
+ * crypto/subtle/rsa-import-key-malformed-parameters-expected.txt:
+ * crypto/subtle/rsa-import-key-malformed-parameters.html:
+ Fixed some minor bugs.
+ * crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt: Added.
+ * crypto/workers/subtle/ec-generate-export-jwk-key.html: Added.
+ * crypto/workers/subtle/ec-generate-export-raw-key-expected.txt: Added.
+ * crypto/workers/subtle/ec-generate-export-raw-key.html: Added.
+ * crypto/workers/subtle/ec-import-jwk-key-private-expected.txt: Added.
+ * crypto/workers/subtle/ec-import-jwk-key-private.html: Added.
+ * crypto/workers/subtle/ec-import-jwk-key-public-expected.txt: Added.
+ * crypto/workers/subtle/ec-import-jwk-key-public.html: Added.
+ * crypto/workers/subtle/ec-import-raw-key-expected.txt: Added.
+ * crypto/workers/subtle/ec-import-raw-key.html: Added.
+ * crypto/workers/subtle/resources/ec-generate-export-jwk-key.js: Added.
+ * crypto/workers/subtle/resources/ec-generate-export-raw-key.js: Added.
+ * crypto/workers/subtle/resources/ec-import-jwk-key-private.js: Added.
+ * crypto/workers/subtle/resources/ec-import-jwk-key-public.js: Added.
+ * crypto/workers/subtle/resources/ec-import-raw-key.js: Added.
+
</ins><span class="cx"> 2017-03-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Debug flag to TestExpectation for webrtc/libwebrtc/descriptionGetters.html.
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecexportkeymalformedparametersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test exporting an EC key with malformed parameters
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS crypto.subtle.exportKey("raw", privateKey) rejected promise with InvalidAccessError (DOM Exception 15): The requested operation is not valid for the provided key.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecexportkeymalformedparametershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-export-key-malformed-parameters.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test exporting an EC key with malformed parameters");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-256"
+};
+var extractable = true;
+
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ privateKey = result.privateKey;
+
+ // Wrong key and format.
+ return shouldReject('crypto.subtle.exportKey("raw", privateKey)');
+}).then(finishJSTest, finishJSTest);
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeyprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test importing a jwk private ECDH key and then export it in jwk format
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.kty is jwkKey.kty
+PASS publicKey.crv is jwkKey.crv
+PASS publicKey.x is jwkKey.x
+PASS publicKey.y is jwkKey.y
+PASS publicKey.d is jwkKey.d
+PASS publicKey.key_ops is jwkKey.key_ops
+PASS publicKey.ext is jwkKey.ext
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeyprivatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a jwk private ECDH key and then export it in jwk format");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ ext: true,
+ key_ops: ["deriveBits", "deriveKey"],
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+ d: "ppxBSov3N8_AUcisAuvmLV4yE8e_L_BLE8bZb9Z1Xjg",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ return crypto.subtle.exportKey("jwk", result);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "jwkKey.kty");
+ shouldBe("publicKey.crv", "jwkKey.crv");
+ shouldBe("publicKey.x", "jwkKey.x");
+ shouldBe("publicKey.y", "jwkKey.y");
+ shouldBe("publicKey.d", "jwkKey.d");
+ shouldBe("publicKey.key_ops", "jwkKey.key_ops");
+ shouldBe("publicKey.ext", "jwkKey.ext");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeypublicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a jwk public ECDH key and then export it in jwk format
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.kty is jwkKey.kty
+PASS publicKey.crv is jwkKey.crv
+PASS publicKey.x is jwkKey.x
+PASS publicKey.y is jwkKey.y
+PASS publicKey.key_ops is [ ]
+PASS publicKey.ext is jwkKey.ext
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportjwkkeypublichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a jwk public ECDH key and then export it in jwk format");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ return crypto.subtle.exportKey("jwk", result);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "jwkKey.kty");
+ shouldBe("publicKey.crv", "jwkKey.crv");
+ shouldBe("publicKey.x", "jwkKey.x");
+ shouldBe("publicKey.y", "jwkKey.y");
+ shouldBe("publicKey.key_ops", "[ ]");
+ shouldBe("publicKey.ext", "jwkKey.ext");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportrawkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test importing a jwk ECDH key and then export it in raw format
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS bytesToHexString(publicKey) is expectedRawKey
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportjwkkeyexportrawkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-jwk-key-export-raw-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a jwk ECDH key and then export it in raw format");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+};
+var expectedRawKey = "04d454955a2793be2905906d4d3b286450268c6dd421c701fa682bb8133fac46d0f6398d4cba8ce1c8c185d0271dc348f58415dcef0b166a3e11d65693c9ed01a2";
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ return crypto.subtle.exportKey("raw", result);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("bytesToHexString(publicKey)", "expectedRawKey");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportkeymalformedparametersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Test importing a EC key with malformed parameters
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("raw", rawP384Key, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveBits"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-521" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["encrypt"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["decrypt"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["sign"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["verify"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["wrapKey"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["unwrapKey"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d, use: "sig"}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "RSA", crv: "P-256", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d, key_ops: ["sign", "verify"]}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, ext: false}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-521", x:x, y:y}, { name: "ECDH", namedCurve: "P-521" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x384, y:y}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y384}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x384, y:y384, d:d}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportkeymalformedparametershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-key-malformed-parameters.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a EC key with malformed parameters");
+
+var extractable = true;
+var rawP256Key = hexStringToUint8Array("04dc08d9bf603333eab1ad29cef41a6203ab6ecce03c5a4a9bf5771a3fb9f971d89a09664bfb87c61199b3453220eadec714c49ad1e24bf5d7ec5bddeca6420893");
+var rawP384Key = hexStringToUint8Array("048ba3e0a0ac5c9bb25476323570fa11dff30745a13da751a5eb1dacb5e9b439df0f77979077ee9ac97c02ca1e3cd72677cbbc256a69b99fd83a519ca9a9a26c62d45b51659274b1cea3c9858543abf5c64bfcfcd1948b7075c0409da4494f9060");
+var x = "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA"; // P-256
+var y = "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI"; // P-256
+var d = "ppxBSov3N8_AUcisAuvmLV4yE8e_L_BLE8bZb9Z1Xjg"; // P-256
+var x384 = "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK";
+var y384 = "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK";
+
+// Named curves mismatch raw keys
+shouldReject('crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ])');
+shouldReject('crypto.subtle.importKey("raw", rawP384Key, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Raw: Non-empty usages
+shouldReject('crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveBits"])');
+// Raw: Not support named curve
+shouldReject('crypto.subtle.importKey("raw", rawP256Key, { name: "ECDH", namedCurve: "P-521" }, extractable, [ ])');
+// Jwk: Wrong usages
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["encrypt"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["decrypt"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["sign"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["verify"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["wrapKey"])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["unwrapKey"])');
+// Jwk: Wrong use
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d, use: "sig"}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"])');
+// Jwk: Wrong kty
+shouldReject('crypto.subtle.importKey("jwk", {kty: "RSA", crv: "P-256", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Jwk: Wrong key_ops
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, d:d, key_ops: ["sign", "verify"]}, { name: "ECDH", namedCurve: "P-256" }, extractable, ["deriveKey"])');
+// Jwk: Wrong ext
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x, y:y, ext: false}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Jwk: Missing crv
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Jwk: Mismatched crv
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Jwk: Not supported crv
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-521", x:x, y:y}, { name: "ECDH", namedCurve: "P-521" }, extractable, [ ])');
+// Jwk: Missing x, y
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", y:y}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-256", x:x}, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ])');
+// Jwk: Mismatched x, y, d
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x384, y:y}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x, y:y384}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ])');
+shouldReject('crypto.subtle.importKey("jwk", {kty: "EC", crv: "P-384", x:x384, y:y384, d:d}, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ])');
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportrawkeyexportjwkkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a raw ECDH key and then export it in jwk format
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.kty is expectedJwkKey.kty
+PASS publicKey.crv is expectedJwkKey.crv
+PASS publicKey.x is expectedJwkKey.x
+PASS publicKey.y is expectedJwkKey.y
+PASS publicKey.key_ops is [ ]
+PASS publicKey.ext is expectedJwkKey.ext
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportrawkeyexportjwkkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-jwk-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a raw ECDH key and then export it in jwk format");
+
+jsTestIsAsync = true;
+
+var expectedJwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+};
+var rawKey = hexStringToUint8Array("04d454955a2793be2905906d4d3b286450268c6dd421c701fa682bb8133fac46d0f6398d4cba8ce1c8c185d0271dc348f58415dcef0b166a3e11d65693c9ed01a2");
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("raw", rawKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ return crypto.subtle.exportKey("jwk", result);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "expectedJwkKey.kty");
+ shouldBe("publicKey.crv", "expectedJwkKey.crv");
+ shouldBe("publicKey.x", "expectedJwkKey.x");
+ shouldBe("publicKey.y", "expectedJwkKey.y");
+ shouldBe("publicKey.key_ops", "[ ]");
+ shouldBe("publicKey.ext", "expectedJwkKey.ext");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportrawkeyexportrawkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test importing a raw ECDH key and then export it in raw format
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS bytesToHexString(publicKey) is rawKeyHex
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecimportrawkeyexportrawkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ec-import-raw-key-export-raw-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a raw ECDH key and then export it in raw format");
+
+jsTestIsAsync = true;
+
+var rawKeyHex = "04dc08d9bf603333eab1ad29cef41a6203ab6ecce03c5a4a9bf5771a3fb9f971d89a09664bfb87c61199b3453220eadec714c49ad1e24bf5d7ec5bddeca6420893";
+var rawKey = hexStringToUint8Array(rawKeyHex);
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("raw", rawKey, {name: "ECDH", namedCurve: "P-256"}, extractable, [ ]).then(function(publicKey) {
+ return crypto.subtle.exportKey("raw", publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("bytesToHexString(publicKey)", "rawKeyHex");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp256expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+Test exporting a P-256 ECDH key pair with JWK format.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Generating a key pair...
+Exporting the public key...
+PASS publicKey.kty is 'EC'
+PASS publicKey.crv is 'P-256'
+PASS Base64URL.parse(publicKey.x).byteLength is 32
+PASS Base64URL.parse(publicKey.y).byteLength is 32
+PASS publicKey.d is undefined.
+PASS publicKey.key_ops is [ ]
+PASS publicKey.ext is true
+Exporting the private key...
+PASS privateKey.kty is 'EC'
+PASS privateKey.crv is 'P-256'
+PASS Base64URL.parse(privateKey.x).byteLength is 32
+PASS Base64URL.parse(privateKey.y).byteLength is 32
+PASS Base64URL.parse(privateKey.d).byteLength is 32
+PASS privateKey.key_ops is ['deriveBits', 'deriveKey']
+PASS privateKey.ext is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp256html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p256.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test exporting a P-256 ECDH key pair with JWK format.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-256"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("jwk", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "'EC'");
+ shouldBe("publicKey.crv", "'P-256'");
+ shouldBe("Base64URL.parse(publicKey.x).byteLength", "32");
+ shouldBe("Base64URL.parse(publicKey.y).byteLength", "32");
+ shouldBeUndefined("publicKey.d");
+ shouldBe("publicKey.key_ops", "[ ]");
+ shouldBe("publicKey.ext", "true");
+
+ debug("Exporting the private key...");
+ return crypto.subtle.exportKey("jwk", keyPair.privateKey);
+}).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.kty", "'EC'");
+ shouldBe("privateKey.crv", "'P-256'");
+ shouldBe("Base64URL.parse(privateKey.x).byteLength", "32");
+ shouldBe("Base64URL.parse(privateKey.y).byteLength", "32");
+ shouldBe("Base64URL.parse(privateKey.d).byteLength", "32");
+ shouldBe("privateKey.key_ops", "['deriveBits', 'deriveKey']");
+ shouldBe("privateKey.ext", "true");
+
+ finishJSTest();
+});
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp384expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+Test exporting a P-384 ECDH key pair with JWK format.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Generating a key pair...
+Exporting the public key...
+PASS publicKey.kty is 'EC'
+PASS publicKey.crv is 'P-384'
+PASS Base64URL.parse(publicKey.x).byteLength is 48
+PASS Base64URL.parse(publicKey.y).byteLength is 48
+PASS publicKey.d is undefined.
+PASS publicKey.key_ops is [ ]
+PASS publicKey.ext is true
+Exporting the private key...
+PASS privateKey.kty is 'EC'
+PASS privateKey.crv is 'P-384'
+PASS Base64URL.parse(privateKey.x).byteLength is 48
+PASS Base64URL.parse(privateKey.y).byteLength is 48
+PASS Base64URL.parse(privateKey.d).byteLength is 48
+PASS privateKey.key_ops is ['deriveBits', 'deriveKey']
+PASS privateKey.ext is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportjwkkeyp384html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-jwk-key-p384.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test exporting a P-384 ECDH key pair with JWK format.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-384"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("jwk", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "'EC'");
+ shouldBe("publicKey.crv", "'P-384'");
+ shouldBe("Base64URL.parse(publicKey.x).byteLength", "48");
+ shouldBe("Base64URL.parse(publicKey.y).byteLength", "48");
+ shouldBeUndefined("publicKey.d");
+ shouldBe("publicKey.key_ops", "[ ]");
+ shouldBe("publicKey.ext", "true");
+
+ debug("Exporting the private key...");
+ return crypto.subtle.exportKey("jwk", keyPair.privateKey);
+}).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.kty", "'EC'");
+ shouldBe("privateKey.crv", "'P-384'");
+ shouldBe("Base64URL.parse(privateKey.x).byteLength", "48");
+ shouldBe("Base64URL.parse(privateKey.y).byteLength", "48");
+ shouldBe("Base64URL.parse(privateKey.d).byteLength", "48");
+ shouldBe("privateKey.key_ops", "['deriveBits', 'deriveKey']");
+ shouldBe("privateKey.ext", "true");
+
+ finishJSTest();
+});
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp256expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test exporting a P-256 ECDH public key with raw format.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Generating a key pair...
+Exporting the public key...
+PASS publicKey.byteLength is 65
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp256html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p256.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test exporting a P-256 ECDH public key with raw format.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-256"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("raw", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.byteLength", "65");
+
+ finishJSTest();
+});
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp384expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test exporting a P-384 ECDH public key with raw format.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Generating a key pair...
+Exporting the public key...
+PASS publicKey.byteLength is 97
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhgenerateexportkeyrawp384html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-generate-export-key-raw-p384.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test exporting a P-384 ECDH public key with raw format.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-384"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("raw", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.byteLength", "97");
+
+ finishJSTest();
+});
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkkeyminimumexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a JWK ECDH public key with minimum JWK
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.toString() is '[object CryptoKey]'
+PASS publicKey.type is 'public'
+PASS publicKey.extractable is true
+PASS publicKey.algorithm.name is 'ECDH'
+PASS publicKey.algorithm.namedCurve is 'P-256'
+PASS publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkkeyminimumhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-key-minimum.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a JWK ECDH public key with minimum JWK");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp256expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a JWK ECDH private key with P-256
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS privateKey.toString() is '[object CryptoKey]'
+PASS privateKey.type is 'private'
+PASS privateKey.extractable is false
+PASS privateKey.algorithm.name is 'ECDH'
+PASS privateKey.algorithm.namedCurve is 'P-256'
+PASS privateKey.usages is ['deriveBits', 'deriveKey']
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp256html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p256.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a JWK ECDH private key with P-256");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: false,
+ key_ops: ["deriveKey", "deriveBits"],
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+ d: "ppxBSov3N8_AUcisAuvmLV4yE8e_L_BLE8bZb9Z1Xjg",
+};
+var nonExtractable = false;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, nonExtractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.toString()", "'[object CryptoKey]'");
+ shouldBe("privateKey.type", "'private'");
+ shouldBe("privateKey.extractable", "false");
+ shouldBe("privateKey.algorithm.name", "'ECDH'");
+ shouldBe("privateKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("privateKey.usages", "['deriveBits', 'deriveKey']");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp384expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a JWK ECDH private key with P-384
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS privateKey.toString() is '[object CryptoKey]'
+PASS privateKey.type is 'private'
+PASS privateKey.extractable is false
+PASS privateKey.algorithm.name is 'ECDH'
+PASS privateKey.algorithm.namedCurve is 'P-384'
+PASS privateKey.usages is ['deriveBits', 'deriveKey']
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkprivatekeyp384html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-private-key-p384.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a JWK ECDH private key with P-384");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: false,
+ key_ops: ["deriveKey", "deriveBits"],
+ crv: "P-384",
+ x: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+ y: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+ d: "ZV5MWMNl0j2wYmTS0bccCCWdp29-WH3u5-cenSSuv-aHX-GkaPFP4sYSvsrfOlLE",
+};
+var nonExtractable = false;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-384" }, nonExtractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.toString()", "'[object CryptoKey]'");
+ shouldBe("privateKey.type", "'private'");
+ shouldBe("privateKey.extractable", "false");
+ shouldBe("privateKey.algorithm.name", "'ECDH'");
+ shouldBe("privateKey.algorithm.namedCurve", "'P-384'");
+ shouldBe("privateKey.usages", "['deriveBits', 'deriveKey']");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp256expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a JWK ECDH public key with P-256
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.toString() is '[object CryptoKey]'
+PASS publicKey.type is 'public'
+PASS publicKey.extractable is true
+PASS publicKey.algorithm.name is 'ECDH'
+PASS publicKey.algorithm.namedCurve is 'P-256'
+PASS publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp256html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p256.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a JWK ECDH public key with P-256");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp384expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing a JWK ECDH public key with P-384
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.toString() is '[object CryptoKey]'
+PASS publicKey.type is 'public'
+PASS publicKey.extractable is true
+PASS publicKey.algorithm.name is 'ECDH'
+PASS publicKey.algorithm.namedCurve is 'P-384'
+PASS publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportjwkpublickeyp384html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-jwk-public-key-p384.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing a JWK ECDH public key with P-384");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-384",
+ x: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+ y: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-384'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportrawkeyp256expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing an ECDH raw key with P-256
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.toString() is '[object CryptoKey]'
+PASS publicKey.type is 'public'
+PASS publicKey.extractable is true
+PASS publicKey.algorithm.name is 'ECDH'
+PASS publicKey.algorithm.namedCurve is 'P-256'
+PASS publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportrawkeyp256html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p256.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing an ECDH raw key with P-256");
+
+jsTestIsAsync = true;
+
+var rawKey = hexStringToUint8Array("04dc08d9bf603333eab1ad29cef41a6203ab6ecce03c5a4a9bf5771a3fb9f971d89a09664bfb87c61199b3453220eadec714c49ad1e24bf5d7ec5bddeca6420893");
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("raw", rawKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportrawkeyp384expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test importing an ECDH raw key with P-384
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a key...
+PASS publicKey.toString() is '[object CryptoKey]'
+PASS publicKey.type is 'public'
+PASS publicKey.extractable is true
+PASS publicKey.algorithm.name is 'ECDH'
+PASS publicKey.algorithm.namedCurve is 'P-384'
+PASS publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtleecdhimportrawkeyp384html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-raw-key-p384.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test importing an ECDH raw key with P-384");
+
+jsTestIsAsync = true;
+
+var rawKey = hexStringToUint8Array("048ba3e0a0ac5c9bb25476323570fa11dff30745a13da751a5eb1dacb5e9b439df0f77979077ee9ac97c02ca1e3cd72677cbbc256a69b99fd83a519ca9a9a26c62d45b51659274b1cea3c9858543abf5c64bfcfcd1948b7075c0409da4494f9060");
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("raw", rawKey, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-384'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacimportkeymalformedparametersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters-expected.txt (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters-expected.txt 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", use: "enc"}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", use: ""}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", key_ops: ["sign"]}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><ins>+PASS crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", key_ops: [ ]}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</ins><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", ext: false}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlehmacimportkeymalformedparametershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters.html (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters.html 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/crypto/subtle/hmac-import-key-malformed-parameters.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", use: ""}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"])');
</span><span class="cx"> // Jwk: wrong key_ops
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", key_ops: ["sign"]}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"])');
</span><ins>+shouldReject('crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", key_ops: [ ]}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"])');
</ins><span class="cx"> // Jwk: wrong ext
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "oct", k: k, alg: "HS1", ext: false}, {name: "hmac", hash: "sha-1"}, extractable, ["sign", "verify"])');
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaimportkeymalformedparametersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters-expected.txt (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters-expected.txt 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, alg: ""}, {name: "RSA-OAEP", hash: "sha-512"}, extractable, ["encrypt", "wrapKey"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "oct", n: n, e: e}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, key_ops: ["sign", "verify"]}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><ins>+PASS crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, key_ops: [ ]}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</ins><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, ext: false}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "RSA"}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span><span class="cx"> PASS crypto.subtle.importKey("jwk", {kty: "RSA", n: n}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"]) rejected promise with DataError (DOM Exception 30): Data provided to an operation does not meet requirements.
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaimportkeymalformedparametershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters.html (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters.html 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/crypto/subtle/rsa-import-key-malformed-parameters.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "oct", n: n, e: e}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"])');
</span><span class="cx"> // Jwk: Wrong key_ops
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, key_ops: ["sign", "verify"]}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"])');
</span><ins>+shouldReject('crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, key_ops: [ ]}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"])');
</ins><span class="cx"> // Jwk: Wrong ext
</span><span class="cx"> shouldReject('crypto.subtle.importKey("jwk", {kty: "RSA", n: n, e: e, ext: false}, "RSAES-PKCS1-v1_5", extractable, ["encrypt"])');
</span><span class="cx"> // Jwk: Missing n or e
</span></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecgenerateexportjwkkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+[Worker] Test exporting an ECDH key pair with JWK format in workers.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/ec-generate-export-jwk-key.js
+[Worker] Generating a key pair...
+[Worker] Exporting the public key...
+PASS [Worker] publicKey.kty is 'EC'
+PASS [Worker] publicKey.crv is 'P-384'
+PASS [Worker] Base64URL.parse(publicKey.x).byteLength is 48
+PASS [Worker] Base64URL.parse(publicKey.y).byteLength is 48
+PASS [Worker] publicKey.d is undefined.
+PASS [Worker] publicKey.key_ops is [ ]
+PASS [Worker] publicKey.ext is true
+[Worker] Exporting the private key...
+PASS [Worker] privateKey.kty is 'EC'
+PASS [Worker] privateKey.crv is 'P-384'
+PASS [Worker] Base64URL.parse(privateKey.x).byteLength is 48
+PASS [Worker] Base64URL.parse(privateKey.y).byteLength is 48
+PASS [Worker] Base64URL.parse(privateKey.d).byteLength is 48
+PASS [Worker] privateKey.key_ops is ['deriveBits', 'deriveKey']
+PASS [Worker] privateKey.ext is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecgenerateexportjwkkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-jwk-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/ec-generate-export-jwk-key.js');
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecgenerateexportrawkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+[Worker] Test exporting an ECDH public key with raw format in workers.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/ec-generate-export-raw-key.js
+[Worker] Generating a key pair...
+[Worker] Exporting the public key...
+PASS [Worker] publicKey.byteLength is 65
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecgenerateexportrawkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-generate-export-raw-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/ec-generate-export-raw-key.js');
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportjwkkeyprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+[Worker] Test importing a JWK ECDH private key in workers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/ec-import-jwk-key-private.js
+[Worker] Importing a key...
+PASS [Worker] privateKey.toString() is '[object CryptoKey]'
+PASS [Worker] privateKey.type is 'private'
+PASS [Worker] privateKey.extractable is false
+PASS [Worker] privateKey.algorithm.name is 'ECDH'
+PASS [Worker] privateKey.algorithm.namedCurve is 'P-256'
+PASS [Worker] privateKey.usages is ['deriveBits', 'deriveKey']
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportjwkkeyprivatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-private.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/ec-import-jwk-key-private.js');
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportjwkkeypublicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+[Worker] Test importing a JWK ECDH public key in workers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/ec-import-jwk-key-public.js
+[Worker] Importing a key...
+PASS [Worker] publicKey.toString() is '[object CryptoKey]'
+PASS [Worker] publicKey.type is 'public'
+PASS [Worker] publicKey.extractable is true
+PASS [Worker] publicKey.algorithm.name is 'ECDH'
+PASS [Worker] publicKey.algorithm.namedCurve is 'P-384'
+PASS [Worker] publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportjwkkeypublichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-jwk-key-public.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/ec-import-jwk-key-public.js');
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportrawkeyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key-expected.txt (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+[Worker] Test importing an ECDH raw key in workers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting worker: resources/ec-import-raw-key.js
+[Worker] Importing a key...
+PASS [Worker] publicKey.toString() is '[object CryptoKey]'
+PASS [Worker] publicKey.type is 'public'
+PASS [Worker] publicKey.extractable is true
+PASS [Worker] publicKey.algorithm.name is 'ECDH'
+PASS [Worker] publicKey.algorithm.namedCurve is 'P-256'
+PASS [Worker] publicKey.usages is [ ]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleecimportrawkeyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key.html (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key.html (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/ec-import-raw-key.html 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <script>
+ worker = startWorker('resources/ec-import-raw-key.js');
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesecgenerateexportjwkkeyjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-jwk-key.js (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-jwk-key.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-jwk-key.js 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+importScripts('../../../../resources/js-test-pre.js');
+importScripts("../../../resources/common.js");
+
+description("Test exporting an ECDH key pair with JWK format in workers.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-384"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("jwk", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.kty", "'EC'");
+ shouldBe("publicKey.crv", "'P-384'");
+ shouldBe("Base64URL.parse(publicKey.x).byteLength", "48");
+ shouldBe("Base64URL.parse(publicKey.y).byteLength", "48");
+ shouldBeUndefined("publicKey.d");
+ shouldBe("publicKey.key_ops", "[ ]");
+ shouldBe("publicKey.ext", "true");
+
+ debug("Exporting the private key...");
+ return crypto.subtle.exportKey("jwk", keyPair.privateKey);
+}).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.kty", "'EC'");
+ shouldBe("privateKey.crv", "'P-384'");
+ shouldBe("Base64URL.parse(privateKey.x).byteLength", "48");
+ shouldBe("Base64URL.parse(privateKey.y).byteLength", "48");
+ shouldBe("Base64URL.parse(privateKey.d).byteLength", "48");
+ shouldBe("privateKey.key_ops", "['deriveBits', 'deriveKey']");
+ shouldBe("privateKey.ext", "true");
+
+ finishJSTest();
+});
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesecgenerateexportrawkeyjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-raw-key.js (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-raw-key.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/ec-generate-export-raw-key.js 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+importScripts('../../../../resources/js-test-pre.js');
+importScripts("../../../resources/common.js");
+
+description("Test exporting an ECDH public key with raw format in workers.");
+
+jsTestIsAsync = true;
+
+var algorithmKeyGen = {
+ name: "ECDH",
+ namedCurve: "P-256"
+};
+var extractable = true;
+
+var keyPair;
+debug("Generating a key pair...");
+crypto.subtle.generateKey(algorithmKeyGen, extractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ keyPair = result;
+ debug("Exporting the public key...");
+ return crypto.subtle.exportKey("raw", keyPair.publicKey);
+}).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.byteLength", "65");
+
+ finishJSTest();
+});
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesecimportjwkkeyprivatejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-private.js (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-private.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-private.js 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+importScripts('../../../../resources/js-test-pre.js');
+importScripts("../../../resources/common.js");
+
+description("Test importing a JWK ECDH private key in workers");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: false,
+ key_ops: ["deriveKey", "deriveBits"],
+ crv: "P-256",
+ x: "1FSVWieTvikFkG1NOyhkUCaMbdQhxwH6aCu4Ez-sRtA",
+ y: "9jmNTLqM4cjBhdAnHcNI9YQV3O8LFmo-EdZWk8ntAaI",
+ d: "ppxBSov3N8_AUcisAuvmLV4yE8e_L_BLE8bZb9Z1Xjg",
+};
+var nonExtractable = false;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-256" }, nonExtractable, ["deriveKey", "deriveBits"]).then(function(result) {
+ privateKey = result;
+
+ shouldBe("privateKey.toString()", "'[object CryptoKey]'");
+ shouldBe("privateKey.type", "'private'");
+ shouldBe("privateKey.extractable", "false");
+ shouldBe("privateKey.algorithm.name", "'ECDH'");
+ shouldBe("privateKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("privateKey.usages", "['deriveBits', 'deriveKey']");
+
+ finishJSTest();
+});
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesecimportjwkkeypublicjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-public.js (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-public.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-jwk-key-public.js 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+importScripts('../../../../resources/js-test-pre.js');
+importScripts("../../../resources/common.js");
+
+description("Test importing a JWK ECDH public key in workers");
+
+jsTestIsAsync = true;
+
+var jwkKey = {
+ kty: "EC",
+ use: "enc",
+ ext: true,
+ crv: "P-384",
+ x: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+ y: "1bHwFrsaPRjYq-zFOyLXK8Ugv3EqbVF075ct7ouTl_pwyhjeBu03JHjKTsyVbNWK",
+};
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("jwk", jwkKey, { name: "ECDH", namedCurve: "P-384" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-384'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
</ins></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesecimportrawkeyjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-raw-key.js (0 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-raw-key.js (rev 0)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/ec-import-raw-key.js 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+importScripts('../../../../resources/js-test-pre.js');
+importScripts("../../../resources/common.js");
+
+description("Test importing an ECDH raw key in workers");
+
+jsTestIsAsync = true;
+
+var rawKey = hexStringToUint8Array("04dc08d9bf603333eab1ad29cef41a6203ab6ecce03c5a4a9bf5771a3fb9f971d89a09664bfb87c61199b3453220eadec714c49ad1e24bf5d7ec5bddeca6420893");
+var extractable = true;
+
+debug("Importing a key...");
+crypto.subtle.importKey("raw", rawKey, { name: "ECDH", namedCurve: "P-256" }, extractable, [ ]).then(function(result) {
+ publicKey = result;
+
+ shouldBe("publicKey.toString()", "'[object CryptoKey]'");
+ shouldBe("publicKey.type", "'public'");
+ shouldBe("publicKey.extractable", "true");
+ shouldBe("publicKey.algorithm.name", "'ECDH'");
+ shouldBe("publicKey.algorithm.namedCurve", "'P-256'");
+ shouldBe("publicKey.usages", "[ ]");
+
+ finishJSTest();
+});
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-07 Jiewen Tan <jiewen_tan@apple.com>
+
+ [WebCrypto] Implement ECDH ImportKey/ExportKey operations
+ https://bugs.webkit.org/show_bug.cgi?id=169257
+ <rdar://problem/23789585>
+
+ Reviewed by Brent Fulgham.
+
+ * web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt:
+ * web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt:
+
</ins><span class="cx"> 2017-03-07 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [URLParser] Fix file URLs that are just file:// and a Windows drive letter
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsWebCryptoAPIimport_exportec_importKeyworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.worker-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -23,52 +23,52 @@
</span><span class="cx"> FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><span class="cx"> FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><span class="cx"> FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><del>-FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</del><ins>+FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, true, [])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits])
+FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, false, [])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits])
+FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, true, [])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits])
+FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, false, [])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits])
+FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsWebCryptoAPIimport_exporttest_ec_importKeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/import_export/test_ec_importKey-expected.txt 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -23,52 +23,52 @@
</span><span class="cx"> FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><span class="cx"> FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><span class="cx"> FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</span><del>-FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
-FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The operation is not supported. Reached unreachable code
</del><ins>+FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, true, [])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits, deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveBits])
+FAIL Good parameters: P-256 bits (spki, buffer(91), {name: ECDH, namedCurve: P-256}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-256}, false, [])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits, deriveKey])
+FAIL Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveBits])
+FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, true, [])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits, deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveBits])
+FAIL Good parameters: P-384 bits (spki, buffer(120), {name: ECDH, namedCurve: P-384}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-384}, false, [])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits, deriveKey])
+FAIL Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+PASS Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveBits])
+FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, true, []) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveBits]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (spki, buffer(158), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDH, namedCurve: P-521}, false, []) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits, deriveKey]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
+FAIL Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: NotSupportedError (DOM Exception 9): The algorithm is not supported Reached unreachable code
+FAIL Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveBits]) assert_unreached: Threw an unexpected error: DataError (DOM Exception 30): Data provided to an operation does not meet requirements Reached unreachable code
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/ChangeLog 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -1,3 +1,87 @@
</span><ins>+2017-03-07 Jiewen Tan <jiewen_tan@apple.com>
+
+ [WebCrypto] Implement ECDH ImportKey/ExportKey operations
+ https://bugs.webkit.org/show_bug.cgi?id=169257
+ <rdar://problem/23789585>
+
+ Reviewed by Brent Fulgham.
+
+ This patch implements ECDH ImportKey/ExportKey operations according to:
+ https://www.w3.org/TR/WebCryptoAPI/#ecdh-operations. Sad that we can't
+ support SPKI/PKCS8 formats at this moment due to lack of necessary
+ support in the underlying crypto library. Bug 169318 is tracking the
+ issue. Also, this patch fixes minor bugs while importing JWK keys for
+ HMAC/RSA.
+
+ Tests: crypto/subtle/ec-export-key-malformed-parameters.html
+ crypto/subtle/ec-import-jwk-key-export-jwk-key-private.html
+ crypto/subtle/ec-import-jwk-key-export-jwk-key-public.html
+ crypto/subtle/ec-import-jwk-key-export-raw-key.html
+ crypto/subtle/ec-import-key-malformed-parameters.html
+ crypto/subtle/ec-import-raw-key-export-jwk-key.html
+ crypto/subtle/ec-import-raw-key-export-raw-key.html
+ crypto/subtle/ecdh-generate-export-jwk-key-p256.html
+ crypto/subtle/ecdh-generate-export-jwk-key-p384.html
+ crypto/subtle/ecdh-generate-export-key-raw-p256.html
+ crypto/subtle/ecdh-generate-export-key-raw-p384.html
+ crypto/subtle/ecdh-import-jwk-key-minimum.html
+ crypto/subtle/ecdh-import-jwk-private-key-p256.html
+ crypto/subtle/ecdh-import-jwk-private-key-p384.html
+ crypto/subtle/ecdh-import-jwk-public-key-p256.html
+ crypto/subtle/ecdh-import-jwk-public-key-p384.html
+ crypto/subtle/ecdh-import-raw-key-p256.html
+ crypto/subtle/ecdh-import-raw-key-p384.html
+ crypto/workers/subtle/ec-generate-export-jwk-key.html
+ crypto/workers/subtle/ec-generate-export-raw-key.html
+ crypto/workers/subtle/ec-import-jwk-key-private.html
+ crypto/workers/subtle/ec-import-jwk-key-public.html
+ crypto/workers/subtle/ec-import-raw-key.html
+
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ (WebCore::normalizeCryptoAlgorithmParameters):
+ (WebCore::supportExportKeyThrow):
+ Added EC family support.
+ * crypto/CommonCryptoUtilities.h:
+ Added needed CommonCrypto SPIs.
+ * crypto/CryptoAlgorithm.h:
+ * crypto/algorithms/CryptoAlgorithmECDH.cpp:
+ (WebCore::CryptoAlgorithmECDH::importKey):
+ (WebCore::CryptoAlgorithmECDH::exportKey):
+ * crypto/algorithms/CryptoAlgorithmECDH.h:
+ * crypto/gnutls/CryptoKeyECGnuTLS.cpp:
+ (WebCore::CryptoKeyEC::keySizeInBits):
+ (WebCore::CryptoKeyEC::exportRaw):
+ (WebCore::CryptoKeyEC::platformImportRaw):
+ (WebCore::CryptoKeyEC::platformImportJWKPublic):
+ (WebCore::CryptoKeyEC::platformImportJWKPrivate):
+ (WebCore::CryptoKeyEC::platformAddFieldElements):
+ Faked implementations for GTK+.
+ * crypto/keys/CryptoKeyEC.cpp:
+ (WebCore::toNamedCurve):
+ (WebCore::CryptoKeyEC::generatePair):
+ (WebCore::CryptoKeyEC::importRaw):
+ (WebCore::CryptoKeyEC::importJwk):
+ (WebCore::CryptoKeyEC::exportJwk):
+ * crypto/keys/CryptoKeyEC.h:
+ * crypto/keys/CryptoKeyHMAC.cpp:
+ (WebCore::CryptoKeyHMAC::importJwk):
+ Fixed a bug.
+ * crypto/keys/CryptoKeyRSA.cpp:
+ (WebCore::CryptoKeyRSA::importJwk):
+ Fixed a bug.
+ * crypto/mac/CryptoKeyECMac.cpp:
+ (WebCore::doesUncompressedPointMatchNamedCurve):
+ (WebCore::doesFieldElementMatchNamedCurve):
+ (WebCore::getKeySizeFromNamedCurve):
+ (WebCore::CryptoKeyEC::~CryptoKeyEC):
+ (WebCore::CryptoKeyEC::keySizeInBits):
+ (WebCore::CryptoKeyEC::exportRaw):
+ (WebCore::CryptoKeyEC::platformGeneratePair):
+ (WebCore::CryptoKeyEC::platformImportRaw):
+ (WebCore::CryptoKeyEC::platformImportJWKPublic):
+ (WebCore::CryptoKeyEC::platformImportJWKPrivate):
+ (WebCore::CryptoKeyEC::platformAddFieldElements):
+
</ins><span class="cx"> 2017-03-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> WebRTC can be used even if getUserMedia is off
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -243,6 +243,13 @@
</span><span class="cx"> result = std::make_unique<CryptoAlgorithmHmacKeyParams>(params);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case CryptoAlgorithmIdentifier::ECDSA:
+ case CryptoAlgorithmIdentifier::ECDH: {
+ auto params = convertDictionary<CryptoAlgorithmEcKeyParams>(state, value);
+ RETURN_IF_EXCEPTION(scope, nullptr);
+ result = std::make_unique<CryptoAlgorithmEcKeyParams>(params);
+ break;
+ }
</ins><span class="cx"> default:
</span><span class="cx"> throwNotSupportedError(state, scope);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -415,6 +422,8 @@
</span><span class="cx"> case CryptoAlgorithmIdentifier::AES_CFB:
</span><span class="cx"> case CryptoAlgorithmIdentifier::AES_KW:
</span><span class="cx"> case CryptoAlgorithmIdentifier::HMAC:
</span><ins>+ case CryptoAlgorithmIdentifier::ECDSA:
+ case CryptoAlgorithmIdentifier::ECDH:
</ins><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="cx"> throwNotSupportedError(state, scope);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCommonCryptoUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CommonCryptoUtilities.h (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -86,10 +86,29 @@
</span><span class="cx"> extern "C" CCCryptorStatus CCRSACryptorImport(const void *keyPackage, size_t keyPackageLen, CCRSACryptorRef *key);
</span><span class="cx"> extern "C" CCCryptorStatus CCRSACryptorExport(CCRSACryptorRef key, void *out, size_t *outLen);
</span><span class="cx">
</span><ins>+#ifndef _CC_ECCRYPTOR_H_
+enum {
+ ccECKeyPublic = 0,
+ ccECKeyPrivate = 1,
+};
+typedef uint32_t CCECKeyType;
+
+enum {
+ kCCImportKeyBinary = 0,
+};
+typedef uint32_t CCECKeyExternalFormat;
+#endif
+
</ins><span class="cx"> typedef struct _CCECCryptor *CCECCryptorRef;
</span><span class="cx"> extern "C" CCCryptorStatus CCECCryptorGeneratePair(size_t keysize, CCECCryptorRef *publicKey, CCECCryptorRef *privateKey);
</span><span class="cx"> extern "C" void CCECCryptorRelease(CCECCryptorRef key);
</span><ins>+extern "C" CCCryptorStatus CCECCryptorImportKey(CCECKeyExternalFormat format, void *keyPackage, size_t keyPackageLen, CCECKeyType keyType, CCECCryptorRef *key);
+extern "C" CCCryptorStatus CCECCryptorExportKey(CCECKeyExternalFormat format, void *keyPackage, size_t *keyPackageLen, CCECKeyType keyType, CCECCryptorRef key);
+extern "C" int CCECGetKeySize(CCECCryptorRef key);
+extern "C" CCCryptorStatus CCECCryptorCreateFromData(size_t keySize, uint8_t *qX, size_t qXLength, uint8_t *qY, size_t qYLength, CCECCryptorRef *ref);
+extern "C" CCCryptorStatus CCECCryptorGetKeyComponents(CCECCryptorRef ecKey, size_t *keySize, uint8_t *qX, size_t *qXLength, uint8_t *qY, size_t *qYLength, uint8_t *d, size_t *dLength);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> extern "C" CCCryptorStatus CCCryptorGCM(CCOperation op, CCAlgorithm alg, const void* key, size_t keyLength, const void* iv, size_t ivLen, const void* aData, size_t aDataLen, const void* dataIn, size_t dataInLength, void* dataOut, void* tag, size_t* tagLength);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithm.h (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithm.h 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithm.h 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> virtual void verify(Ref<CryptoKey>&&, Vector<uint8_t>&& signature, Vector<uint8_t>&&, BoolCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
</span><span class="cx"> virtual void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
</span><span class="cx"> virtual void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, ExceptionCallback&&, ScriptExecutionContext&);
</span><ins>+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=169262
</ins><span class="cx"> virtual void importKey(SubtleCrypto::KeyFormat, KeyData&&, const std::unique_ptr<CryptoAlgorithmParameters>&&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, ExceptionCallback&&);
</span><span class="cx"> virtual void exportKey(SubtleCrypto::KeyFormat, Ref<CryptoKey>&&, KeyDataCallback&&, ExceptionCallback&&);
</span><span class="cx"> virtual void wrapKey(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -65,6 +65,86 @@
</span><span class="cx"> callback(WTFMove(pair));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CryptoAlgorithmECDH::importKey(SubtleCrypto::KeyFormat format, KeyData&& data, const std::unique_ptr<CryptoAlgorithmParameters>&& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyCallback&& callback, ExceptionCallback&& exceptionCallback)
+{
+ ASSERT(parameters);
+ const auto& ecParameters = downcast<CryptoAlgorithmEcKeyParams>(*parameters);
+
+ RefPtr<CryptoKeyEC> result;
+ switch (format) {
+ case SubtleCrypto::KeyFormat::Jwk: {
+ JsonWebKey key = WTFMove(WTF::get<JsonWebKey>(data));
+
+ bool isUsagesAllowed = false;
+ if (!key.d.isNull()) {
+ isUsagesAllowed = isUsagesAllowed || !(usages ^ CryptoKeyUsageDeriveKey);
+ isUsagesAllowed = isUsagesAllowed || !(usages ^ CryptoKeyUsageDeriveBits);
+ isUsagesAllowed = isUsagesAllowed || !(usages ^ (CryptoKeyUsageDeriveKey | CryptoKeyUsageDeriveBits));
+ }
+ isUsagesAllowed = isUsagesAllowed || !usages;
+ if (!isUsagesAllowed) {
+ exceptionCallback(SYNTAX_ERR);
+ return;
+ }
+
+ if (usages && !key.use.isNull() && key.use != "enc") {
+ exceptionCallback(DataError);
+ return;
+ }
+
+ result = CryptoKeyEC::importJwk(ecParameters.identifier, ecParameters.namedCurve, WTFMove(key), extractable, usages);
+ break;
+ }
+ case SubtleCrypto::KeyFormat::Raw:
+ if (usages) {
+ exceptionCallback(SYNTAX_ERR);
+ return;
+ }
+ result = CryptoKeyEC::importRaw(ecParameters.identifier, ecParameters.namedCurve, WTFMove(WTF::get<Vector<uint8_t>>(data)), extractable, usages);
+ break;
+ default:
+ exceptionCallback(NOT_SUPPORTED_ERR);
+ return;
+ }
+ if (!result) {
+ exceptionCallback(DataError);
+ return;
+ }
+
+ callback(*result);
+}
+
+void CryptoAlgorithmECDH::exportKey(SubtleCrypto::KeyFormat format, Ref<CryptoKey>&& key, KeyDataCallback&& callback, ExceptionCallback&& exceptionCallback)
+{
+ const auto& ecKey = downcast<CryptoKeyEC>(key.get());
+
+ if (!ecKey.keySizeInBits()) {
+ exceptionCallback(OperationError);
+ return;
+ }
+
+ KeyData result;
+ switch (format) {
+ case SubtleCrypto::KeyFormat::Jwk: {
+ result = ecKey.exportJwk();
+ break;
+ }
+ case SubtleCrypto::KeyFormat::Raw: {
+ if (ecKey.type() != CryptoKey::Type::Public) {
+ exceptionCallback(INVALID_ACCESS_ERR);
+ return;
+ }
+ result = ecKey.exportRaw();
+ break;
+ }
+ default:
+ exceptionCallback(NOT_SUPPORTED_ERR);
+ return;
+ }
+
+ callback(format, WTFMove(result));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmECDHh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.h (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.h 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDH.h 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> CryptoAlgorithmIdentifier identifier() const final;
</span><span class="cx">
</span><span class="cx"> void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, ExceptionCallback&&, ScriptExecutionContext&) final;
</span><ins>+ void importKey(SubtleCrypto::KeyFormat, KeyData&&, const std::unique_ptr<CryptoAlgorithmParameters>&&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, ExceptionCallback&&) final;
+ void exportKey(SubtleCrypto::KeyFormat, Ref<CryptoKey>&&, KeyDataCallback&&, ExceptionCallback&&) final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecryptognutlsCryptoKeyECGnuTLScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/gnutls/CryptoKeyECGnuTLS.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/gnutls/CryptoKeyECGnuTLS.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/gnutls/CryptoKeyECGnuTLS.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -41,6 +41,20 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t CryptoKeyEC::keySizeInBits() const
+{
+ notImplemented();
+
+ return 0;
+}
+
+Vector<uint8_t> CryptoKeyEC::exportRaw() const
+{
+ notImplemented();
+
+ return { };
+}
+
</ins><span class="cx"> std::optional<CryptoKeyPair> CryptoKeyEC::platformGeneratePair(CryptoAlgorithmIdentifier, NamedCurve, bool, CryptoKeyUsageBitmap)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -48,6 +62,32 @@
</span><span class="cx"> return std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportRaw(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
+{
+ notImplemented();
+
+ return nullptr;
+}
+
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportJWKPublic(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
+{
+ notImplemented();
+
+ return nullptr;
+}
+
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportJWKPrivate(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, Vector<uint8_t>&&, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
+{
+ notImplemented();
+
+ return nullptr;
+}
+
+void CryptoKeyEC::platformAddFieldElements(JsonWebKey&) const
+{
+ notImplemented();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyECcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyEC.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyEC.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyEC.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include "CryptoAlgorithmRegistry.h"
</span><span class="cx"> #include "CryptoKeyData.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "JsonWebKey.h"
+#include <wtf/text/Base64.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -37,6 +39,16 @@
</span><span class="cx"> static const char* const P256 = "P-256";
</span><span class="cx"> static const char* const P384 = "P-384";
</span><span class="cx">
</span><ins>+static std::optional<CryptoKeyEC::NamedCurve> toNamedCurve(const String& curve)
+{
+ if (curve == P256)
+ return CryptoKeyEC::NamedCurve::P256;
+ if (curve == P384)
+ return CryptoKeyEC::NamedCurve::P384;
+
+ return std::nullopt;
+}
+
</ins><span class="cx"> CryptoKeyEC::CryptoKeyEC(CryptoAlgorithmIdentifier identifier, NamedCurve curve, CryptoKeyType type, PlatformECKey platformKey, bool extractable, CryptoKeyUsageBitmap usages)
</span><span class="cx"> : CryptoKey(identifier, type, extractable, usages)
</span><span class="cx"> , m_platformKey(platformKey)
</span><span class="lines">@@ -44,17 +56,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<CryptoKeyPair> CryptoKeyEC::generatePair(CryptoAlgorithmIdentifier identifier, const String& namedCurve, bool extractable, CryptoKeyUsageBitmap usages)
</del><ins>+ExceptionOr<CryptoKeyPair> CryptoKeyEC::generatePair(CryptoAlgorithmIdentifier identifier, const String& curve, bool extractable, CryptoKeyUsageBitmap usages)
</ins><span class="cx"> {
</span><del>- NamedCurve curve;
- if (namedCurve == P256)
- curve = NamedCurve::P256;
- else if (namedCurve == P384)
- curve = NamedCurve::P384;
- else
</del><ins>+ auto namedCurve = toNamedCurve(curve);
+ if (!namedCurve)
</ins><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx">
</span><del>- auto result = platformGeneratePair(identifier, curve, extractable, usages);
</del><ins>+ auto result = platformGeneratePair(identifier, *namedCurve, extractable, usages);
</ins><span class="cx"> if (!result)
</span><span class="cx"> return Exception { OperationError };
</span><span class="cx">
</span><span class="lines">@@ -61,6 +69,68 @@
</span><span class="cx"> return WTFMove(*result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<CryptoKeyEC> CryptoKeyEC::importRaw(CryptoAlgorithmIdentifier identifier, const String& curve, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap usages)
+{
+ auto namedCurve = toNamedCurve(curve);
+ if (!namedCurve)
+ return nullptr;
+
+ return platformImportRaw(identifier, *namedCurve, WTFMove(keyData), extractable, usages);
+}
+
+RefPtr<CryptoKeyEC> CryptoKeyEC::importJwk(CryptoAlgorithmIdentifier identifier, const String& curve, JsonWebKey&& keyData, bool extractable, CryptoKeyUsageBitmap usages)
+{
+ if (keyData.kty != "EC")
+ return nullptr;
+ if (keyData.key_ops && ((keyData.usages & usages) != usages))
+ return nullptr;
+ if (keyData.ext && !keyData.ext.value() && extractable)
+ return nullptr;
+
+ if (keyData.crv.isNull() || curve != keyData.crv)
+ return nullptr;
+ auto namedCurve = toNamedCurve(keyData.crv);
+ if (!namedCurve)
+ return nullptr;
+
+ if (keyData.x.isNull() || keyData.y.isNull())
+ return nullptr;
+ Vector<uint8_t> x;
+ if (!WTF::base64URLDecode(keyData.x, x))
+ return nullptr;
+ Vector<uint8_t> y;
+ if (!WTF::base64URLDecode(keyData.y, y))
+ return nullptr;
+ if (keyData.d.isNull()) {
+ // import public key
+ return platformImportJWKPublic(identifier, *namedCurve, WTFMove(x), WTFMove(y), extractable, usages);
+ }
+
+ Vector<uint8_t> d;
+ if (!WTF::base64URLDecode(keyData.d, d))
+ return nullptr;
+ // import private key
+ return platformImportJWKPrivate(identifier, *namedCurve, WTFMove(x), WTFMove(y), WTFMove(d), extractable, usages);
+}
+
+JsonWebKey CryptoKeyEC::exportJwk() const
+{
+ JsonWebKey result;
+ result.kty = "EC";
+ switch (m_curve) {
+ case NamedCurve::P256:
+ result.crv = P256;
+ break;
+ case NamedCurve::P384:
+ result.crv = P384;
+ break;
+ }
+ result.key_ops = usages();
+ result.ext = extractable();
+ platformAddFieldElements(result);
+ return result;
+}
+
</ins><span class="cx"> std::unique_ptr<KeyAlgorithm> CryptoKeyEC::buildAlgorithm() const
</span><span class="cx"> {
</span><span class="cx"> String name = CryptoAlgorithmRegistry::singleton().name(algorithmIdentifier());
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyECh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyEC.h (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyEC.h 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyEC.h 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+struct JsonWebKey;
+
</ins><span class="cx"> class EcKeyAlgorithm : public KeyAlgorithm {
</span><span class="cx"> public:
</span><span class="cx"> EcKeyAlgorithm(const String& name, const String& curve)
</span><span class="lines">@@ -74,8 +76,15 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~CryptoKeyEC();
</span><span class="cx">
</span><del>- static ExceptionOr<CryptoKeyPair> generatePair(CryptoAlgorithmIdentifier, const String&, bool extractable, CryptoKeyUsageBitmap);
</del><ins>+ static ExceptionOr<CryptoKeyPair> generatePair(CryptoAlgorithmIdentifier, const String& curve, bool extractable, CryptoKeyUsageBitmap);
+ static RefPtr<CryptoKeyEC> importRaw(CryptoAlgorithmIdentifier, const String& curve, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap);
+ static RefPtr<CryptoKeyEC> importJwk(CryptoAlgorithmIdentifier, const String& curve, JsonWebKey&&, bool extractable, CryptoKeyUsageBitmap);
</ins><span class="cx">
</span><ins>+ Vector<uint8_t> exportRaw() const;
+ JsonWebKey exportJwk() const;
+
+ size_t keySizeInBits() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> CryptoKeyEC(CryptoAlgorithmIdentifier, NamedCurve, CryptoKeyType, PlatformECKey, bool extractable, CryptoKeyUsageBitmap);
</span><span class="cx">
</span><span class="lines">@@ -85,6 +94,10 @@
</span><span class="cx"> std::unique_ptr<CryptoKeyData> exportData() const final;
</span><span class="cx">
</span><span class="cx"> static std::optional<CryptoKeyPair> platformGeneratePair(CryptoAlgorithmIdentifier, NamedCurve, bool extractable, CryptoKeyUsageBitmap);
</span><ins>+ static RefPtr<CryptoKeyEC> platformImportRaw(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap);
+ static RefPtr<CryptoKeyEC> platformImportJWKPublic(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&& x, Vector<uint8_t>&& y, bool extractable, CryptoKeyUsageBitmap);
+ static RefPtr<CryptoKeyEC> platformImportJWKPrivate(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&& x, Vector<uint8_t>&& y, Vector<uint8_t>&& d, bool extractable, CryptoKeyUsageBitmap);
+ void platformAddFieldElements(JsonWebKey&) const;
</ins><span class="cx">
</span><span class="cx"> PlatformECKey m_platformKey;
</span><span class="cx"> NamedCurve m_curve;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (usages && !keyData.use.isNull() && keyData.use != "sig")
</span><span class="cx"> return nullptr;
</span><del>- if (keyData.usages && ((keyData.usages & usages) != usages))
</del><ins>+ if (keyData.key_ops && ((keyData.usages & usages) != usages))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (keyData.ext && !keyData.ext.value() && extractable)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyRSAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (keyData.kty != "RSA")
</span><span class="cx"> return nullptr;
</span><del>- if (keyData.usages && ((keyData.usages & usages) != usages))
</del><ins>+ if (keyData.key_ops && ((keyData.usages & usages) != usages))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (keyData.ext && !keyData.ext.value() && extractable)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoKeyECMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyECMac.cpp (213559 => 213560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoKeyECMac.cpp 2017-03-08 01:50:40 UTC (rev 213559)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyECMac.cpp 2017-03-08 02:09:38 UTC (rev 213560)
</span><span class="lines">@@ -29,30 +29,80 @@
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><span class="cx"> #include "CommonCryptoUtilities.h"
</span><ins>+#include "JsonWebKey.h"
+#include <wtf/text/Base64.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static unsigned char InitialOctet = 0x04; // Per Section 2.3.3 of http://www.secg.org/sec1-v2.pdf
+
+// Per Section 2.3.4 of http://www.secg.org/sec1-v2.pdf
+// We only support uncompressed point format.
+static bool doesUncompressedPointMatchNamedCurve(CryptoKeyEC::NamedCurve curve, size_t size)
+{
+ switch (curve) {
+ case CryptoKeyEC::NamedCurve::P256:
+ return size == 65;
+ case CryptoKeyEC::NamedCurve::P384:
+ return size == 97;
+ }
+
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+// Per Section 2.3.5 of http://www.secg.org/sec1-v2.pdf
+static bool doesFieldElementMatchNamedCurve(CryptoKeyEC::NamedCurve curve, size_t size)
+{
+ switch (curve) {
+ case CryptoKeyEC::NamedCurve::P256:
+ return size == 32;
+ case CryptoKeyEC::NamedCurve::P384:
+ return size == 48;
+ }
+
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+static size_t getKeySizeFromNamedCurve(CryptoKeyEC::NamedCurve curve)
+{
+ switch (curve) {
+ case CryptoKeyEC::NamedCurve::P256:
+ return 256;
+ case CryptoKeyEC::NamedCurve::P384:
+ return 384;
+ }
+
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
</ins><span class="cx"> CryptoKeyEC::~CryptoKeyEC()
</span><span class="cx"> {
</span><span class="cx"> CCECCryptorRelease(m_platformKey);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t CryptoKeyEC::keySizeInBits() const
+{
+ int result = CCECGetKeySize(m_platformKey);
+ return result ? result : 0;
+}
+
+Vector<uint8_t> CryptoKeyEC::exportRaw() const
+{
+ Vector<uint8_t> result(keySizeInBits() / 4 + 1); // Per Section 2.3.4 of http://www.secg.org/sec1-v2.pdf
+ size_t size = result.size();
+ CCECCryptorExportKey(kCCImportKeyBinary, result.data(), &size, ccECKeyPublic, m_platformKey);
+ return result;
+}
+
</ins><span class="cx"> std::optional<CryptoKeyPair> CryptoKeyEC::platformGeneratePair(CryptoAlgorithmIdentifier identifier, NamedCurve curve, bool extractable, CryptoKeyUsageBitmap usages)
</span><span class="cx"> {
</span><del>- size_t size;
- switch (curve) {
- case NamedCurve::P256:
- size = 256;
- break;
- case NamedCurve::P384:
- size = 384;
- break;
- }
-
</del><ins>+ size_t size = getKeySizeFromNamedCurve(curve);
</ins><span class="cx"> CCECCryptorRef ccPublicKey;
</span><span class="cx"> CCECCryptorRef ccPrivateKey;
</span><del>- CCCryptorStatus status = CCECCryptorGeneratePair(size, &ccPublicKey, &ccPrivateKey);
- if (status)
</del><ins>+ if (CCECCryptorGeneratePair(size, &ccPublicKey, &ccPrivateKey))
</ins><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><span class="cx"> auto publicKey = CryptoKeyEC::create(identifier, curve, CryptoKeyType::Public, ccPublicKey, true, usages);
</span><span class="lines">@@ -60,6 +110,69 @@
</span><span class="cx"> return CryptoKeyPair { WTFMove(publicKey), WTFMove(privateKey) };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportRaw(CryptoAlgorithmIdentifier identifier, NamedCurve curve, Vector<uint8_t>&& keyData, bool extractable, CryptoKeyUsageBitmap usages)
+{
+ if (!doesUncompressedPointMatchNamedCurve(curve, keyData.size()))
+ return nullptr;
+
+ CCECCryptorRef ccPublicKey;
+ if (CCECCryptorImportKey(kCCImportKeyBinary, keyData.data(), keyData.size(), ccECKeyPublic, &ccPublicKey))
+ return nullptr;
+
+ return create(identifier, curve, CryptoKeyType::Public, ccPublicKey, extractable, usages);
+}
+
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportJWKPublic(CryptoAlgorithmIdentifier identifier, NamedCurve curve, Vector<uint8_t>&& x, Vector<uint8_t>&& y, bool extractable, CryptoKeyUsageBitmap usages)
+{
+ if (!doesFieldElementMatchNamedCurve(curve, x.size()) || !doesFieldElementMatchNamedCurve(curve, y.size()))
+ return nullptr;
+
+ size_t size = getKeySizeFromNamedCurve(curve);
+ CCECCryptorRef ccPublicKey;
+ if (CCECCryptorCreateFromData(size, x.data(), x.size(), y.data(), y.size(), &ccPublicKey))
+ return nullptr;
+
+ return create(identifier, curve, CryptoKeyType::Public, ccPublicKey, extractable, usages);
+}
+
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportJWKPrivate(CryptoAlgorithmIdentifier identifier, NamedCurve curve, Vector<uint8_t>&& x, Vector<uint8_t>&& y, Vector<uint8_t>&& d, bool extractable, CryptoKeyUsageBitmap usages)
+{
+ if (!doesFieldElementMatchNamedCurve(curve, x.size()) || !doesFieldElementMatchNamedCurve(curve, y.size()) || !doesFieldElementMatchNamedCurve(curve, d.size()))
+ return nullptr;
+
+ // A hack to CommonCrypto since it doesn't provide API for creating private keys directly from x, y, d.
+ // BinaryInput = InitialOctet + X + Y + D
+ Vector<uint8_t> binaryInput;
+ binaryInput.append(InitialOctet);
+ binaryInput.appendVector(x);
+ binaryInput.appendVector(y);
+ binaryInput.appendVector(d);
+
+ CCECCryptorRef ccPrivateKey;
+ if (CCECCryptorImportKey(kCCImportKeyBinary, binaryInput.data(), binaryInput.size(), ccECKeyPrivate, &ccPrivateKey))
+ return nullptr;
+
+ return create(identifier, curve, CryptoKeyType::Private, ccPrivateKey, extractable, usages);
+}
+
+void CryptoKeyEC::platformAddFieldElements(JsonWebKey& jwk) const
+{
+ size_t size = getKeySizeFromNamedCurve(m_curve);
+ size_t sizeInBytes = size / 8;
+ Vector<uint8_t> x(sizeInBytes);
+ size_t xSize = x.size();
+ Vector<uint8_t> y(sizeInBytes);
+ size_t ySize = y.size();
+ Vector<uint8_t> d(sizeInBytes);
+ size_t dSize = d.size();
+
+ CCECCryptorGetKeyComponents(m_platformKey, &size, x.data(), &xSize, y.data(), &ySize, d.data(), &dSize);
+ jwk.x = base64URLEncode(x);
+ jwk.y = base64URLEncode(y);
+ if (type() == Type::Private)
+ jwk.d = base64URLEncode(d);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span></span></pre>
</div>
</div>
</body>
</html>