Changeset 175374 in webkit
- Timestamp:
- Oct 30, 2014, 11:48:43 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r175361 r175374 1 2014-10-30 Dan Bernstein <mitz@apple.com> 2 3 When a client certificate is rejected, Safari says the website didn’t accept the certificate “unknown” instead of naming the certificate 4 https://bugs.webkit.org/show_bug.cgi?id=138216 5 6 Reviewed by Alexey Proskuryakov. 7 8 * Shared/cf/ArgumentCodersCF.cpp: 9 (IPC::typeFromCFTypeRef): Remove no-longer-necessary platform guards around SecIdentityRef. 10 (IPC::encode): Ditto. 11 (IPC::decode): Ditto. 12 * Shared/mac/WebCoreArgumentCodersMac.mm: 13 (IPC::ArgumentCoder<ResourceError>::encodePlatformData): If NSErrorClientCertificateChainKey 14 is present in the error’s userInfo dictionary, assert that it’s an array of identities and 15 certificates, and include it in the filtered dictionary. 16 1 17 2014-10-29 Hunseop Jeong <hs85.jeong@samsung.com> 2 18 -
trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
r171485 r175374 81 81 CFURL, 82 82 SecCertificate, 83 #if PLATFORM(IOS)84 83 SecIdentity, 85 #endif86 84 #if HAVE(SEC_KEYCHAIN) 87 85 SecKeychainItem, … … 122 120 if (typeID == SecCertificateGetTypeID()) 123 121 return SecCertificate; 124 #if PLATFORM(IOS)125 122 if (typeID == SecIdentityGetTypeID()) 126 123 return SecIdentity; 127 #endif128 124 #if HAVE(SEC_KEYCHAIN) 129 125 if (typeID == SecKeychainItemGetTypeID()) … … 174 170 encode(encoder, (SecCertificateRef)typeRef); 175 171 return; 176 #if PLATFORM(IOS)177 172 case SecIdentity: 178 173 encode(encoder, (SecIdentityRef)(typeRef)); 179 174 return; 180 #endif181 175 #if HAVE(SEC_KEYCHAIN) 182 176 case SecKeychainItem: … … 271 265 return true; 272 266 } 273 #if PLATFORM(IOS)274 267 case SecIdentity: { 275 268 RetainPtr<SecIdentityRef> identity; … … 279 272 return true; 280 273 } 281 #endif282 274 #if HAVE(SEC_KEYCHAIN) 283 275 case SecKeychainItem: { -
trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
r175275 r175374 199 199 }]; 200 200 201 if (NSArray *clientIdentityAndCertificates = [userInfo objectForKey:@"NSErrorClientCertificateChainKey"]) { 202 ASSERT([clientIdentityAndCertificates isKindOfClass:[NSArray class]]); 203 ASSERT(^{ 204 for (id object in clientIdentityAndCertificates) { 205 if (CFGetTypeID(object) != SecIdentityGetTypeID() && CFGetTypeID(object) != SecCertificateGetTypeID()) 206 return false; 207 } 208 return true; 209 }()); 210 211 CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorClientCertificateChainKey", clientIdentityAndCertificates); 212 }; 213 201 214 IPC::encode(encoder, filteredUserInfo.get()); 202 215
Note:
See TracChangeset
for help on using the changeset viewer.