Changeset 169682 in webkit
- Timestamp:
- Jun 8, 2014 12:28:40 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r169680 r169682 1 2014-06-08 Dan Bernstein <mitz@apple.com> 2 3 <rdar://problem/17208234> [Mac] Client-certificate authentication isn’t working when using the modern API 4 https://bugs.webkit.org/show_bug.cgi?id=133617 5 6 Reviewed by Sam Weinig. 7 8 * Shared/WebCoreArgumentCoders.cpp: 9 (IPC::ArgumentCoder<Credential>::encode): Encode certificate credentials on Mac as well. 10 (IPC::ArgumentCoder<Credential>::decode): Decode certificate credentials on Mac as well. 11 12 * Shared/cf/ArgumentCodersCF.cpp: 13 (IPC::encode): Use OS X API for getting a persistent reference to a key. 14 (IPC::decode): Use OS X API for getting a key from a persistent reference. 15 16 * Shared/cf/ArgumentCodersCF.h: Make identity coding available on Mac as well. 17 1 18 2014-06-07 Anders Carlsson <andersca@apple.com> 2 19 -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
r169679 r169682 495 495 void ArgumentCoder<Credential>::encode(ArgumentEncoder& encoder, const Credential& credential) 496 496 { 497 #if CERTIFICATE_CREDENTIALS_SUPPORTED && PLATFORM(IOS)497 #if CERTIFICATE_CREDENTIALS_SUPPORTED 498 498 encoder.encodeEnum(credential.type()); 499 499 … … 516 516 bool ArgumentCoder<Credential>::decode(ArgumentDecoder& decoder, Credential& credential) 517 517 { 518 #if CERTIFICATE_CREDENTIALS_SUPPORTED && PLATFORM(IOS)518 #if CERTIFICATE_CREDENTIALS_SUPPORTED 519 519 CredentialType type; 520 520 -
trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
r169658 r169682 37 37 #endif 38 38 39 #if PLATFORM(IOS)40 39 #if defined(__has_include) && __has_include(<Security/SecIdentityPriv.h>) 41 40 #include <Security/SecIdentityPriv.h> … … 44 43 extern "C" SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey); 45 44 45 #if PLATFORM(IOS) 46 46 #if defined(__has_include) && __has_include(<Security/SecKeyPriv.h>) 47 47 #include <Security/SecKeyPriv.h> … … 592 592 } 593 593 594 #if PLATFORM(IOS)595 594 void encode(ArgumentEncoder& encoder, SecIdentityRef identity) 596 595 { … … 604 603 605 604 CFDataRef keyData = nullptr; 605 #if PLATFORM(IOS) 606 606 SecKeyCopyPersistentRef(key, &keyData); 607 #endif 608 #if PLATFORM(MAC) 609 SecKeychainItemCreatePersistentReference((SecKeychainItemRef)key, &keyData); 610 #endif 607 611 CFRelease(key); 608 612 … … 632 636 633 637 SecKeyRef key = nullptr; 638 #if PLATFORM(IOS) 634 639 SecKeyFindWithPersistentRef(keyData.get(), &key); 640 #endif 641 #if PLATFORM(MAC) 642 SecKeychainItemCopyFromPersistentReference(keyData.get(), (SecKeychainItemRef*)&key); 643 #endif 635 644 if (key) { 636 645 result = adoptCF(SecIdentityCreate(kCFAllocatorDefault, certificate.get(), key)); … … 640 649 return true; 641 650 } 642 #endif643 651 644 652 #if HAVE(SEC_KEYCHAIN) -
trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
r169658 r169682 79 79 bool decode(ArgumentDecoder&, RetainPtr<SecCertificateRef>& result); 80 80 81 #if PLATFORM(IOS)82 81 // SecIdentityRef 83 82 void encode(ArgumentEncoder&, SecIdentityRef); 84 83 bool decode(ArgumentDecoder&, RetainPtr<SecIdentityRef>& result); 85 #endif86 84 87 85 #if HAVE(SEC_KEYCHAIN)
Note: See TracChangeset
for help on using the changeset viewer.