201903 2019-09-17 22:01:12 -0700 Remove alternate declaration of CCECCryptorImportKey 2019-09-19 23:02:24 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=195754 https://bugs.webkit.org/show_bug.cgi?id=201851 InRadar P2 Normal --- 1 krollin krollin ap bfulgham cdumez commit-queue webkit-bug-importer oldest_to_newest 1571813 0 krollin 2019-09-17 22:01:12 -0700 In macOS 10.15 and iOS 13.0 SDKs, the keyPackage parameter of CCECCryptorImportKey() was changed from "void*" to "const void*". This change was accounted for in Bug 195754 by making the same change to the parallel declarations in CommonCryptoSPI.h. But since this header also needed to be used in macOS 10.14 contexts, the old declaration was also kept. But since this function is a "C" function, the types of parameters are not included in the function signature, and it doesn't really matter what parameter types are, so long as the right values are sent to the called function. This means that we don't need two versions of the function, one with a "const" parameter and one without. We only really need one. In this case, it makes sense to keep the more-restrictive one -- the with a "const void*" parameter. Therefore, remove the one taking just "void*". 1571814 1 webkit-bug-importer 2019-09-17 22:01:28 -0700 <rdar://problem/55466589> 1571816 2 379018 krollin 2019-09-17 22:03:12 -0700 Created attachment 379018 Patch 1571927 3 379018 ap 2019-09-18 09:45:20 -0700 Comment on attachment 379018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379018&action=review > Source/WebCore/PAL/ChangeLog:3 > + Remove alternate declaration of CCECCryptorImportKey This change is a local improvement, however this whole file isn’t following our normal convention. Normally, we redeclare functions in internal builds to catch changes in signatures, which can be more drastic than here. 1572030 4 379018 commit-queue 2019-09-18 12:40:00 -0700 Comment on attachment 379018 Patch Clearing flags on attachment: 379018 Committed r250049: <https://trac.webkit.org/changeset/250049> 1572031 5 commit-queue 2019-09-18 12:40:02 -0700 All reviewed patches have been landed. Closing bug. 379018 2019-09-17 22:03:12 -0700 2019-09-18 12:40:00 -0700 Patch bug-201903-20190917220311.patch text/plain 3116 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCA3Mjk0YzZh YWExY2U5YmZjNmYzNDJlZWI4YzFlZmYzMmI3NzUzNjAyLi5jZDhkYmE3NzMzMjhjYjQxM2Q1MWVh M2ZlNmM5YzA5YWQ1ZmIxMTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAor MjAxOS0wOS0xNyAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAg UmVtb3ZlIGFsdGVybmF0ZSBkZWNsYXJhdGlvbiBvZiBDQ0VDQ3J5cHRvckltcG9ydEtleQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxOTAzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81NTQ2NjU4OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbiBtYWNPUyAxMC4xNSBhbmQgaU9TIDEzLjAgU0RLcywg dGhlIGtleVBhY2thZ2UgcGFyYW1ldGVyIG9mCisgICAgICAgIENDRUNDcnlwdG9ySW1wb3J0S2V5 KCkgd2FzIGNoYW5nZWQgZnJvbSAidm9pZCoiIHRvICJjb25zdCB2b2lkKiIuIFRoaXMKKyAgICAg ICAgY2hhbmdlIHdhcyBhY2NvdW50ZWQgZm9yIGluIEJ1ZyAxOTU3NTQgYnkgbWFraW5nIHRoZSBz YW1lIGNoYW5nZSB0bworICAgICAgICB0aGUgcGFyYWxsZWwgZGVjbGFyYXRpb25zIGluIENvbW1v bkNyeXB0b1NQSS5oLiBCdXQgc2luY2UgdGhpcyBoZWFkZXIKKyAgICAgICAgYWxzbyBuZWVkZWQg dG8gYmUgdXNlZCBpbiBtYWNPUyAxMC4xNCBjb250ZXh0cywgdGhlIG9sZCBkZWNsYXJhdGlvbgor ICAgICAgICB3YXMgYWxzbyBrZXB0LgorCisgICAgICAgIEJ1dCBzaW5jZSB0aGlzIGZ1bmN0aW9u IGlzIGEgIkMiIGZ1bmN0aW9uLCB0aGUgdHlwZXMgb2YgcGFyYW1ldGVycyBhcmUKKyAgICAgICAg bm90IGluY2x1ZGVkIGluIHRoZSBmdW5jdGlvbiBzaWduYXR1cmUsIGFuZCBpdCBkb2Vzbid0IHJl YWxseSBtYXR0ZXIKKyAgICAgICAgd2hhdCBwYXJhbWV0ZXIgdHlwZXMgYXJlLCBzbyBsb25nIGFz IHRoZSByaWdodCB2YWx1ZXMgYXJlIHNlbnQgdG8gdGhlCisgICAgICAgIGNhbGxlZCBmdW5jdGlv bi4gVGhpcyBtZWFucyB0aGF0IHdlIGRvbid0IG5lZWQgdHdvIHZlcnNpb25zIG9mIHRoZQorICAg ICAgICBmdW5jdGlvbiwgb25lIHdpdGggYSAiY29uc3QiIHBhcmFtZXRlciBhbmQgb25lIHdpdGhv dXQuIFdlIG9ubHkgcmVhbGx5CisgICAgICAgIG5lZWQgb25lLiBJbiB0aGlzIGNhc2UsIGl0IG1h a2VzIHNlbnNlIHRvIGtlZXAgdGhlIG1vcmUtcmVzdHJpY3RpdmUKKyAgICAgICAgb25lIC0tIHRo ZSB3aXRoIGEgImNvbnN0IHZvaWQqIiBwYXJhbWV0ZXIuIFRoZXJlZm9yZSwgcmVtb3ZlIHRoZSBv bmUKKyAgICAgICAgdGFraW5nIGp1c3QgInZvaWQqIi4KKworICAgICAgICAqIHBhbC9zcGkvY29j b2EvQ29tbW9uQ3J5cHRvU1BJLmg6CisKIDIwMTktMDktMTcgIEtlaXRoIFJvbGxpbiAgPGtyb2xs aW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzb21lIHN1cHBvcnQgZm9yIDwgaU9TIDEy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db21tb25Dcnlw dG9TUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQ SS5oCmluZGV4IDI2NDcwZGEwNzBlMTE3MTRlM2JiYzFkNGZiY2ExM2QwZDFkMGY4OGIuLmNmMTEz ODE5NzhhMDg2ZTI1MWEzYmFhNDg3MzE0MGFiMjJiMzFjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCkBAIC05MywxMSArOTMs NyBAQCB0eXBlZGVmIHVpbnQzMl90IENDRUNLZXlFeHRlcm5hbEZvcm1hdDsKIHR5cGVkZWYgc3Ry dWN0IF9DQ0VDQ3J5cHRvciAqQ0NFQ0NyeXB0b3JSZWY7CiBleHRlcm4gIkMiIENDQ3J5cHRvclN0 YXR1cyBDQ0VDQ3J5cHRvckdlbmVyYXRlUGFpcihzaXplX3Qga2V5c2l6ZSwgQ0NFQ0NyeXB0b3JS ZWYgKnB1YmxpY0tleSwgQ0NFQ0NyeXB0b3JSZWYgKnByaXZhdGVLZXkpOwogZXh0ZXJuICJDIiB2 b2lkIENDRUNDcnlwdG9yUmVsZWFzZShDQ0VDQ3J5cHRvclJlZiBrZXkpOwotI2lmIChQTEFURk9S TShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwKSB8fCAo UExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTMwMDAwKQogZXh0ZXJuICJDIiBDQ0NyeXB0b3JTdGF0dXMgQ0NFQ0NyeXB0b3JJbXBvcnRL ZXkoQ0NFQ0tleUV4dGVybmFsRm9ybWF0IGZvcm1hdCwgY29uc3Qgdm9pZCAqa2V5UGFja2FnZSwg c2l6ZV90IGtleVBhY2thZ2VMZW4sIENDRUNLZXlUeXBlIGtleVR5cGUsIENDRUNDcnlwdG9yUmVm ICprZXkpOwotI2Vsc2UKLWV4dGVybiAiQyIgQ0NDcnlwdG9yU3RhdHVzIENDRUNDcnlwdG9ySW1w b3J0S2V5KENDRUNLZXlFeHRlcm5hbEZvcm1hdCBmb3JtYXQsIHZvaWQgKmtleVBhY2thZ2UsIHNp emVfdCBrZXlQYWNrYWdlTGVuLCBDQ0VDS2V5VHlwZSBrZXlUeXBlLCBDQ0VDQ3J5cHRvclJlZiAq a2V5KTsKLSNlbmRpZgogZXh0ZXJuICJDIiBDQ0NyeXB0b3JTdGF0dXMgQ0NFQ0NyeXB0b3JFeHBv cnRLZXkoQ0NFQ0tleUV4dGVybmFsRm9ybWF0IGZvcm1hdCwgdm9pZCAqa2V5UGFja2FnZSwgc2l6 ZV90ICprZXlQYWNrYWdlTGVuLCBDQ0VDS2V5VHlwZSBrZXlUeXBlLCBDQ0VDQ3J5cHRvclJlZiBr ZXkpOwogZXh0ZXJuICJDIiBpbnQgQ0NFQ0dldEtleVNpemUoQ0NFQ0NyeXB0b3JSZWYga2V5KTsK IGV4dGVybiAiQyIgQ0NDcnlwdG9yU3RhdHVzIENDRUNDcnlwdG9yQ3JlYXRlRnJvbURhdGEoc2l6 ZV90IGtleVNpemUsIHVpbnQ4X3QgKnFYLCBzaXplX3QgcVhMZW5ndGgsIHVpbnQ4X3QgKnFZLCBz aXplX3QgcVlMZW5ndGgsIENDRUNDcnlwdG9yUmVmICpyZWYpOwo=