171287 2017-04-25 13:53:07 -0700 [WebCrypto] Enhance ways to convert an ECDSA signature binary into DER format 2017-04-26 00:23:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jiewen_tan jiewen_tan bfulgham commit-queue jiewen_tan ryanhaddad sam webkit-bug-importer oldest_to_newest 1301211 0 jiewen_tan 2017-04-25 13:53:07 -0700 Enhance ways to convert an ECDSA signature binary(r||s) into DER format. 1301213 1 jiewen_tan 2017-04-25 13:53:39 -0700 <rdar://problem/31735332> 1301217 2 308138 jiewen_tan 2017-04-25 14:00:08 -0700 Created attachment 308138 Patch 1301231 3 308143 jiewen_tan 2017-04-25 14:17:13 -0700 Created attachment 308143 Patch 1301284 4 sam 2017-04-25 15:39:48 -0700 What does it mean this covered by existing tests? Do those tests change their results? 1301293 5 jiewen_tan 2017-04-25 15:55:11 -0700 (In reply to Sam Weinig from comment #4) > What does it mean this covered by existing tests? Do those tests change > their results? crypto/subtle/ecdsa-import-key-verify-p384.html fails in Internal Bots. After this change, it should pass. That's why this change is covered by existing tests. Please see radars for further information. 1301347 6 308143 bfulgham 2017-04-25 17:31:12 -0700 Comment on attachment 308143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308143&action=review r=me. > Source/WebCore/crypto/mac/CryptoAlgorithmECDSAMac.cpp:147 > + // InitialOctet is needed when the first byte of r/s is larger or equal than 128. "larger or equal than" -> "greater than or equal to" 1301351 7 308143 jiewen_tan 2017-04-25 17:40:45 -0700 Comment on attachment 308143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308143&action=review Thanks Brent for r+ my patch. >> Source/WebCore/crypto/mac/CryptoAlgorithmECDSAMac.cpp:147 >> + // InitialOctet is needed when the first byte of r/s is larger or equal than 128. > > "larger or equal than" -> "greater than or equal to" Fixed. 1301354 8 308176 jiewen_tan 2017-04-25 17:42:41 -0700 Created attachment 308176 Patch for landing 1301473 9 308176 commit-queue 2017-04-25 21:32:01 -0700 Comment on attachment 308176 Patch for landing Clearing flags on attachment: 308176 Committed r215791: <http://trac.webkit.org/changeset/215791> 308138 2017-04-25 14:00:08 -0700 2017-04-25 14:17:12 -0700 Patch bug-171287-20170425140008.patch text/plain 5244 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODcxZmE2ZTVmZjVjNDFk NDRiN2Q2MDVjOGUzNDg4ZmJiOGM2Mzc1MS4uODEwOTA4MTZlYTM1ODUzZWU4NDYxZjUxZDMyZjc5 ZjhmZjQzMWFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA0LTI1ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkNyeXB0b10gRW5o YW5jZSB3YXlzIHRvIGNvbnZlcnQgYW4gRUNEU0Egc2lnbmF0dXJlIGJpbmFyeSBpbnRvIERFUiBm b3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTI4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzE3MzUzMzI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0 cy4KKworICAgICAgICAqIGNyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FNYWMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6dmVyaWZ5RUNEU0EpOgorICAgICAgICAqIGNyeXB0by9tYWMvU2Vy aWFsaXplZENyeXB0b0tleVdyYXBNYWMubW06CisgICAgICAgIChXZWJDb3JlOjp3cmFwU2VyaWFs aXplZENyeXB0b0tleSk6CisgICAgICAgIChXZWJDb3JlOjp1bndyYXBTZXJpYWxpemVkQ3J5cHRv S2V5KToKKyAgICAgICAgU3VwcHJlc3MgZGVwcmVjYXRpb24gd2FybmluZy4KKwogMjAxNy0wNC0y NCAgQW5keSBWYW5XYWdvbmVyICA8dGhldGFsZWNyYWZ0ZXJAZ21haWwuY29tPgogCiAgICAgICAg IENsZWFuIHVwIElDVSBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8v bWFjL0NyeXB0b0FsZ29yaXRobUVDRFNBTWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9t YWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FNYWMuY3BwCmluZGV4IDNhZjdkMDIzN2ZlMTE2ZTNjYWE5 NzRlMGE5NzgyM2Y3NTVkZjdhYWYuLjk3NzM0ZDNhZjBmMTI1YTE2ODkzMjY5YTMxNmVlYTYxOTcy MmQ3NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxnb3Jp dGhtRUNEU0FNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxn b3JpdGhtRUNEU0FNYWMuY3BwCkBAIC0xMzUsMTkgKzEzNSwzNCBAQCBzdGF0aWMgRXhjZXB0aW9u T3I8Ym9vbD4gdmVyaWZ5RUNEU0EoQ3J5cHRvQWxnb3JpdGhtSWRlbnRpZmllciBoYXNoLCBjb25z dCBQbGF0ZgogCiAgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS8zMTYxODM3MT4KICAgICAv LyBDb252ZXJ0IHRoZSBzaWduYXR1cmUgaW50byBERVIgZm9ybWF0LgotICAgIC8vIHRhZyArIGxl bmd0aCgxKSArIHRhZyArIGxlbmd0aCgxKSArIEluaXRpYWxPY3RldCArIHIgKyB0YWcgKyBsZW5n dGgoMSkgKyBJbml0aWFsT2N0ZXQgKyBzCisgICAgLy8gdGFnICsgbGVuZ3RoKDEpICsgdGFnICsg bGVuZ3RoKDEpICsgSW5pdGlhbE9jdGV0KD8pICsgciArIHRhZyArIGxlbmd0aCgxKSArIEluaXRp YWxPY3RldCg/KSArIHMKKyAgICAvLyBTa2lwIGFueSBoZWFkaW5nIDBzIG9mIHIgYW5kIHMuCisg ICAgc2l6ZV90IHJTdGFydCA9IDA7CisgICAgd2hpbGUgKHJTdGFydCA8IGtleUxlbmd0aEluQnl0 ZXMgJiYgIXNpZ25hdHVyZVtyU3RhcnRdKQorICAgICAgICByU3RhcnQrKzsKKyAgICBzaXplX3Qg c1N0YXJ0ID0ga2V5TGVuZ3RoSW5CeXRlczsKKyAgICB3aGlsZSAoclN0YXJ0IDwgc2lnbmF0dXJl LnNpemUoKSAmJiAhc2lnbmF0dXJlW3NTdGFydF0pCisgICAgICAgIHNTdGFydCsrOworCisgICAg Ly8gSW5pdGlhbE9jdGV0IGlzIG5lZWRlZCB3aGVuIHRoZSBmaXJzdCBieXRlIG9mIHIvcyBpcyBs YXJnZXIgb3IgZXF1YWwgdGhhbiAxMjguCisgICAgYm9vbCByTmVlZHNJbml0aWFsT2N0ZXQgPSBz aWduYXR1cmVbclN0YXJ0XSA+PSAxMjg7CisgICAgYm9vbCBzTmVlZHNJbml0aWFsT2N0ZXQgPSBz aWduYXR1cmVbc1N0YXJ0XSA+PSAxMjg7CisKKyAgICAvLyBDb25zdHJ1Y3QgdGhlIERFUiBzaWdu YXR1cmUuCiAgICAgVmVjdG9yPHVpbnQ4X3Q+IG5ld1NpZ25hdHVyZTsKLSAgICBuZXdTaWduYXR1 cmUucmVzZXJ2ZUNhcGFjaXR5KDggKyBrZXlMZW5ndGhJbkJ5dGVzICogMik7CisgICAgbmV3U2ln bmF0dXJlLnJlc2VydmVDYXBhY2l0eSg2ICsga2V5TGVuZ3RoSW5CeXRlcyAqIDMgICsgck5lZWRz SW5pdGlhbE9jdGV0ICsgc05lZWRzSW5pdGlhbE9jdGV0IC0gclN0YXJ0IC0gc1N0YXJ0KTsKICAg ICBuZXdTaWduYXR1cmUuYXBwZW5kKFNlcXVlbmNlTWFyayk7Ci0gICAgYWRkRW5jb2RlZEFTTjFM ZW5ndGgobmV3U2lnbmF0dXJlLCA2ICsga2V5TGVuZ3RoSW5CeXRlcyAqIDIpOworICAgIGFkZEVu Y29kZWRBU04xTGVuZ3RoKG5ld1NpZ25hdHVyZSwgNCArIGtleUxlbmd0aEluQnl0ZXMgKiAzICAr IHJOZWVkc0luaXRpYWxPY3RldCArIHNOZWVkc0luaXRpYWxPY3RldCAtIHJTdGFydCAtIHNTdGFy dCk7CiAgICAgbmV3U2lnbmF0dXJlLmFwcGVuZChJbnRlZ2VyTWFyayk7Ci0gICAgYWRkRW5jb2Rl ZEFTTjFMZW5ndGgobmV3U2lnbmF0dXJlLCBrZXlMZW5ndGhJbkJ5dGVzICsgMSk7Ci0gICAgbmV3 U2lnbmF0dXJlLmFwcGVuZChJbml0aWFsT2N0ZXQpOwotICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQo c2lnbmF0dXJlLmRhdGEoKSwga2V5TGVuZ3RoSW5CeXRlcyk7CisgICAgYWRkRW5jb2RlZEFTTjFM ZW5ndGgobmV3U2lnbmF0dXJlLCBrZXlMZW5ndGhJbkJ5dGVzICsgck5lZWRzSW5pdGlhbE9jdGV0 IC0gclN0YXJ0KTsKKyAgICBpZiAock5lZWRzSW5pdGlhbE9jdGV0KQorICAgICAgICBuZXdTaWdu YXR1cmUuYXBwZW5kKEluaXRpYWxPY3RldCk7CisgICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWdu YXR1cmUuZGF0YSgpICsgclN0YXJ0LCBrZXlMZW5ndGhJbkJ5dGVzIC0gclN0YXJ0KTsKICAgICBu ZXdTaWduYXR1cmUuYXBwZW5kKEludGVnZXJNYXJrKTsKLSAgICBhZGRFbmNvZGVkQVNOMUxlbmd0 aChuZXdTaWduYXR1cmUsIGtleUxlbmd0aEluQnl0ZXMgKyAxKTsKLSAgICBuZXdTaWduYXR1cmUu YXBwZW5kKEluaXRpYWxPY3RldCk7Ci0gICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWduYXR1cmUu ZGF0YSgpICsga2V5TGVuZ3RoSW5CeXRlcywga2V5TGVuZ3RoSW5CeXRlcyk7CisgICAgYWRkRW5j b2RlZEFTTjFMZW5ndGgobmV3U2lnbmF0dXJlLCBrZXlMZW5ndGhJbkJ5dGVzICogMiArIHNOZWVk c0luaXRpYWxPY3RldCAtIHNTdGFydCk7CisgICAgaWYgKHNOZWVkc0luaXRpYWxPY3RldCkKKyAg ICAgICAgbmV3U2lnbmF0dXJlLmFwcGVuZChJbml0aWFsT2N0ZXQpOworICAgIG5ld1NpZ25hdHVy ZS5hcHBlbmQoc2lnbmF0dXJlLmRhdGEoKSArIHNTdGFydCwga2V5TGVuZ3RoSW5CeXRlcyAqIDIg LSBzU3RhcnQpOwogCiAgICAgdWludDMyX3QgdmFsaWQ7CiAgICAgQ0NDcnlwdG9yU3RhdHVzIHN0 YXR1cyA9IENDRUNDcnlwdG9yVmVyaWZ5SGFzaChrZXksIGRpZ2VzdERhdGEuZGF0YSgpLCBkaWdl c3REYXRhLnNpemUoKSwgbmV3U2lnbmF0dXJlLmRhdGEoKSwgbmV3U2lnbmF0dXJlLnNpemUoKSwg JnZhbGlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2VyaWFsaXpl ZENyeXB0b0tleVdyYXBNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL1NlcmlhbGl6 ZWRDcnlwdG9LZXlXcmFwTWFjLm1tCmluZGV4IDkzOTU0Nzk4ZDA0YWM2MDlhOTUxMTBhZjI0ZGE2 N2ZlMzFmNTllNDEuLjM1MzA2YWU3ZjRmOTc4NjFjY2I2MTNiMTliYjYzMzU3YzE2OWNiNTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2VyaWFsaXplZENyeXB0b0tleVdy YXBNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9TZXJpYWxpemVkQ3J5cHRv S2V5V3JhcE1hYy5tbQpAQCAtMjA0LDEyICsyMDQsMTUgQEAgYm9vbCB3cmFwU2VyaWFsaXplZENy eXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIG1hc3RlcktleSwgY29uc3QgVmVjdG9yPHVp bnQKICAgICBzaXplX3QgdGFnTGVuZ3RoID0gMTY7CiAgICAgdWludDhfdCB0YWdbdGFnTGVuZ3Ro XTsKIAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgY2xhbmcgZGlhZ25v c3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgogICAgIHN0YXR1cyA9IEND Q3J5cHRvckdDTShrQ0NFbmNyeXB0LCBrQ0NBbGdvcml0aG1BRVMxMjgsIGtlay5kYXRhKCksIGtl ay5zaXplKCksCiAgICAgICAgIG51bGxwdHIsIDAsIC8vIGl2CiAgICAgICAgIG51bGxwdHIsIDAs IC8vIGF1dGggZGF0YQogICAgICAgICBrZXkuZGF0YSgpLCBrZXkuc2l6ZSgpLAogICAgICAgICBl bmNyeXB0ZWRLZXkuZGF0YSgpLAogICAgICAgICB0YWcsICZ0YWdMZW5ndGgpOworI3ByYWdtYSBj bGFuZyBkaWFnbm9zdGljIHBvcAogCiAgICAgaWYgKHN0YXR1cyAhPSBrQ0NTdWNjZXNzKQogICAg ICAgICByZXR1cm4gZmFsc2U7CkBAIC0yNzAsMTIgKzI3MywxNiBAQCBib29sIHVud3JhcFNlcmlh bGl6ZWRDcnlwdG9LZXkoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBtYXN0ZXJLZXksIGNvbnN0IFZl Y3Rvcjx1aQogICAgIHVpbnQ4X3QgYWN0dWFsVGFnW3RhZ0xlbmd0aF07CiAKICAgICBrZXkucmVz aXplKGVuY3J5cHRlZEtleS5zaXplKCkpOworCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVz aAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNsYXJh dGlvbnMiCiAgICAgc3RhdHVzID0gQ0NDcnlwdG9yR0NNKGtDQ0RlY3J5cHQsIGtDQ0FsZ29yaXRo bUFFUzEyOCwga2VrLmRhdGEoKSwga2VrLnNpemUoKSwKICAgICAgICAgbnVsbHB0ciwgMCwgLy8g aXYKICAgICAgICAgbnVsbHB0ciwgMCwgLy8gYXV0aCBkYXRhCiAgICAgICAgIGVuY3J5cHRlZEtl eS5kYXRhKCksIGVuY3J5cHRlZEtleS5zaXplKCksCiAgICAgICAgIGtleS5kYXRhKCksCiAgICAg ICAgIGFjdHVhbFRhZywgJnRhZ0xlbmd0aCk7CisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9w CiAKICAgICBpZiAoc3RhdHVzICE9IGtDQ1N1Y2Nlc3MpCiAgICAgICAgIHJldHVybiBmYWxzZTsK 308143 2017-04-25 14:17:13 -0700 2017-04-25 17:31:12 -0700 Patch bug-171287-20170425141713.patch text/plain 3576 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJhY2YyZWI0MTk5YzBm ZTRjMTVmZGRhMzg3YWNlMWYzYjc0OWU0Zi4uMjgwMzVmZTFiZDlmZTAyMTA0ZmI0ZTk0NDljN2Zh YzIxYTI2OGQxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA0LTI1ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkNyeXB0b10gRW5o YW5jZSB3YXlzIHRvIGNvbnZlcnQgYW4gRUNEU0Egc2lnbmF0dXJlIGJpbmFyeSBpbnRvIERFUiBm b3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTI4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzE3MzUzMzI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0 cy4KKworICAgICAgICAqIGNyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FNYWMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6dmVyaWZ5RUNEU0EpOgorCiAyMDE3LTA0LTI1ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcGxlbWVudGFyeSBN dWx0aWxpbmd1YWwgUGxhbmUgQ29tcGxleCBTY3JpcHRzIFJlbmRlcmVkIEluY29ycmVjdGx5CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b0FsZ29yaXRobUVDRFNB TWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FN YWMuY3BwCmluZGV4IDNhZjdkMDIzN2ZlMTE2ZTNjYWE5NzRlMGE5NzgyM2Y3NTVkZjdhYWYuLjk3 NzM0ZDNhZjBmMTI1YTE2ODkzMjY5YTMxNmVlYTYxOTcyMmQ3NTAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FNYWMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FNYWMuY3BwCkBAIC0x MzUsMTkgKzEzNSwzNCBAQCBzdGF0aWMgRXhjZXB0aW9uT3I8Ym9vbD4gdmVyaWZ5RUNEU0EoQ3J5 cHRvQWxnb3JpdGhtSWRlbnRpZmllciBoYXNoLCBjb25zdCBQbGF0ZgogCiAgICAgLy8gRklYTUU6 IDxyZGFyOi8vcHJvYmxlbS8zMTYxODM3MT4KICAgICAvLyBDb252ZXJ0IHRoZSBzaWduYXR1cmUg aW50byBERVIgZm9ybWF0LgotICAgIC8vIHRhZyArIGxlbmd0aCgxKSArIHRhZyArIGxlbmd0aCgx KSArIEluaXRpYWxPY3RldCArIHIgKyB0YWcgKyBsZW5ndGgoMSkgKyBJbml0aWFsT2N0ZXQgKyBz CisgICAgLy8gdGFnICsgbGVuZ3RoKDEpICsgdGFnICsgbGVuZ3RoKDEpICsgSW5pdGlhbE9jdGV0 KD8pICsgciArIHRhZyArIGxlbmd0aCgxKSArIEluaXRpYWxPY3RldCg/KSArIHMKKyAgICAvLyBT a2lwIGFueSBoZWFkaW5nIDBzIG9mIHIgYW5kIHMuCisgICAgc2l6ZV90IHJTdGFydCA9IDA7Cisg ICAgd2hpbGUgKHJTdGFydCA8IGtleUxlbmd0aEluQnl0ZXMgJiYgIXNpZ25hdHVyZVtyU3RhcnRd KQorICAgICAgICByU3RhcnQrKzsKKyAgICBzaXplX3Qgc1N0YXJ0ID0ga2V5TGVuZ3RoSW5CeXRl czsKKyAgICB3aGlsZSAoclN0YXJ0IDwgc2lnbmF0dXJlLnNpemUoKSAmJiAhc2lnbmF0dXJlW3NT dGFydF0pCisgICAgICAgIHNTdGFydCsrOworCisgICAgLy8gSW5pdGlhbE9jdGV0IGlzIG5lZWRl ZCB3aGVuIHRoZSBmaXJzdCBieXRlIG9mIHIvcyBpcyBsYXJnZXIgb3IgZXF1YWwgdGhhbiAxMjgu CisgICAgYm9vbCByTmVlZHNJbml0aWFsT2N0ZXQgPSBzaWduYXR1cmVbclN0YXJ0XSA+PSAxMjg7 CisgICAgYm9vbCBzTmVlZHNJbml0aWFsT2N0ZXQgPSBzaWduYXR1cmVbc1N0YXJ0XSA+PSAxMjg7 CisKKyAgICAvLyBDb25zdHJ1Y3QgdGhlIERFUiBzaWduYXR1cmUuCiAgICAgVmVjdG9yPHVpbnQ4 X3Q+IG5ld1NpZ25hdHVyZTsKLSAgICBuZXdTaWduYXR1cmUucmVzZXJ2ZUNhcGFjaXR5KDggKyBr ZXlMZW5ndGhJbkJ5dGVzICogMik7CisgICAgbmV3U2lnbmF0dXJlLnJlc2VydmVDYXBhY2l0eSg2 ICsga2V5TGVuZ3RoSW5CeXRlcyAqIDMgICsgck5lZWRzSW5pdGlhbE9jdGV0ICsgc05lZWRzSW5p dGlhbE9jdGV0IC0gclN0YXJ0IC0gc1N0YXJ0KTsKICAgICBuZXdTaWduYXR1cmUuYXBwZW5kKFNl cXVlbmNlTWFyayk7Ci0gICAgYWRkRW5jb2RlZEFTTjFMZW5ndGgobmV3U2lnbmF0dXJlLCA2ICsg a2V5TGVuZ3RoSW5CeXRlcyAqIDIpOworICAgIGFkZEVuY29kZWRBU04xTGVuZ3RoKG5ld1NpZ25h dHVyZSwgNCArIGtleUxlbmd0aEluQnl0ZXMgKiAzICArIHJOZWVkc0luaXRpYWxPY3RldCArIHNO ZWVkc0luaXRpYWxPY3RldCAtIHJTdGFydCAtIHNTdGFydCk7CiAgICAgbmV3U2lnbmF0dXJlLmFw cGVuZChJbnRlZ2VyTWFyayk7Ci0gICAgYWRkRW5jb2RlZEFTTjFMZW5ndGgobmV3U2lnbmF0dXJl LCBrZXlMZW5ndGhJbkJ5dGVzICsgMSk7Ci0gICAgbmV3U2lnbmF0dXJlLmFwcGVuZChJbml0aWFs T2N0ZXQpOwotICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQoc2lnbmF0dXJlLmRhdGEoKSwga2V5TGVu Z3RoSW5CeXRlcyk7CisgICAgYWRkRW5jb2RlZEFTTjFMZW5ndGgobmV3U2lnbmF0dXJlLCBrZXlM ZW5ndGhJbkJ5dGVzICsgck5lZWRzSW5pdGlhbE9jdGV0IC0gclN0YXJ0KTsKKyAgICBpZiAock5l ZWRzSW5pdGlhbE9jdGV0KQorICAgICAgICBuZXdTaWduYXR1cmUuYXBwZW5kKEluaXRpYWxPY3Rl dCk7CisgICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWduYXR1cmUuZGF0YSgpICsgclN0YXJ0LCBr ZXlMZW5ndGhJbkJ5dGVzIC0gclN0YXJ0KTsKICAgICBuZXdTaWduYXR1cmUuYXBwZW5kKEludGVn ZXJNYXJrKTsKLSAgICBhZGRFbmNvZGVkQVNOMUxlbmd0aChuZXdTaWduYXR1cmUsIGtleUxlbmd0 aEluQnl0ZXMgKyAxKTsKLSAgICBuZXdTaWduYXR1cmUuYXBwZW5kKEluaXRpYWxPY3RldCk7Ci0g ICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWduYXR1cmUuZGF0YSgpICsga2V5TGVuZ3RoSW5CeXRl cywga2V5TGVuZ3RoSW5CeXRlcyk7CisgICAgYWRkRW5jb2RlZEFTTjFMZW5ndGgobmV3U2lnbmF0 dXJlLCBrZXlMZW5ndGhJbkJ5dGVzICogMiArIHNOZWVkc0luaXRpYWxPY3RldCAtIHNTdGFydCk7 CisgICAgaWYgKHNOZWVkc0luaXRpYWxPY3RldCkKKyAgICAgICAgbmV3U2lnbmF0dXJlLmFwcGVu ZChJbml0aWFsT2N0ZXQpOworICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQoc2lnbmF0dXJlLmRhdGEo KSArIHNTdGFydCwga2V5TGVuZ3RoSW5CeXRlcyAqIDIgLSBzU3RhcnQpOwogCiAgICAgdWludDMy X3QgdmFsaWQ7CiAgICAgQ0NDcnlwdG9yU3RhdHVzIHN0YXR1cyA9IENDRUNDcnlwdG9yVmVyaWZ5 SGFzaChrZXksIGRpZ2VzdERhdGEuZGF0YSgpLCBkaWdlc3REYXRhLnNpemUoKSwgbmV3U2lnbmF0 dXJlLmRhdGEoKSwgbmV3U2lnbmF0dXJlLnNpemUoKSwgJnZhbGlkKTsK 308176 2017-04-25 17:42:41 -0700 2017-04-25 21:32:01 -0700 Patch for landing bug-171287-20170425174240.patch text/plain 3578 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJhY2YyZWI0MTk5YzBm ZTRjMTVmZGRhMzg3YWNlMWYzYjc0OWU0Zi4uYTM2MzhmNDAxZDUwYWY5YmRiOWIyMjU5M2FiODIy M2MwNDRmY2QzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA0LTI1ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkNyeXB0b10gRW5o YW5jZSB3YXlzIHRvIGNvbnZlcnQgYW4gRUNEU0Egc2lnbmF0dXJlIGJpbmFyeSBpbnRvIERFUiBm b3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTI4NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzE3MzUzMzI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3Rz LgorCisgICAgICAgICogY3J5cHRvL21hYy9DcnlwdG9BbGdvcml0aG1FQ0RTQU1hYy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjp2ZXJpZnlFQ0RTQSk6CisKIDIwMTctMDQtMjUgIE15bGVzIEMuIE1h eGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwbGVtZW50YXJ5IE11 bHRpbGluZ3VhbCBQbGFuZSBDb21wbGV4IFNjcmlwdHMgUmVuZGVyZWQgSW5jb3JyZWN0bHkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvQWxnb3JpdGhtRUNEU0FN YWMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9BbGdvcml0aG1FQ0RTQU1h Yy5jcHAKaW5kZXggM2FmN2QwMjM3ZmUxMTZlM2NhYTk3NGUwYTk3ODIzZjc1NWRmN2FhZi4uNTZk NjQ5MzE3NDNhMWIxNDNiYWRjMjY5MDFkNjM1ODg2ZDc3MTYwNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9BbGdvcml0aG1FQ0RTQU1hYy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9BbGdvcml0aG1FQ0RTQU1hYy5jcHAKQEAgLTEz NSwxOSArMTM1LDM0IEBAIHN0YXRpYyBFeGNlcHRpb25Pcjxib29sPiB2ZXJpZnlFQ0RTQShDcnlw dG9BbGdvcml0aG1JZGVudGlmaWVyIGhhc2gsIGNvbnN0IFBsYXRmCiAKICAgICAvLyBGSVhNRTog PHJkYXI6Ly9wcm9ibGVtLzMxNjE4MzcxPgogICAgIC8vIENvbnZlcnQgdGhlIHNpZ25hdHVyZSBp bnRvIERFUiBmb3JtYXQuCi0gICAgLy8gdGFnICsgbGVuZ3RoKDEpICsgdGFnICsgbGVuZ3RoKDEp ICsgSW5pdGlhbE9jdGV0ICsgciArIHRhZyArIGxlbmd0aCgxKSArIEluaXRpYWxPY3RldCArIHMK KyAgICAvLyB0YWcgKyBsZW5ndGgoMSkgKyB0YWcgKyBsZW5ndGgoMSkgKyBJbml0aWFsT2N0ZXQo PykgKyByICsgdGFnICsgbGVuZ3RoKDEpICsgSW5pdGlhbE9jdGV0KD8pICsgcworICAgIC8vIFNr aXAgYW55IGhlYWRpbmcgMHMgb2YgciBhbmQgcy4KKyAgICBzaXplX3QgclN0YXJ0ID0gMDsKKyAg ICB3aGlsZSAoclN0YXJ0IDwga2V5TGVuZ3RoSW5CeXRlcyAmJiAhc2lnbmF0dXJlW3JTdGFydF0p CisgICAgICAgIHJTdGFydCsrOworICAgIHNpemVfdCBzU3RhcnQgPSBrZXlMZW5ndGhJbkJ5dGVz OworICAgIHdoaWxlIChyU3RhcnQgPCBzaWduYXR1cmUuc2l6ZSgpICYmICFzaWduYXR1cmVbc1N0 YXJ0XSkKKyAgICAgICAgc1N0YXJ0Kys7CisKKyAgICAvLyBJbml0aWFsT2N0ZXQgaXMgbmVlZGVk IHdoZW4gdGhlIGZpcnN0IGJ5dGUgb2Ygci9zIGlzIGxhcmdlciB0aGFuIG9yIGVxdWFsIHRvIDEy OC4KKyAgICBib29sIHJOZWVkc0luaXRpYWxPY3RldCA9IHNpZ25hdHVyZVtyU3RhcnRdID49IDEy ODsKKyAgICBib29sIHNOZWVkc0luaXRpYWxPY3RldCA9IHNpZ25hdHVyZVtzU3RhcnRdID49IDEy ODsKKworICAgIC8vIENvbnN0cnVjdCB0aGUgREVSIHNpZ25hdHVyZS4KICAgICBWZWN0b3I8dWlu dDhfdD4gbmV3U2lnbmF0dXJlOwotICAgIG5ld1NpZ25hdHVyZS5yZXNlcnZlQ2FwYWNpdHkoOCAr IGtleUxlbmd0aEluQnl0ZXMgKiAyKTsKKyAgICBuZXdTaWduYXR1cmUucmVzZXJ2ZUNhcGFjaXR5 KDYgKyBrZXlMZW5ndGhJbkJ5dGVzICogMyAgKyByTmVlZHNJbml0aWFsT2N0ZXQgKyBzTmVlZHNJ bml0aWFsT2N0ZXQgLSByU3RhcnQgLSBzU3RhcnQpOwogICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQo U2VxdWVuY2VNYXJrKTsKLSAgICBhZGRFbmNvZGVkQVNOMUxlbmd0aChuZXdTaWduYXR1cmUsIDYg KyBrZXlMZW5ndGhJbkJ5dGVzICogMik7CisgICAgYWRkRW5jb2RlZEFTTjFMZW5ndGgobmV3U2ln bmF0dXJlLCA0ICsga2V5TGVuZ3RoSW5CeXRlcyAqIDMgICsgck5lZWRzSW5pdGlhbE9jdGV0ICsg c05lZWRzSW5pdGlhbE9jdGV0IC0gclN0YXJ0IC0gc1N0YXJ0KTsKICAgICBuZXdTaWduYXR1cmUu YXBwZW5kKEludGVnZXJNYXJrKTsKLSAgICBhZGRFbmNvZGVkQVNOMUxlbmd0aChuZXdTaWduYXR1 cmUsIGtleUxlbmd0aEluQnl0ZXMgKyAxKTsKLSAgICBuZXdTaWduYXR1cmUuYXBwZW5kKEluaXRp YWxPY3RldCk7Ci0gICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWduYXR1cmUuZGF0YSgpLCBrZXlM ZW5ndGhJbkJ5dGVzKTsKKyAgICBhZGRFbmNvZGVkQVNOMUxlbmd0aChuZXdTaWduYXR1cmUsIGtl eUxlbmd0aEluQnl0ZXMgKyByTmVlZHNJbml0aWFsT2N0ZXQgLSByU3RhcnQpOworICAgIGlmIChy TmVlZHNJbml0aWFsT2N0ZXQpCisgICAgICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQoSW5pdGlhbE9j dGV0KTsKKyAgICBuZXdTaWduYXR1cmUuYXBwZW5kKHNpZ25hdHVyZS5kYXRhKCkgKyByU3RhcnQs IGtleUxlbmd0aEluQnl0ZXMgLSByU3RhcnQpOwogICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQoSW50 ZWdlck1hcmspOwotICAgIGFkZEVuY29kZWRBU04xTGVuZ3RoKG5ld1NpZ25hdHVyZSwga2V5TGVu Z3RoSW5CeXRlcyArIDEpOwotICAgIG5ld1NpZ25hdHVyZS5hcHBlbmQoSW5pdGlhbE9jdGV0KTsK LSAgICBuZXdTaWduYXR1cmUuYXBwZW5kKHNpZ25hdHVyZS5kYXRhKCkgKyBrZXlMZW5ndGhJbkJ5 dGVzLCBrZXlMZW5ndGhJbkJ5dGVzKTsKKyAgICBhZGRFbmNvZGVkQVNOMUxlbmd0aChuZXdTaWdu YXR1cmUsIGtleUxlbmd0aEluQnl0ZXMgKiAyICsgc05lZWRzSW5pdGlhbE9jdGV0IC0gc1N0YXJ0 KTsKKyAgICBpZiAoc05lZWRzSW5pdGlhbE9jdGV0KQorICAgICAgICBuZXdTaWduYXR1cmUuYXBw ZW5kKEluaXRpYWxPY3RldCk7CisgICAgbmV3U2lnbmF0dXJlLmFwcGVuZChzaWduYXR1cmUuZGF0 YSgpICsgc1N0YXJ0LCBrZXlMZW5ndGhJbkJ5dGVzICogMiAtIHNTdGFydCk7CiAKICAgICB1aW50 MzJfdCB2YWxpZDsKICAgICBDQ0NyeXB0b3JTdGF0dXMgc3RhdHVzID0gQ0NFQ0NyeXB0b3JWZXJp ZnlIYXNoKGtleSwgZGlnZXN0RGF0YS5kYXRhKCksIGRpZ2VzdERhdGEuc2l6ZSgpLCBuZXdTaWdu YXR1cmUuZGF0YSgpLCBuZXdTaWduYXR1cmUuc2l6ZSgpLCAmdmFsaWQpOwo=