WebKit Bugzilla
Attachment 359585 Details for
Bug 193607
: C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch v1
bug-193607-20190118213513.patch (text/plain), 8.86 KB, created by
David Kilzer (:ddkilzer)
on 2019-01-18 21:35:14 PST
(
hide
)
Description:
Patch v1
Filename:
MIME Type:
Creator:
David Kilzer (:ddkilzer)
Created:
2019-01-18 21:35:14 PST
Size:
8.86 KB
patch
obsolete
>Subversion Revision: 240197 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 6279ed42fa06eb2a186748308ff53cd583f02601..84f802355a4bfeff2b40c8238297ba34b49bf949 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,18 @@ >+2019-01-18 David Kilzer <ddkilzer@apple.com> >+ >+ C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated >+ <https://webkit.org/b/193607> >+ <rdar://problem/47334613> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp: Copied from Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h. >+ * Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h: >+ Move constant values to ClientCertificateAuthenticationXPCConstants.cpp. >+ * SourcesCocoa.txt: Add ClientCertificateAuthenticationXPCConstants.cpp. >+ * UnifiedSources-input.xcfilelist: Ditto. >+ * WebKit.xcodeproj/project.pbxproj: Ditto. >+ > 2019-01-18 David Kilzer <ddkilzer@apple.com> > > [WebKit] Change Xcode folders to map to folders on disk >diff --git a/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp b/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..15264473514a22483ba8e8f68a01920f1c8de311 >--- /dev/null >+++ b/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp >@@ -0,0 +1,42 @@ >+/* >+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (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 "config.h" >+#include "ClientCertificateAuthenticationXPCConstants.h" >+ >+#if HAVE(SEC_KEY_PROXY) >+ >+namespace WebKit { >+ >+const char clientCertificateAuthenticationXPCCertificatesKey[] = "certificates"; >+const char clientCertificateAuthenticationXPCChallengeIDKey[] = "challenge-id"; >+const char clientCertificateAuthenticationXPCMessageNameKey[] = "message-name"; >+const char clientCertificateAuthenticationXPCMessageNameValue[] = "client-certificate-credential"; >+const char clientCertificateAuthenticationXPCPersistenceKey[] = "persistence"; >+const char clientCertificateAuthenticationXPCSecKeyProxyEndpointKey[] = "sec-key-proxy-endpoint"; >+ >+} // namespace WebKit >+ >+#endif >diff --git a/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h b/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h >index c843946d32defe28fefde0fa566348b893b0a4a5..de9646c78dba8af465e629fbbe4fbe993999f227 100644 >--- a/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h >+++ b/Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2018 Apple Inc. All rights reserved. >+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -29,12 +29,12 @@ > > namespace WebKit { > >-const char clientCertificateAuthenticationXPCMessageNameKey[] = "message-name"; >-const char clientCertificateAuthenticationXPCMessageNameValue[] = "client-certificate-credential"; >-const char clientCertificateAuthenticationXPCChallengeIDKey[] = "challenge-id"; >-const char clientCertificateAuthenticationXPCSecKeyProxyEndpointKey[] = "sec-key-proxy-endpoint"; >-const char clientCertificateAuthenticationXPCCertificatesKey[] = "certificates"; >-const char clientCertificateAuthenticationXPCPersistenceKey[] = "persistence"; >+const char[] clientCertificateAuthenticationXPCCertificatesKey; >+const char[] clientCertificateAuthenticationXPCChallengeIDKey; >+const char[] clientCertificateAuthenticationXPCMessageNameKey; >+const char[] clientCertificateAuthenticationXPCMessageNameValue; >+const char[] clientCertificateAuthenticationXPCPersistenceKey; >+const char[] clientCertificateAuthenticationXPCSecKeyProxyEndpointKey; > > } // namespace WebKit > >diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt >index 16e88f0ab1ff0bc7d57b137182e697d864f19391..a6fe03a8f6a427bc659bb026353dd280f9ab9c7e 100644 >--- a/Source/WebKit/SourcesCocoa.txt >+++ b/Source/WebKit/SourcesCocoa.txt >@@ -123,6 +123,7 @@ Shared/cf/CookieStorageUtilsCF.mm > Shared/cg/ShareableBitmapCG.cpp > > Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm >+Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp > > Shared/Cocoa/APIDataCocoa.mm > Shared/Cocoa/APIObject.mm >diff --git a/Source/WebKit/UnifiedSources-input.xcfilelist b/Source/WebKit/UnifiedSources-input.xcfilelist >index e6c7a0c7a2660e18a82e3c1525c892d706886f57..15b8099e69dbfcd2837789d6db0c1b9ef336e235 100644 >--- a/Source/WebKit/UnifiedSources-input.xcfilelist >+++ b/Source/WebKit/UnifiedSources-input.xcfilelist >@@ -170,6 +170,7 @@ $(SRCROOT)/Shared/AssistedNodeInformation.cpp > $(SRCROOT)/Shared/AsyncRequest.cpp > $(SRCROOT)/Shared/Authentication/AuthenticationManager.cpp > $(SRCROOT)/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm >+$(SRCROOT)/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.cpp > $(SRCROOT)/Shared/BlobDataFileReferenceWithSandboxExtension.cpp > $(SRCROOT)/Shared/CacheModel.cpp > $(SRCROOT)/Shared/ChildProcess.cpp >diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >index 306e9aa2f705b53f21eb8cfcb86c2def371cc8bd..bd94399f63c46300784df1f8fac9758697990a0d 100644 >--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj >+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >@@ -3068,6 +3068,7 @@ > 41FBE823206DA79C000F0741 /* NetworkContentRuleListManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NetworkContentRuleListManager.messages.in; sourceTree = "<group>"; }; > 41FBE824206DA79C000F0741 /* NetworkContentRuleListManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkContentRuleListManager.cpp; sourceTree = "<group>"; }; > 4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedMemoryCocoa.cpp; sourceTree = "<group>"; }; >+ 44A481C621F2D27B00F2F919 /* ClientCertificateAuthenticationXPCConstants.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ClientCertificateAuthenticationXPCConstants.cpp; sourceTree = "<group>"; }; > 460F488D1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSWContextManagerConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/WebSWContextManagerConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; > 460F488E1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSWContextManagerConnectionMessages.h; path = DerivedSources/WebKit2/WebSWContextManagerConnectionMessages.h; sourceTree = BUILT_PRODUCTS_DIR; }; > 462107D71F38DBD300DD7810 /* PingLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PingLoad.cpp; sourceTree = "<group>"; }; >@@ -6735,6 +6736,7 @@ > isa = PBXGroup; > children = ( > 57B4B45D20B504AB00D4AD79 /* AuthenticationManagerCocoa.mm */, >+ 44A481C621F2D27B00F2F919 /* ClientCertificateAuthenticationXPCConstants.cpp */, > 57B4B45E20B504AB00D4AD79 /* ClientCertificateAuthenticationXPCConstants.h */, > ); > path = cocoa;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193607
:
359585
|
359588
|
359612
|
359706