Attachment 349321 Details for Bug 189425 – Patch

[patch] Patch

bug-189425.diff (text/plain), 7.12 KB, created by Don Olmstead on 2018-09-10 12:05:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-09-10 12:05:54 PDT

Size: 7.12 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 593804b6fda..dbca4aa5317 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-09-10  Don Olmstead  <don.olmstead@sony.com>
>+
>+        CBOR coders should only be compiled if WebAuthN is enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189425
>+
>+        Reviewed by Jiewen Tan.
>+
>+        No new tests. No change in behavior.
>+
>+        Just places ENABLE(WEB_AUTHN) guards around all CBOR files.
>+
>+        * Modules/webauthn/cbor/CBORBinary.h:
>+        * Modules/webauthn/cbor/CBORReader.cpp:
>+        * Modules/webauthn/cbor/CBORReader.h:
>+        * Modules/webauthn/cbor/CBORValue.cpp:
>+        * Modules/webauthn/cbor/CBORValue.h:
>+        * Modules/webauthn/cbor/CBORWriter.cpp:
>+        * Modules/webauthn/cbor/CBORWriter.h:
>+
> 2018-09-10  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         [WTF] Add Markable<T, Traits>
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORBinary.h b/Source/WebCore/Modules/webauthn/cbor/CBORBinary.h
>index a72a44e5989..008b651c478 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORBinary.h
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORBinary.h
>@@ -27,10 +27,12 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-#include <stdint.h>
>-
> #pragma once
> 
>+#if ENABLE(WEB_AUTHN)
>+
>+#include <stdint.h>
>+
> namespace cbor {
> 
> namespace constants {
>@@ -57,3 +59,5 @@ static constexpr uint8_t kAdditionalInformation8Bytes = 27u;
> } // namespace constants
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORReader.cpp b/Source/WebCore/Modules/webauthn/cbor/CBORReader.cpp
>index bd6c28e7041..e9d926a336c 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORReader.cpp
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORReader.cpp
>@@ -30,6 +30,8 @@
> #include "config.h"
> #include "CBORReader.h"
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include "CBORBinary.h"
> #include <limits>
> #include <utility>
>@@ -375,3 +377,5 @@ const char* CBORReader::errorCodeToString(DecoderError error)
> }
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORReader.h b/Source/WebCore/Modules/webauthn/cbor/CBORReader.h
>index e2869f9ec57..16164ded4e4 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORReader.h
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORReader.h
>@@ -29,6 +29,8 @@
> 
> #pragma once
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include "CBORValue.h"
> #include <stddef.h>
> 
>@@ -130,3 +132,5 @@ private:
> };
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORValue.cpp b/Source/WebCore/Modules/webauthn/cbor/CBORValue.cpp
>index 827329ac393..25ed98b91f8 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORValue.cpp
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORValue.cpp
>@@ -30,6 +30,8 @@
> #include "config.h"
> #include "CBORValue.h"
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include <new>
> #include <utility>
> 
>@@ -293,3 +295,5 @@ void CBORValue::internalCleanup()
> }
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORValue.h b/Source/WebCore/Modules/webauthn/cbor/CBORValue.h
>index 5835d7409f1..e2db0e12738 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORValue.h
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORValue.h
>@@ -29,6 +29,8 @@
> 
> #pragma once
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include <stdint.h>
> #include <wtf/Noncopyable.h>
> #include <wtf/StdMap.h>
>@@ -188,3 +190,5 @@ private:
> };
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORWriter.cpp b/Source/WebCore/Modules/webauthn/cbor/CBORWriter.cpp
>index 2c0cabcdf58..71f58c026ab 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORWriter.cpp
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORWriter.cpp
>@@ -30,6 +30,8 @@
> #include "config.h"
> #include "CBORWriter.h"
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include "CBORBinary.h"
> 
> namespace cbor {
>@@ -190,3 +192,5 @@ size_t CBORWriter::getNumUintBytes(uint64_t value)
> }
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Source/WebCore/Modules/webauthn/cbor/CBORWriter.h b/Source/WebCore/Modules/webauthn/cbor/CBORWriter.h
>index 95391b51ce9..5f946c10055 100644
>--- a/Source/WebCore/Modules/webauthn/cbor/CBORWriter.h
>+++ b/Source/WebCore/Modules/webauthn/cbor/CBORWriter.h
>@@ -29,6 +29,8 @@
> 
> #pragma once
> 
>+#if ENABLE(WEB_AUTHN)
>+
> #include "CBORValue.h"
> #include <stddef.h>
> 
>@@ -112,3 +114,5 @@ private:
> };
> 
> } // namespace cbor
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index df44f5612f1..ef418f1863e 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-10  Don Olmstead  <don.olmstead@sony.com>
>+
>+        CBOR coders should only be compiled if WebAuthN is enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189425
>+
>+        Reviewed by Jiewen Tan.
>+
>+        Just places ENABLE(WEB_AUTHN) guards around CBOR test files.
>+
>+        * TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp:
>+        * TestWebKitAPI/Tests/WebCore/CBORValueTest.cpp:
>+        * TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp:
>+
> 2018-09-10  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         [WTF] Add Markable<T, Traits>
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp b/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp
>index 14002b3763b..0a929a0f6a4 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/CBORReaderTest.cpp
>@@ -28,8 +28,10 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include "config.h"
>-#include <WebCore/CBORReader.h>
> 
>+#if ENABLE(WEB_AUTHN)
>+
>+#include <WebCore/CBORReader.h>
> #include <limits>
> #include <utility>
> 
>@@ -763,3 +765,5 @@ TEST(CBORReaderTest, TestUnsupportedSimplevalue)
> }
> 
> } // namespace TestWebKitAPI
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/CBORValueTest.cpp b/Tools/TestWebKitAPI/Tests/WebCore/CBORValueTest.cpp
>index 3d7d917e8df..a2d6b89f272 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/CBORValueTest.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/CBORValueTest.cpp
>@@ -29,8 +29,9 @@
> 
> #include "config.h"
> 
>-#include <WebCore/CBORValue.h>
>+#if ENABLE(WEB_AUTHN)
> 
>+#include <WebCore/CBORValue.h>
> #include <utility>
> 
> namespace TestWebKitAPI {
>@@ -379,3 +380,5 @@ TEST(CBORValueTest, SelfSwap)
> }
> 
> } // namespace TestWebKitAPI
>+
>+#endif // ENABLE(WEB_AUTHN)
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp b/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp
>index e1c8465b0a4..1961a6cf39d 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/CBORWriterTest.cpp
>@@ -29,8 +29,9 @@
> 
> #include "config.h"
> 
>-#include <WebCore/CBORWriter.h>
>+#if ENABLE(WEB_AUTHN)
> 
>+#include <WebCore/CBORWriter.h>
> #include <limits>
> 
> // Leveraging RFC 7049 examples from https://github.com/cbor/test-vectors/blob/master/appendix_a.json.
>@@ -460,3 +461,5 @@ TEST(CBORWriterTest, OverlyNestedCBOR)
> }
> 
> } // namespace TestWebKitAPI
>+
>+#endif // ENABLE(WEB_AUTHN)

Actions: View | Formatted Diff | Diff

Attachments on bug 189425: 349172 | 349321