From 3f139512d0a15a031cc08e0d1a4e58aaac2c315a Mon Sep 17 00:00:00 2001
From: mwatson2 <watsonm@netflix.com>
Date: Fri, 26 Aug 2016 12:45:14 -0400
Subject: [PATCH] Fix #87: Require JSON.parse to be executed in a clean global
 (#115)

* Fix #88: Use a clean global object for conversion from object to JSON for JWK
---
 spec/Overview-WebCryptoAPI.xml | 9 +++++----
 spec/Overview.html             | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/spec/Overview-WebCryptoAPI.xml b/spec/Overview-WebCryptoAPI.xml
index 4a55124..1dbeb98 100644
--- a/spec/Overview-WebCryptoAPI.xml
+++ b/spec/Overview-WebCryptoAPI.xml
@@ -775,8 +775,8 @@ of contents, section numbers, certain processing instructions).
           <li>
             <p>
               Let <var>result</var> be the object literal that results from executing the
-              <code>JSON.parse</code> internal function, with <code>text</code>
-              argument set to a JavaScript String containing <var>json</var>.
+              <code>JSON.parse</code> internal function in the context of a new global object,
+              with <code>text</code> argument set to a JavaScript String containing <var>json</var>.
             </p>
           </li>
           <li>
@@ -2395,7 +2395,8 @@ interface <dfn id="dfn-SubtleCrypto">SubtleCrypto</dfn> {
                       <li>
                         <p>
                           Convert <var>key</var> to an ECMAScript Object, as specified in [
-                          <a href="#WebIDL">WebIDL</a>].
+                          <a href="#WebIDL">WebIDL</a>], performing the conversion in the
+                          context of a new global object.
                         </p>
                       </li>
                       <li>
@@ -2403,7 +2404,7 @@ interface <dfn id="dfn-SubtleCrypto">SubtleCrypto</dfn> {
                           Let <var>json</var> be the result of representing <var>key</var> as a
                           UTF-16 string conforming to the JSON grammar; for example, by executing
                           the <code>JSON.stringify</code> algorithm specified in
-                          <a href="#ECMA-262">ECMA262</a>.
+                          <a href="#ECMA-262">ECMA262</a> in the context of a new global object.
                         </p>
                       </li>
                       <li>
diff --git a/spec/Overview.html b/spec/Overview.html
index 370b704..99bb21d 100644
--- a/spec/Overview.html
+++ b/spec/Overview.html
@@ -790,8 +790,8 @@ <h2>9. Terminology</h2>
           <li>
             <p>
               Let <var>result</var> be the object literal that results from executing the
-              <code>JSON.parse</code> internal function, with <code>text</code>
-              argument set to a JavaScript String containing <var>json</var>.
+              <code>JSON.parse</code> internal function in the context of a new global object,
+              with <code>text</code> argument set to a JavaScript String containing <var>json</var>.
             </p>
           </li>
           <li>
@@ -2365,7 +2365,8 @@ <h4>14.3.11. The wrapKey method</h4>
                       <li>
                         <p>
                           Convert <var>key</var> to an ECMAScript Object, as specified in [
-                          <a href="#WebIDL">WebIDL</a>].
+                          <a href="#WebIDL">WebIDL</a>], performing the conversion in the
+                          context of a new global object.
                         </p>
                       </li>
                       <li>
@@ -2373,7 +2374,7 @@ <h4>14.3.11. The wrapKey method</h4>
                           Let <var>json</var> be the result of representing <var>key</var> as a
                           UTF-16 string conforming to the JSON grammar; for example, by executing
                           the <code>JSON.stringify</code> algorithm specified in
-                          <a href="#ECMA-262">ECMA262</a>.
+                          <a href="#ECMA-262">ECMA262</a> in the context of a new global object.
                         </p>
                       </li>
                       <li>