146923 2015-07-13 17:48:32 -0700 webkit-patch uses incorrect credentials from keychain to login until account lockout 2015-07-16 21:01:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dean_johnson dean_johnson commit-queue dbates dean_johnson glenn oldest_to_newest 1109293 0 dean_johnson 2015-07-13 17:48:32 -0700 If you have incorrect credentials in a keychain for logging onto bugs.webkit.org and you attempt to use webkit-upload -g you will be put into a loop of login attempts until you are locked out. Fix: If credentials are incorrect, ask the user to enter them manually instead of trying continuously. 1109298 1 dean_johnson 2015-07-13 17:57:49 -0700 After a quick look the issue seems to lie somewhere in OpenSource/Tools/Scripts/webkitpy/tool/steps/commit.py. There looks like there should be a 3 try attempt, but maybe the interaction with the keychain is causing issues. 1109463 2 256794 dean_johnson 2015-07-14 14:33:06 -0700 Created attachment 256794 Patch 1109464 3 256795 dean_johnson 2015-07-14 14:33:34 -0700 Created attachment 256795 Patch 1109465 4 dean_johnson 2015-07-14 14:34:39 -0700 Both attachments are the same, one was just testing my fix. 1109577 5 256795 dbates 2015-07-14 23:44:30 -0700 Comment on attachment 256795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256795&action=review > Tools/Scripts/webkitpy/common/net/credentials.py:140 > username, password = self._credentials_from_environment() R-, the proposed patch does not handle credentials that are retrieved from the environment. There are also other minors issues with this patch. I'll elaborate further tomorrow. 1109643 6 256795 dbates 2015-07-15 10:03:22 -0700 Comment on attachment 256795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256795&action=review > Tools/ChangeLog:11 > + you in until lockout of bugzilla. This description is disingenuous. The webkitpy logic to read credentials will make up to five attempts to authenticate with Bugzilla. And it sounds like five attempts is more than Bugzilla allows before locking out an account. > Tools/ChangeLog:14 > + (Bugzilla.authenticate):Added argument to read_credentials() that Nit: Missing space character after ':'. > Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py:532 > + # Make sure we don't loop over invalid credentials: > + # https://bugs.webkit.org/show_bug.cgi?id=146923 > + username, password = credentials.read_credentials(previous_fail=attempts > 1) I suggest that we come up with more descriptive name for the argument previous_fail. As we discussed in person today, maybe name it use_stored_credentials and write line 532 as: username, password = credentials.read_credentials(use_stored_credentials=attempts == 1) Then we can remove the need for the comments on lines 530 and 531 to explain the purpose of argument previous_fail. > Tools/Scripts/webkitpy/common/net/credentials.py:139 > + def read_credentials(self, user=User, previous_fail=False): As we discussed in person today, maybe a more descriptive name for this argument is use_stored_credentials. > Tools/Scripts/webkitpy/common/net/credentials.py:143 > + # Don't auto-fill incorrect passwords if they've been filled in incorrectly once. Please remove this comment as it is not applicable to the purpose of this function, which is to return credentials regardless of the validity of such credentials. Although this comment would be better suited in Bugzilla.authenticate(), I feel it is unnecessary if we pick a more descriptive name for the argument previous_fail. 1109657 7 256846 dean_johnson 2015-07-15 11:27:01 -0700 Created attachment 256846 Patch 1109734 8 256846 dbates 2015-07-15 15:16:02 -0700 Comment on attachment 256846 Patch Can we write a test for this change? 1109735 9 256846 dbates 2015-07-15 15:16:47 -0700 Comment on attachment 256846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256846&action=review > Tools/ChangeLog:15 > + (Bugzilla.authenticate):Added argument to read_credentials() that Nit: Missing space character after ':'. 1109765 10 256877 dean_johnson 2015-07-15 16:31:04 -0700 Created attachment 256877 Patch 1109769 11 256877 dbates 2015-07-15 17:02:44 -0700 Comment on attachment 256877 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256877&action=review > Tools/ChangeLog:24 > + use_stored_password argument. use_stored_password => use_stored_credentials > Tools/ChangeLog:25 > + (test_keyring_without_git_repo_nor_keychain): This wasn't actually changed... This is a bug in prepare-ChangeLog. Please file a bug for this issue and remove this line from the ChangeLog. > Tools/ChangeLog:28 > + keyring) are never called. It also tests that we get back our mocked username and password. Nit: git => Git > Tools/ChangeLog:29 > + (test_do_not_use_stored_credentials.MockKeyring): Mock keyring Either elaborate further or remove this remark. > Tools/ChangeLog:31 > + (test_do_not_use_stored_credentials.FakeCredentials): Mock credentials Ditto. > Tools/ChangeLog:36 > + (test_do_not_use_stored_credentials.FakeCredentials > + ._offer_to_store_credentials_in_keyring): Ditto Please do not wrap line 35 in the middle of the name of the method. > Tools/ChangeLog:37 > + (test_do_not_use_stored_credentials.FakeUser): Mock the User class This patch looks good. I noticed some very minor nits. > Tools/Scripts/webkitpy/common/net/credentials_unittest.py:224 > + return This is OK as-is. It seems that we tend to use "pass" instead of an explicit return for functions that have an empty body. 1109883 12 256905 dean_johnson 2015-07-16 10:10:32 -0700 Created attachment 256905 Patch 1110081 13 256905 commit-queue 2015-07-16 21:00:59 -0700 Comment on attachment 256905 Patch Clearing flags on attachment: 256905 Committed r186927: <http://trac.webkit.org/changeset/186927> 1110082 14 commit-queue 2015-07-16 21:01:03 -0700 All reviewed patches have been landed. Closing bug. 256794 2015-07-14 14:33:06 -0700 2015-07-14 14:33:32 -0700 Patch bug-146923-20150714143200.patch text/plain 3933 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Nzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBjOTc1YzUzNmY3ZDA0NjQzMmVkNTk4NTBmMmQxZmY5 ZmMzYzU0My4uNTQ4Mzg3NGVjYTJlMTQzMTI0ZGQyMTAzY2M0NTA4Y2IxNjM2MTk4MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE1LTA3LTE0ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHdlYmtpdC1wYXRjaCB1c2VzIGluY29ycmVjdCBjcmVkZW50aWFscyBmcm9tIGtl eWNoYWluIHRvIGxvZ2luIHVudGlsIGFjY291bnQgbG9ja291dCAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjkyMyAoT09QUyEpLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gd2Via2l0LXBhdGNo IHVwbG9hZCBhc2tzIGZvciBsb2dpbiBjcmVkZW50aWFscyBmb3IgYnVncy53ZWJraXQub3JnLCBp ZiB5b3UKKyAgICAgICAgcHJvdmlkZSBpbmNvcnJlY3QgY3JlZGVudGlhbHMgdGhlbiBhc2sgZm9y IHRoZW0gdG8gYmUgc2F2ZWQgdG8gdGhlIGtleWNoYWluCisgICAgICAgIHdlYmtpdC1wYXRjaCB3 aWxsIGNvbnRpbnVhbGx5IGdyYWIgdGhlIGluY29ycmVjdCBjcmVkZW50aWFscyBhbmQgdHJ5IHRv IGxvZworICAgICAgICB5b3UgaW4gdW50aWwgbG9ja291dCBvZiBidWd6aWxsYS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weTogCisg ICAgICAgIChCdWd6aWxsYS5hdXRoZW50aWNhdGUpOkFkZGVkIGFyZ3VtZW50IHRvIHJlYWRfY3Jl ZGVudGlhbHMoKSB0aGF0CisgICAgICAgIHBhc3NlcyBpbiB3aGV0aGVyIG9yIG5vdCBsb2dpbiBo YXMgc3VjY2VlZGVkIHByZXZpb3VzbHkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2NyZWRlbnRpYWxzLnB5OgorICAgICAgICAoQ3JlZGVudGlhbHMucmVhZF9jcmVkZW50 aWFscyk6IEFkZGVkIG9wdGlvbmFsIGFyZ3VtZW50ICdwcmV2aW91c19mYWlsJworICAgICAgICB0 aGF0IHNwZWNpZmllcyBpZiBsb2dpbiBoYXMgZmFpbGVkIHNpbmNlIGxhc3QgdXNlIG9mIHRoZSBm dW5jdGlvbi4gSWYgaXQKKyAgICAgICAgaGFzLCB3ZSBkbyBub3QgYXV0by1maWxsIGNyZWRlbnRp YWxzIHNpbmNlIGVpdGhlciB0aGUgY3JlZGVudGlhbHMgY2F1c2VkCisgICAgICAgIHRoZSBmYWls dXJlLCBvciB0aGV5IHdlcmVuJ3QgdXNlZCBpbiB0aGUgZmlyc3QgcGxhY2Ugc28gdGhlcmUgaXMg bm8gcmVhc29uCisgICAgICAgIHRvIHRyeSBhbmQgdXNlIHRoZW0gYWdhaW4gaWYgYSBmYWlsdXJl IGhhcHBlbmVkLgorCiAyMDE1LTA3LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFtNYWNdIFVuYWJsZSB0byBkaXNtaXNzIGNvbnRleHQgbWVudSBkdXJp bmcgdGVzdCBydW5zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNjk1YjExYzMyZGNjN2NjODc3MWU0MTJmN2Ji NTZiMjQ0NzVkYTIyMS4uNjZlMWJkOTIwNDNkZGU4ZDRhOThjMGM4OTVlNTY3MTQ5MjQ5YmE0OSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1 Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxs YS9idWd6aWxsYS5weQpAQCAtNTI3LDcgKzUyNyw5IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6 CiAgICAgICAgIGF0dGVtcHRzID0gMAogICAgICAgICB3aGlsZSBub3Qgc2VsZi5hdXRoZW50aWNh dGVkOgogICAgICAgICAgICAgYXR0ZW1wdHMgKz0gMQotICAgICAgICAgICAgdXNlcm5hbWUsIHBh c3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscygpCisgICAgICAgICAgICAjIE1h a2Ugc3VyZSB3ZSBkb24ndCBsb29wIG92ZXIgaW52YWxpZCBjcmVkZW50aWFsczoKKyAgICAgICAg ICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjkyMworICAg ICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFs cyhwcmV2aW91c19mYWlsPWF0dGVtcHRzID4gMSkKIAogICAgICAgICAgICAgX2xvZy5pbmZvKCJM b2dnaW5nIGluIGFzICVzLi4uIiAlIHVzZXJuYW1lKQogICAgICAgICAgICAgc2VsZi5icm93c2Vy Lm9wZW4oY29uZmlnX3VybHMuYnVnX3NlcnZlcl91cmwgKwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IDZhNDIxNTU3OWFmNDA4ODhi OTJlNDUyN2YyZTcwYjk3NThlYjQzZTYuLjEwYTM1NjljOGU3Y2ExMjc2ZWE3ODQ1NGUyMWRhYTU0 OTAwY2ZmYzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9j cmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHMucHkKQEAgLTEzNiwxOSArMTM2LDIwIEBAIGNsYXNzIENyZWRlbnRpYWxzKG9iamVj dCk6CiAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgIHBhc3MKIAotICAgIGRlZiByZWFkX2Ny ZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlcik6CisgICAgZGVmIHJlYWRfY3JlZGVudGlhbHMoc2Vs ZiwgdXNlcj1Vc2VyLCBwcmV2aW91c19mYWlsPUZhbHNlKToKICAgICAgICAgdXNlcm5hbWUsIHBh c3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9lbnZpcm9ubWVudCgpCiAgICAgICAgICMg RklYTUU6IFdlIGRvbid0IGN1cnJlbnRseSBzdXBwb3J0IHB1bGxpbmcgdGhlIHVzZXJuYW1lIGZy b20gb25lCiAgICAgICAgICMgc291cmNlIGFuZCB0aGUgcGFzc3dvcmQgZnJvbSBhIHNlcGFyYXRl IHNvdXJjZS4KLSAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29yZDoKKyAgICAg ICAgIyBEb24ndCBhdXRvLWZpbGwgaW5jb3JyZWN0IHBhc3N3b3JkcyBpZiB0aGV5J3ZlIGJlZW4g ZmlsbGVkIGluIGluY29ycmVjdGx5IG9uY2UuCisgICAgICAgIGlmIChub3QgdXNlcm5hbWUgb3Ig bm90IHBhc3N3b3JkKSBhbmQgbm90IHByZXZpb3VzX2ZhaWw6CiAgICAgICAgICAgICB1c2VybmFt ZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2dpdCgpCi0gICAgICAgIGlmIG5v dCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6CisgICAgICAgIGlmIChub3QgdXNlcm5hbWUgb3Ig bm90IHBhc3N3b3JkKSBhbmQgbm90IHByZXZpb3VzX2ZhaWw6CiAgICAgICAgICAgICB1c2VybmFt ZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQog CiAgICAgICAgIGlmIG5vdCB1c2VybmFtZToKICAgICAgICAgICAgIHVzZXJuYW1lID0gdXNlci5w cm9tcHQoIiVzIGxvZ2luOiAiICUgc2VsZi5ob3N0KQogCi0gICAgICAgIGlmIHVzZXJuYW1lIGFu ZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmc6CisgICAgICAgIGlmIHVzZXJuYW1lIGFu ZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmcgYW5kIG5vdCBwcmV2aW91c19mYWlsOgog ICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHBhc3N3b3JkID0gc2VsZi5fa2V5cmlu Zy5nZXRfcGFzc3dvcmQoc2VsZi5ob3N0LCB1c2VybmFtZSkKICAgICAgICAgICAgIGV4Y2VwdDoK 256795 2015-07-14 14:33:34 -0700 2015-07-15 11:26:58 -0700 Patch bug-146923-20150714143228.patch text/plain 3933 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Nzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBjOTc1YzUzNmY3ZDA0NjQzMmVkNTk4NTBmMmQxZmY5 ZmMzYzU0My4uNTQ4Mzg3NGVjYTJlMTQzMTI0ZGQyMTAzY2M0NTA4Y2IxNjM2MTk4MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE1LTA3LTE0ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHdlYmtpdC1wYXRjaCB1c2VzIGluY29ycmVjdCBjcmVkZW50aWFscyBmcm9tIGtl eWNoYWluIHRvIGxvZ2luIHVudGlsIGFjY291bnQgbG9ja291dCAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjkyMyAoT09QUyEpLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gd2Via2l0LXBhdGNo IHVwbG9hZCBhc2tzIGZvciBsb2dpbiBjcmVkZW50aWFscyBmb3IgYnVncy53ZWJraXQub3JnLCBp ZiB5b3UKKyAgICAgICAgcHJvdmlkZSBpbmNvcnJlY3QgY3JlZGVudGlhbHMgdGhlbiBhc2sgZm9y IHRoZW0gdG8gYmUgc2F2ZWQgdG8gdGhlIGtleWNoYWluCisgICAgICAgIHdlYmtpdC1wYXRjaCB3 aWxsIGNvbnRpbnVhbGx5IGdyYWIgdGhlIGluY29ycmVjdCBjcmVkZW50aWFscyBhbmQgdHJ5IHRv IGxvZworICAgICAgICB5b3UgaW4gdW50aWwgbG9ja291dCBvZiBidWd6aWxsYS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weTogCisg ICAgICAgIChCdWd6aWxsYS5hdXRoZW50aWNhdGUpOkFkZGVkIGFyZ3VtZW50IHRvIHJlYWRfY3Jl ZGVudGlhbHMoKSB0aGF0CisgICAgICAgIHBhc3NlcyBpbiB3aGV0aGVyIG9yIG5vdCBsb2dpbiBo YXMgc3VjY2VlZGVkIHByZXZpb3VzbHkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2NyZWRlbnRpYWxzLnB5OgorICAgICAgICAoQ3JlZGVudGlhbHMucmVhZF9jcmVkZW50 aWFscyk6IEFkZGVkIG9wdGlvbmFsIGFyZ3VtZW50ICdwcmV2aW91c19mYWlsJworICAgICAgICB0 aGF0IHNwZWNpZmllcyBpZiBsb2dpbiBoYXMgZmFpbGVkIHNpbmNlIGxhc3QgdXNlIG9mIHRoZSBm dW5jdGlvbi4gSWYgaXQKKyAgICAgICAgaGFzLCB3ZSBkbyBub3QgYXV0by1maWxsIGNyZWRlbnRp YWxzIHNpbmNlIGVpdGhlciB0aGUgY3JlZGVudGlhbHMgY2F1c2VkCisgICAgICAgIHRoZSBmYWls dXJlLCBvciB0aGV5IHdlcmVuJ3QgdXNlZCBpbiB0aGUgZmlyc3QgcGxhY2Ugc28gdGhlcmUgaXMg bm8gcmVhc29uCisgICAgICAgIHRvIHRyeSBhbmQgdXNlIHRoZW0gYWdhaW4gaWYgYSBmYWlsdXJl IGhhcHBlbmVkLgorCiAyMDE1LTA3LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFtNYWNdIFVuYWJsZSB0byBkaXNtaXNzIGNvbnRleHQgbWVudSBkdXJp bmcgdGVzdCBydW5zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNjk1YjExYzMyZGNjN2NjODc3MWU0MTJmN2Ji NTZiMjQ0NzVkYTIyMS4uNjZlMWJkOTIwNDNkZGU4ZDRhOThjMGM4OTVlNTY3MTQ5MjQ5YmE0OSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1 Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxs YS9idWd6aWxsYS5weQpAQCAtNTI3LDcgKzUyNyw5IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6 CiAgICAgICAgIGF0dGVtcHRzID0gMAogICAgICAgICB3aGlsZSBub3Qgc2VsZi5hdXRoZW50aWNh dGVkOgogICAgICAgICAgICAgYXR0ZW1wdHMgKz0gMQotICAgICAgICAgICAgdXNlcm5hbWUsIHBh c3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscygpCisgICAgICAgICAgICAjIE1h a2Ugc3VyZSB3ZSBkb24ndCBsb29wIG92ZXIgaW52YWxpZCBjcmVkZW50aWFsczoKKyAgICAgICAg ICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjkyMworICAg ICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFs cyhwcmV2aW91c19mYWlsPWF0dGVtcHRzID4gMSkKIAogICAgICAgICAgICAgX2xvZy5pbmZvKCJM b2dnaW5nIGluIGFzICVzLi4uIiAlIHVzZXJuYW1lKQogICAgICAgICAgICAgc2VsZi5icm93c2Vy Lm9wZW4oY29uZmlnX3VybHMuYnVnX3NlcnZlcl91cmwgKwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IDZhNDIxNTU3OWFmNDA4ODhi OTJlNDUyN2YyZTcwYjk3NThlYjQzZTYuLjEwYTM1NjljOGU3Y2ExMjc2ZWE3ODQ1NGUyMWRhYTU0 OTAwY2ZmYzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9j cmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHMucHkKQEAgLTEzNiwxOSArMTM2LDIwIEBAIGNsYXNzIENyZWRlbnRpYWxzKG9iamVj dCk6CiAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgIHBhc3MKIAotICAgIGRlZiByZWFkX2Ny ZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlcik6CisgICAgZGVmIHJlYWRfY3JlZGVudGlhbHMoc2Vs ZiwgdXNlcj1Vc2VyLCBwcmV2aW91c19mYWlsPUZhbHNlKToKICAgICAgICAgdXNlcm5hbWUsIHBh c3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9lbnZpcm9ubWVudCgpCiAgICAgICAgICMg RklYTUU6IFdlIGRvbid0IGN1cnJlbnRseSBzdXBwb3J0IHB1bGxpbmcgdGhlIHVzZXJuYW1lIGZy b20gb25lCiAgICAgICAgICMgc291cmNlIGFuZCB0aGUgcGFzc3dvcmQgZnJvbSBhIHNlcGFyYXRl IHNvdXJjZS4KLSAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29yZDoKKyAgICAg ICAgIyBEb24ndCBhdXRvLWZpbGwgaW5jb3JyZWN0IHBhc3N3b3JkcyBpZiB0aGV5J3ZlIGJlZW4g ZmlsbGVkIGluIGluY29ycmVjdGx5IG9uY2UuCisgICAgICAgIGlmIChub3QgdXNlcm5hbWUgb3Ig bm90IHBhc3N3b3JkKSBhbmQgbm90IHByZXZpb3VzX2ZhaWw6CiAgICAgICAgICAgICB1c2VybmFt ZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2dpdCgpCi0gICAgICAgIGlmIG5v dCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6CisgICAgICAgIGlmIChub3QgdXNlcm5hbWUgb3Ig bm90IHBhc3N3b3JkKSBhbmQgbm90IHByZXZpb3VzX2ZhaWw6CiAgICAgICAgICAgICB1c2VybmFt ZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQog CiAgICAgICAgIGlmIG5vdCB1c2VybmFtZToKICAgICAgICAgICAgIHVzZXJuYW1lID0gdXNlci5w cm9tcHQoIiVzIGxvZ2luOiAiICUgc2VsZi5ob3N0KQogCi0gICAgICAgIGlmIHVzZXJuYW1lIGFu ZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmc6CisgICAgICAgIGlmIHVzZXJuYW1lIGFu ZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmcgYW5kIG5vdCBwcmV2aW91c19mYWlsOgog ICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHBhc3N3b3JkID0gc2VsZi5fa2V5cmlu Zy5nZXRfcGFzc3dvcmQoc2VsZi5ob3N0LCB1c2VybmFtZSkKICAgICAgICAgICAgIGV4Y2VwdDoK 256846 2015-07-15 11:27:01 -0700 2015-07-15 16:31:02 -0700 Patch bug-146923-20150715112553.patch text/plain 4204 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Nzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBjOTc1YzUzNmY3ZDA0NjQzMmVkNTk4NTBmMmQxZmY5 ZmMzYzU0My4uYTcyMzYxY2I1YWJhYmI0OGQwMzA4OTUyMTEwNmJkMzRlOWRkZTZmYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE1LTA3LTE1ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHdlYmtpdC1wYXRjaCB1c2VzIGluY29ycmVjdCBjcmVkZW50aWFscyBmcm9tIGtl eWNoYWluIHRvIGxvZ2luIHVudGlsIGFjY291bnQgbG9ja291dAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2OTIzIChPT1BTISkuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBgd2Via2l0LXBhdGNo IHVwbG9hZGAgYXNrcyBmb3IgbG9naW4gY3JlZGVudGlhbHMgZm9yIGJ1Z3Mud2Via2l0Lm9yZywg aWYgeW91CisgICAgICAgIHByb3ZpZGUgaW5jb3JyZWN0IGNyZWRlbnRpYWxzIHRoZW4gYXNrIGZv ciB0aGVtIHRvIGJlIHNhdmVkIHRvIHRoZSBrZXljaGFpbgorICAgICAgICB3ZWJraXQtcGF0Y2gg d2lsbCB0aGVuIHVzZSB0aG9zZSBpbmNvcnJlY3QgY3JlZGVudGlhbHMgdW50aWwgNSB0b3RhbCBh dHRlbXB0cworICAgICAgICBoYXZlIGJlZW4gbWFkZSB0byBsb2cgaW4uIFRoaXMgd2lsbCBsb2Nr IHRoZSB1c2VyIG91dCBvZiBCdWd6aWxsYSBmb3IgYQorICAgICAgICBoYWxmIGhvdXIuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6 CisgICAgICAgIChCdWd6aWxsYS5hdXRoZW50aWNhdGUpOkFkZGVkIGFyZ3VtZW50IHRvIHJlYWRf Y3JlZGVudGlhbHMoKSB0aGF0CisgICAgICAgIHBhc3NlcyBpbiB3aGV0aGVyIG9yIG5vdCB0byB1 c2Ugc3RvcmVkIGNyZWRlbnRpYWxzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9jcmVkZW50aWFscy5weToKKyAgICAgICAgKENyZWRlbnRpYWxzLnJlYWRfY3JlZGVudGlh bHMpOiBBZGRlZCBvcHRpb25hbCBhcmd1bWVudCAndXNlX3N0b3JlZF9jcmVkZW50aWFscycKKyAg ICAgICAgdGhhdCBzcGVjaWZpZXMgd2hldGhlciBvciBub3QgdG8gdXNlIGNyZWRlbnRpYWxzIHN0 b3JlZCBvbiB0aGUgc3lzdGVtLiBJZiBpdAorICAgICAgICBkb2VzLCB3ZSBkbyBub3QgYXV0by1m aWxsIGNyZWRlbnRpYWxzIHNpbmNlIGVpdGhlciB0aGUgY3JlZGVudGlhbHMgY2F1c2VkCisgICAg ICAgIHRoZSBmYWlsdXJlLCBvciB0aGV5IHdlcmVuJ3QgdXNlZCBpbiB0aGUgZmlyc3QgcGxhY2Ug c28gdGhlcmUgaXMgbm8gcmVhc29uCisgICAgICAgIHRvIHRyeSBhbmQgdXNlIHRoZW0gYWdhaW4g aWYgYSBmYWlsdXJlIGhhcHBlbmVkLgorCiAyMDE1LTA3LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFVuYWJsZSB0byBkaXNtaXNzIGNvbnRl eHQgbWVudSBkdXJpbmcgdGVzdCBydW5zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNjk1YjExYzMyZGNjN2Nj ODc3MWU0MTJmN2JiNTZiMjQ0NzVkYTIyMS4uNDA4NTMxZTFkOTA4Njg5NGQ5ODA1YTY3YWM2MzNj Y2RmMGNjY2MyZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWd6aWxsYS9idWd6aWxsYS5weQpAQCAtNTI3LDcgKzUyNyw3IEBAIGNsYXNzIEJ1Z3pp bGxhKG9iamVjdCk6CiAgICAgICAgIGF0dGVtcHRzID0gMAogICAgICAgICB3aGlsZSBub3Qgc2Vs Zi5hdXRoZW50aWNhdGVkOgogICAgICAgICAgICAgYXR0ZW1wdHMgKz0gMQotICAgICAgICAgICAg dXNlcm5hbWUsIHBhc3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscygpCisgICAg ICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBjcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxz KHVzZV9zdG9yZWRfY3JlZGVudGlhbHM9YXR0ZW1wdHMgPT0gMSkKIAogICAgICAgICAgICAgX2xv Zy5pbmZvKCJMb2dnaW5nIGluIGFzICVzLi4uIiAlIHVzZXJuYW1lKQogICAgICAgICAgICAgc2Vs Zi5icm93c2VyLm9wZW4oY29uZmlnX3VybHMuYnVnX3NlcnZlcl91cmwgKwpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IDZhNDIxNTU3 OWFmNDA4ODhiOTJlNDUyN2YyZTcwYjk3NThlYjQzZTYuLjRhNTc5Y2I3YmQ2YzBiZjc2ZDZhMDk0 MzRjNDI5N2NmMzQ0NWE3MmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9jcmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvY3JlZGVudGlhbHMucHkKQEAgLTEzNiwxOSArMTM2LDIxIEBAIGNsYXNzIENyZWRlbnRp YWxzKG9iamVjdCk6CiAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgIHBhc3MKIAotICAgIGRl ZiByZWFkX2NyZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlcik6Ci0gICAgICAgIHVzZXJuYW1lLCBw YXNzd29yZCA9IHNlbGYuX2NyZWRlbnRpYWxzX2Zyb21fZW52aXJvbm1lbnQoKQotICAgICAgICAj IEZJWE1FOiBXZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCBwdWxsaW5nIHRoZSB1c2VybmFtZSBm cm9tIG9uZQotICAgICAgICAjIHNvdXJjZSBhbmQgdGhlIHBhc3N3b3JkIGZyb20gYSBzZXBhcmF0 ZSBzb3VyY2UuCi0gICAgICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6Ci0gICAg ICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2dpdCgp Ci0gICAgICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6Ci0gICAgICAgICAgICB1 c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKHVzZXJu YW1lKQorICAgIGRlZiByZWFkX2NyZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlciwgdXNlX3N0b3Jl ZF9jcmVkZW50aWFscz1UcnVlKToKKyAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gTm9uZSwg Tm9uZQorICAgICAgICBpZiB1c2Vfc3RvcmVkX2NyZWRlbnRpYWxzOgorICAgICAgICAgICAgdXNl cm5hbWUsIHBhc3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9lbnZpcm9ubWVudCgpCisg ICAgICAgICAgICAjIEZJWE1FOiBXZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCBwdWxsaW5nIHRo ZSB1c2VybmFtZSBmcm9tIG9uZQorICAgICAgICAgICAgIyBzb3VyY2UgYW5kIHRoZSBwYXNzd29y ZCBmcm9tIGEgc2VwYXJhdGUgc291cmNlLgorICAgICAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9y IG5vdCBwYXNzd29yZDoKKyAgICAgICAgICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxm Ll9jcmVkZW50aWFsc19mcm9tX2dpdCgpCisgICAgICAgICAgICBpZiBub3QgdXNlcm5hbWUgb3Ig bm90IHBhc3N3b3JkOgorICAgICAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCA9IHNlbGYu X2NyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4odXNlcm5hbWUpCiAKICAgICAgICAgaWYgbm90IHVz ZXJuYW1lOgogICAgICAgICAgICAgdXNlcm5hbWUgPSB1c2VyLnByb21wdCgiJXMgbG9naW46ICIg JSBzZWxmLmhvc3QpCiAKLSAgICAgICAgaWYgdXNlcm5hbWUgYW5kIG5vdCBwYXNzd29yZCBhbmQg c2VsZi5fa2V5cmluZzoKKyAgICAgICAgaWYgdXNlcm5hbWUgYW5kIG5vdCBwYXNzd29yZCBhbmQg c2VsZi5fa2V5cmluZyBhbmQgdXNlX3N0b3JlZF9jcmVkZW50aWFsczoKICAgICAgICAgICAgIHRy eToKICAgICAgICAgICAgICAgICBwYXNzd29yZCA9IHNlbGYuX2tleXJpbmcuZ2V0X3Bhc3N3b3Jk KHNlbGYuaG9zdCwgdXNlcm5hbWUpCiAgICAgICAgICAgICBleGNlcHQ6Cg== 256877 2015-07-15 16:31:04 -0700 2015-07-16 10:10:29 -0700 Patch bug-146923-20150715162957.patch text/plain 7542 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Nzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBjOTc1YzUzNmY3ZDA0NjQzMmVkNTk4NTBmMmQxZmY5 ZmMzYzU0My4uMWI5YzcwMTg5ZWYxY2NkNjI0NGVmZmUyZGY5OTAxNTQ3ZjczMjhmYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0 IEBACisyMDE1LTA3LTE1ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHdlYmtpdC1wYXRjaCB1c2VzIGluY29ycmVjdCBjcmVkZW50aWFscyBmcm9tIGtl eWNoYWluIHRvIGxvZ2luIHVudGlsIGFjY291bnQgbG9ja291dAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2OTIzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBgd2Via2l0LXBhdGNoIHVwbG9hZGAg YXNrcyBmb3IgbG9naW4gY3JlZGVudGlhbHMgZm9yIGJ1Z3Mud2Via2l0Lm9yZywgaWYgeW91Cisg ICAgICAgIHByb3ZpZGUgaW5jb3JyZWN0IGNyZWRlbnRpYWxzIHRoZW4gYXNrIGZvciB0aGVtIHRv IGJlIHNhdmVkIHRvIHRoZSBrZXljaGFpbgorICAgICAgICB3ZWJraXQtcGF0Y2ggd2lsbCB0aGVu IHVzZSB0aG9zZSBpbmNvcnJlY3QgY3JlZGVudGlhbHMgdW50aWwgNSB0b3RhbCBhdHRlbXB0cwor ICAgICAgICBoYXZlIGJlZW4gbWFkZSB0byBsb2cgaW4uIFRoaXMgd2lsbCBsb2NrIHRoZSB1c2Vy IG91dCBvZiBCdWd6aWxsYSBmb3IgYQorICAgICAgICBoYWxmIGhvdXIuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6CisgICAgICAg IChCdWd6aWxsYS5hdXRoZW50aWNhdGUpOiBBZGRlZCBhcmd1bWVudCB0byByZWFkX2NyZWRlbnRp YWxzKCkgdGhhdAorICAgICAgICBwYXNzZXMgaW4gd2hldGhlciBvciBub3QgdG8gdXNlIHN0b3Jl ZCBjcmVkZW50aWFscy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHMucHk6CisgICAgICAgIChDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKTogQWRk ZWQgb3B0aW9uYWwgYXJndW1lbnQgJ3VzZV9zdG9yZWRfY3JlZGVudGlhbHMnCisgICAgICAgIHRo YXQgc3BlY2lmaWVzIHdoZXRoZXIgb3Igbm90IHRvIHVzZSBjcmVkZW50aWFscyBzdG9yZWQgb24g dGhlIHN5c3RlbS4gSWYgaXQKKyAgICAgICAgZG9lcywgd2UgZG8gbm90IGF1dG8tZmlsbCBjcmVk ZW50aWFscyBzaW5jZSBlaXRoZXIgdGhlIGNyZWRlbnRpYWxzIGNhdXNlZAorICAgICAgICB0aGUg ZmFpbHVyZSwgb3IgdGhleSB3ZXJlbid0IHVzZWQgaW4gdGhlIGZpcnN0IHBsYWNlIHNvIHRoZXJl IGlzIG5vIHJlYXNvbgorICAgICAgICB0byB0cnkgYW5kIHVzZSB0aGVtIGFnYWluIGlmIGEgZmFp bHVyZSBoYXBwZW5lZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQgdGVzdCBmb3IgbmV3bHkgYWRkZWQKKyAg ICAgICAgdXNlX3N0b3JlZF9wYXNzd29yZCBhcmd1bWVudC4KKyAgICAgICAgKHRlc3Rfa2V5cmlu Z193aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbik6IFRoaXMgd2Fzbid0IGFjdHVhbGx5IGNo YW5nZWQuLi4KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMpOiBB ZGRlZCB1bml0IHRlc3QgdG8gbWFrZSBzdXJlIGZ1bmN0aW9ucyB0aGF0CisgICAgICAgIHJldHJp ZXZlIHVzZXJuYW1lL3Bhc3N3b3JkIGluZm9ybWF0aW9uIGZyb20gdGhlIGxvY2FsIHN5c3RlbSAo ZW52aXJvbm1lbnQsIGdpdCwga2V5Y2hhaW4sCisgICAgICAgIGtleXJpbmcpIGFyZSBuZXZlciBj YWxsZWQuIEl0IGFsc28gdGVzdHMgdGhhdCB3ZSBnZXQgYmFjayBvdXIgbW9ja2VkIHVzZXJuYW1l IGFuZCBwYXNzd29yZC4KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlh bHMuTW9ja0tleXJpbmcpOiBNb2NrIGtleXJpbmcKKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9z dG9yZWRfY3JlZGVudGlhbHMuTW9ja0tleXJpbmcuZ2V0X3Bhc3N3b3JkKTogQXNzZXJ0IHRoaXMg aXMgbmV2ZXIgY2FsbGVkLgorICAgICAgICAodGVzdF9kb19ub3RfdXNlX3N0b3JlZF9jcmVkZW50 aWFscy5GYWtlQ3JlZGVudGlhbHMpOiBNb2NrIGNyZWRlbnRpYWxzCisgICAgICAgICh0ZXN0X2Rv X25vdF91c2Vfc3RvcmVkX2NyZWRlbnRpYWxzLkZha2VDcmVkZW50aWFscy5fY3JlZGVudGlhbHNf ZnJvbV9rZXljaGFpbik6IEFzc2VydCB0aGlzCisgICAgICAgIGlzIG5ldmVyIGNhbGxlZC4KKyAg ICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMuRmFrZUNyZWRlbnRpYWxz Ll9jcmVkZW50aWFsc19mcm9tX2Vudmlyb25tZW50KTogRGl0dG8KKyAgICAgICAgKHRlc3RfZG9f bm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMuRmFrZUNyZWRlbnRpYWxzCisgICAgICAgIC5fb2Zm ZXJfdG9fc3RvcmVfY3JlZGVudGlhbHNfaW5fa2V5cmluZyk6IERpdHRvCisgICAgICAgICh0ZXN0 X2RvX25vdF91c2Vfc3RvcmVkX2NyZWRlbnRpYWxzLkZha2VVc2VyKTogTW9jayB0aGUgVXNlciBj bGFzcworICAgICAgICAodGVzdF9kb19ub3RfdXNlX3N0b3JlZF9jcmVkZW50aWFscy5GYWtlVXNl ci5wcm9tcHQpOiBSZXR1cm5zIGEgdXNlcm5hbWUgdG8gYXNzZXJ0IGFnYWluc3QuCisgICAgICAg ICh0ZXN0X2RvX25vdF91c2Vfc3RvcmVkX2NyZWRlbnRpYWxzLkZha2VVc2VyLnByb21wdF9wYXNz d29yZCk6IFJldHVybnMgYSBwYXNzd29yZCB0byBhc3NlcnQKKyAgICAgICAgYWdhaW5zdC4KKwog MjAxNS0wNy0xMCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTWFjXSBVbmFibGUgdG8gZGlzbWlzcyBjb250ZXh0IG1lbnUgZHVyaW5nIHRlc3QgcnVucwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1 Z3ppbGxhLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1 Z3ppbGxhLnB5CmluZGV4IDY5NWIxMWMzMmRjYzdjYzg3NzFlNDEyZjdiYjU2YjI0NDc1ZGEyMjEu LjQwODUzMWUxZDkwODY4OTRkOTgwNWE2N2FjNjMzY2NkZjBjY2NjMmYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkK QEAgLTUyNyw3ICs1MjcsNyBAQCBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICBhdHRl bXB0cyA9IDAKICAgICAgICAgd2hpbGUgbm90IHNlbGYuYXV0aGVudGljYXRlZDoKICAgICAgICAg ICAgIGF0dGVtcHRzICs9IDEKLSAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCA9IGNyZWRl bnRpYWxzLnJlYWRfY3JlZGVudGlhbHMoKQorICAgICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3Jk ID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscyh1c2Vfc3RvcmVkX2NyZWRlbnRpYWxzPWF0 dGVtcHRzID09IDEpCiAKICAgICAgICAgICAgIF9sb2cuaW5mbygiTG9nZ2luZyBpbiBhcyAlcy4u LiIgJSB1c2VybmFtZSkKICAgICAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKGNvbmZpZ191cmxz LmJ1Z19zZXJ2ZXJfdXJsICsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9jcmVkZW50aWFscy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9jcmVkZW50aWFscy5weQppbmRleCA2YTQyMTU1NzlhZjQwODg4YjkyZTQ1MjdmMmU3MGI5NzU4 ZWI0M2U2Li40YTU3OWNiN2JkNmMwYmY3NmQ2YTA5NDM0YzQyOTdjZjM0NDVhNzJkIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CkBAIC0x MzYsMTkgKzEzNiwyMSBAQCBjbGFzcyBDcmVkZW50aWFscyhvYmplY3QpOgogICAgICAgICBleGNl cHQ6CiAgICAgICAgICAgICBwYXNzCiAKLSAgICBkZWYgcmVhZF9jcmVkZW50aWFscyhzZWxmLCB1 c2VyPVVzZXIpOgotICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFs c19mcm9tX2Vudmlyb25tZW50KCkKLSAgICAgICAgIyBGSVhNRTogV2UgZG9uJ3QgY3VycmVudGx5 IHN1cHBvcnQgcHVsbGluZyB0aGUgdXNlcm5hbWUgZnJvbSBvbmUKLSAgICAgICAgIyBzb3VyY2Ug YW5kIHRoZSBwYXNzd29yZCBmcm9tIGEgc2VwYXJhdGUgc291cmNlLgotICAgICAgICBpZiBub3Qg dXNlcm5hbWUgb3Igbm90IHBhc3N3b3JkOgotICAgICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3Jk ID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9naXQoKQotICAgICAgICBpZiBub3QgdXNlcm5hbWUg b3Igbm90IHBhc3N3b3JkOgotICAgICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gc2VsZi5f Y3JlZGVudGlhbHNfZnJvbV9rZXljaGFpbih1c2VybmFtZSkKKyAgICBkZWYgcmVhZF9jcmVkZW50 aWFscyhzZWxmLCB1c2VyPVVzZXIsIHVzZV9zdG9yZWRfY3JlZGVudGlhbHM9VHJ1ZSk6CisgICAg ICAgIHVzZXJuYW1lLCBwYXNzd29yZCA9IE5vbmUsIE5vbmUKKyAgICAgICAgaWYgdXNlX3N0b3Jl ZF9jcmVkZW50aWFsczoKKyAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCA9IHNlbGYuX2Ny ZWRlbnRpYWxzX2Zyb21fZW52aXJvbm1lbnQoKQorICAgICAgICAgICAgIyBGSVhNRTogV2UgZG9u J3QgY3VycmVudGx5IHN1cHBvcnQgcHVsbGluZyB0aGUgdXNlcm5hbWUgZnJvbSBvbmUKKyAgICAg ICAgICAgICMgc291cmNlIGFuZCB0aGUgcGFzc3dvcmQgZnJvbSBhIHNlcGFyYXRlIHNvdXJjZS4K KyAgICAgICAgICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6CisgICAgICAgICAg ICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9naXQoKQor ICAgICAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29yZDoKKyAgICAgICAgICAg ICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWlu KHVzZXJuYW1lKQogCiAgICAgICAgIGlmIG5vdCB1c2VybmFtZToKICAgICAgICAgICAgIHVzZXJu YW1lID0gdXNlci5wcm9tcHQoIiVzIGxvZ2luOiAiICUgc2VsZi5ob3N0KQogCi0gICAgICAgIGlm IHVzZXJuYW1lIGFuZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmc6CisgICAgICAgIGlm IHVzZXJuYW1lIGFuZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tleXJpbmcgYW5kIHVzZV9zdG9y ZWRfY3JlZGVudGlhbHM6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgcGFzc3dv cmQgPSBzZWxmLl9rZXlyaW5nLmdldF9wYXNzd29yZChzZWxmLmhvc3QsIHVzZXJuYW1lKQogICAg ICAgICAgICAgZXhjZXB0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5CmluZGV4IDFiNGZkN2VhZTlmYTA0NTE0 NTE3ZjliMzIxNTdkYjZlY2QxNjRiYWYuLjY2OTc0YTc0YTQ0Zjg2M2Y1ZTEyNzZhNzhlNGJkNjg1 MjVjMDYwZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9j cmVkZW50aWFsc191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkKQEAgLTIwNywzICsyMDcsMzEgQEAgcGFzc3dv cmQ6ICJTRUNSRVRTQVVDRSIKICAgICAgICAgICAgICMgRklYTUU6IFVzaW5nIHJlYWRfY3JlZGVu dGlhbHMgaGVyZSBzZWVtcyB0b28gYnJvYWQgYXMgaGlnaGVyLXByaW9yaXR5CiAgICAgICAgICAg ICAjIGNyZWRlbnRpYWwgc291cmNlIGNvdWxkIGJlIGFmZmVjdGVkIGJ5IHRoZSB1c2VyJ3MgZW52 aXJvbm1lbnQuCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNyZWRlbnRpYWxzLnJlYWRf Y3JlZGVudGlhbHMoRmFrZVVzZXIpLCAoInRlc3RAd2Via2l0Lm9yZyIsICJOT01OT01OT00iKSkK KworICAgIGRlZiB0ZXN0X2RvX25vdF91c2Vfc3RvcmVkX2NyZWRlbnRpYWxzKHNlbGYpOgorICAg ICAgICBjbGFzcyBNb2NrS2V5cmluZyhvYmplY3QpOgorICAgICAgICAgICAgZGVmIGdldF9wYXNz d29yZChzZWxmLCBob3N0LCB1c2VybmFtZSk6CisgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0 aW9uRXJyb3IoIlNob3VsZCBub3QgcmVhZCBmcm9tIGtleXJpbmcuIikKKworICAgICAgICBjbGFz cyBGYWtlQ3JlZGVudGlhbHMoTW9ja2VkQ3JlZGVudGlhbHMpOgorICAgICAgICAgICAgZGVmIF9j cmVkZW50aWFsc19mcm9tX2tleWNoYWluKHNlbGYsIHVzZXJuYW1lKToKKyAgICAgICAgICAgICAg ICByYWlzZSBBc3NlcnRpb25FcnJvcigiU2hvdWxkIG5vdCByZWFkIGZyb20ga2V5Y2hhaW4uIikK KworICAgICAgICAgICAgZGVmIF9jcmVkZW50aWFsc19mcm9tX2Vudmlyb25tZW50KHNlbGYpOgor ICAgICAgICAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCJTaG91bGQgbm90IHJlYWQgZnJv bSBlbnZpcm9ubWVudC4iKQorCisgICAgICAgICAgICBkZWYgX29mZmVyX3RvX3N0b3JlX2NyZWRl bnRpYWxzX2luX2tleXJpbmcoc2VsZiwgdXNlcm5hbWUsIHBhc3N3b3JkKToKKyAgICAgICAgICAg ICAgICByZXR1cm4KKworICAgICAgICBjbGFzcyBGYWtlVXNlcihNb2NrVXNlcik6CisgICAgICAg ICAgICBAY2xhc3NtZXRob2QKKyAgICAgICAgICAgIGRlZiBwcm9tcHQoY2xzLCBtZXNzYWdlLCBy ZXBlYXQ9MSwgcmF3X2lucHV0PXJhd19pbnB1dCk6CisgICAgICAgICAgICAgICAgcmV0dXJuICJ0 ZXN0QHdlYmtpdC5vcmciCisKKyAgICAgICAgICAgIEBjbGFzc21ldGhvZAorICAgICAgICAgICAg ZGVmIHByb21wdF9wYXNzd29yZChjbHMsIG1lc3NhZ2UsIHJlcGVhdD0xLCByYXdfaW5wdXQ9cmF3 X2lucHV0KToKKyAgICAgICAgICAgICAgICByZXR1cm4gIk5PTU5PTU5PTSIKKworICAgICAgICB3 aXRoIF9UZW1wb3JhcnlEaXJlY3Rvcnkoc3VmZml4PSJub3RfYV9naXRfcmVwbyIpIGFzIHRlbXBf ZGlyX3BhdGg6CisgICAgICAgICAgICBjcmVkZW50aWFscyA9IEZha2VDcmVkZW50aWFscygiZmFr ZS5ob3N0bmFtZSIsIGN3ZD10ZW1wX2Rpcl9wYXRoLCBrZXlyaW5nPU1vY2tLZXlyaW5nKCkpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNyZWRlbnRpYWxzLnJlYWRfY3JlZGVudGlhbHMo RmFrZVVzZXIsIHVzZV9zdG9yZWRfY3JlZGVudGlhbHM9RmFsc2UpLCAoInRlc3RAd2Via2l0Lm9y ZyIsICJOT01OT01OT00iKSkK 256905 2015-07-16 10:10:32 -0700 2015-07-16 21:00:59 -0700 Patch bug-146923-20150716100923.patch text/plain 7446 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Nzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBjOTc1YzUzNmY3ZDA0NjQzMmVkNTk4NTBmMmQxZmY5 ZmMzYzU0My4uMjA2ODZkOWFjZDFjOGI0MDY1ZmI3YTg0YjY3NGMzYTg5MTNlY2E0YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDE1LTA3LTE2ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgor CisgICAgICAgIHdlYmtpdC1wYXRjaCB1c2VzIGluY29ycmVjdCBjcmVkZW50aWFscyBmcm9tIGtl eWNoYWluIHRvIGxvZ2luIHVudGlsIGFjY291bnQgbG9ja291dAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2OTIzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBgd2Via2l0LXBhdGNoIHVwbG9hZGAg YXNrcyBmb3IgbG9naW4gY3JlZGVudGlhbHMgZm9yIGJ1Z3Mud2Via2l0Lm9yZywgaWYgeW91Cisg ICAgICAgIHByb3ZpZGUgaW5jb3JyZWN0IGNyZWRlbnRpYWxzIHRoZW4gYXNrIGZvciB0aGVtIHRv IGJlIHNhdmVkIHRvIHRoZSBrZXljaGFpbgorICAgICAgICB3ZWJraXQtcGF0Y2ggd2lsbCB0aGVu IHVzZSB0aG9zZSBpbmNvcnJlY3QgY3JlZGVudGlhbHMgdW50aWwgNSB0b3RhbCBhdHRlbXB0cwor ICAgICAgICBoYXZlIGJlZW4gbWFkZSB0byBsb2cgaW4uIFRoaXMgd2lsbCBsb2NrIHRoZSB1c2Vy IG91dCBvZiBCdWd6aWxsYSBmb3IgYQorICAgICAgICBoYWxmIGhvdXIuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6CisgICAgICAg IChCdWd6aWxsYS5hdXRoZW50aWNhdGUpOiBBZGRlZCBhcmd1bWVudCB0byByZWFkX2NyZWRlbnRp YWxzKCkgdGhhdAorICAgICAgICBwYXNzZXMgaW4gd2hldGhlciBvciBub3QgdG8gdXNlIHN0b3Jl ZCBjcmVkZW50aWFscy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHMucHk6CisgICAgICAgIChDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKTogQWRk ZWQgb3B0aW9uYWwgYXJndW1lbnQgJ3VzZV9zdG9yZWRfY3JlZGVudGlhbHMnCisgICAgICAgIHRo YXQgc3BlY2lmaWVzIHdoZXRoZXIgb3Igbm90IHRvIHVzZSBjcmVkZW50aWFscyBzdG9yZWQgb24g dGhlIHN5c3RlbS4gSWYgaXQKKyAgICAgICAgZG9lcywgd2UgZG8gbm90IGF1dG8tZmlsbCBjcmVk ZW50aWFscyBzaW5jZSBlaXRoZXIgdGhlIGNyZWRlbnRpYWxzIGNhdXNlZAorICAgICAgICB0aGUg ZmFpbHVyZSwgb3IgdGhleSB3ZXJlbid0IHVzZWQgaW4gdGhlIGZpcnN0IHBsYWNlIHNvIHRoZXJl IGlzIG5vIHJlYXNvbgorICAgICAgICB0byB0cnkgYW5kIHVzZSB0aGVtIGFnYWluIGlmIGEgZmFp bHVyZSBoYXBwZW5lZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3Jl ZGVudGlhbHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQgdGVzdCBmb3IgbmV3bHkgYWRkZWQKKyAg ICAgICAgdXNlX3N0b3JlZF9jcmVkZW50aWFscyBhcmd1bWVudC4KKyAgICAgICAgKHRlc3RfZG9f bm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMpOiBBZGRlZCB1bml0IHRlc3QgdG8gbWFrZSBzdXJl IGZ1bmN0aW9ucyB0aGF0CisgICAgICAgIHJldHJpZXZlIHVzZXJuYW1lL3Bhc3N3b3JkIGluZm9y bWF0aW9uIGZyb20gdGhlIGxvY2FsIHN5c3RlbSAoZW52aXJvbm1lbnQsIEdpdCwga2V5Y2hhaW4s CisgICAgICAgIGtleXJpbmcpIGFyZSBuZXZlciBjYWxsZWQuIEl0IGFsc28gdGVzdHMgdGhhdCB3 ZSBnZXQgYmFjayBvdXIgbW9ja2VkIHVzZXJuYW1lIGFuZCBwYXNzd29yZC4KKyAgICAgICAgKHRl c3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMuTW9ja0tleXJpbmcpOiBNb2NrIGtleXJp bmcKKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMuTW9ja0tleXJp bmcuZ2V0X3Bhc3N3b3JkKTogQXNzZXJ0IHRoaXMgaXMgbmV2ZXIgY2FsbGVkLgorICAgICAgICAo dGVzdF9kb19ub3RfdXNlX3N0b3JlZF9jcmVkZW50aWFscy5GYWtlQ3JlZGVudGlhbHMpOiBNb2Nr IGNyZWRlbnRpYWxzCisgICAgICAgICh0ZXN0X2RvX25vdF91c2Vfc3RvcmVkX2NyZWRlbnRpYWxz LkZha2VDcmVkZW50aWFscy5fY3JlZGVudGlhbHNfZnJvbV9rZXljaGFpbik6IEFzc2VydCB0aGlz CisgICAgICAgIGlzIG5ldmVyIGNhbGxlZC4KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9y ZWRfY3JlZGVudGlhbHMuRmFrZUNyZWRlbnRpYWxzLl9jcmVkZW50aWFsc19mcm9tX2Vudmlyb25t ZW50KTogRGl0dG8KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMu RmFrZUNyZWRlbnRpYWxzLl9vZmZlcl90b19zdG9yZV9jcmVkZW50aWFsc19pbl9rZXlyaW5nKTog RGl0dG8KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMuRmFrZVVz ZXIpOiBNb2NrIHRoZSBVc2VyIGNsYXNzCisgICAgICAgICh0ZXN0X2RvX25vdF91c2Vfc3RvcmVk X2NyZWRlbnRpYWxzLkZha2VVc2VyLnByb21wdCk6IFJldHVybnMgYSB1c2VybmFtZSB0byBhc3Nl cnQgYWdhaW5zdC4KKyAgICAgICAgKHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3JlZGVudGlhbHMu RmFrZVVzZXIucHJvbXB0X3Bhc3N3b3JkKTogUmV0dXJucyBhIHBhc3N3b3JkIHRvIGFzc2VydAor ICAgICAgICBhZ2FpbnN0LgorCiAyMDE1LTA3LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFVuYWJsZSB0byBkaXNtaXNzIGNvbnRleHQgbWVu dSBkdXJpbmcgdGVzdCBydW5zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggNjk1YjExYzMyZGNjN2NjODc3MWU0 MTJmN2JiNTZiMjQ0NzVkYTIyMS4uNDA4NTMxZTFkOTA4Njg5NGQ5ODA1YTY3YWM2MzNjY2RmMGNj Y2MyZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL2J1Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWd6aWxsYS9idWd6aWxsYS5weQpAQCAtNTI3LDcgKzUyNyw3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9i amVjdCk6CiAgICAgICAgIGF0dGVtcHRzID0gMAogICAgICAgICB3aGlsZSBub3Qgc2VsZi5hdXRo ZW50aWNhdGVkOgogICAgICAgICAgICAgYXR0ZW1wdHMgKz0gMQotICAgICAgICAgICAgdXNlcm5h bWUsIHBhc3N3b3JkID0gY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscygpCisgICAgICAgICAg ICB1c2VybmFtZSwgcGFzc3dvcmQgPSBjcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKHVzZV9z dG9yZWRfY3JlZGVudGlhbHM9YXR0ZW1wdHMgPT0gMSkKIAogICAgICAgICAgICAgX2xvZy5pbmZv KCJMb2dnaW5nIGluIGFzICVzLi4uIiAlIHVzZXJuYW1lKQogICAgICAgICAgICAgc2VsZi5icm93 c2VyLm9wZW4oY29uZmlnX3VybHMuYnVnX3NlcnZlcl91cmwgKwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IDZhNDIxNTU3OWFmNDA4 ODhiOTJlNDUyN2YyZTcwYjk3NThlYjQzZTYuLjRhNTc5Y2I3YmQ2YzBiZjc2ZDZhMDk0MzRjNDI5 N2NmMzQ0NWE3MmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9jcmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQv Y3JlZGVudGlhbHMucHkKQEAgLTEzNiwxOSArMTM2LDIxIEBAIGNsYXNzIENyZWRlbnRpYWxzKG9i amVjdCk6CiAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgIHBhc3MKIAotICAgIGRlZiByZWFk X2NyZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlcik6Ci0gICAgICAgIHVzZXJuYW1lLCBwYXNzd29y ZCA9IHNlbGYuX2NyZWRlbnRpYWxzX2Zyb21fZW52aXJvbm1lbnQoKQotICAgICAgICAjIEZJWE1F OiBXZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCBwdWxsaW5nIHRoZSB1c2VybmFtZSBmcm9tIG9u ZQotICAgICAgICAjIHNvdXJjZSBhbmQgdGhlIHBhc3N3b3JkIGZyb20gYSBzZXBhcmF0ZSBzb3Vy Y2UuCi0gICAgICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6Ci0gICAgICAgICAg ICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2dpdCgpCi0gICAg ICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3QgcGFzc3dvcmQ6Ci0gICAgICAgICAgICB1c2VybmFt ZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQor ICAgIGRlZiByZWFkX2NyZWRlbnRpYWxzKHNlbGYsIHVzZXI9VXNlciwgdXNlX3N0b3JlZF9jcmVk ZW50aWFscz1UcnVlKToKKyAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gTm9uZSwgTm9uZQor ICAgICAgICBpZiB1c2Vfc3RvcmVkX2NyZWRlbnRpYWxzOgorICAgICAgICAgICAgdXNlcm5hbWUs IHBhc3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9lbnZpcm9ubWVudCgpCisgICAgICAg ICAgICAjIEZJWE1FOiBXZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCBwdWxsaW5nIHRoZSB1c2Vy bmFtZSBmcm9tIG9uZQorICAgICAgICAgICAgIyBzb3VyY2UgYW5kIHRoZSBwYXNzd29yZCBmcm9t IGEgc2VwYXJhdGUgc291cmNlLgorICAgICAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9yIG5vdCBw YXNzd29yZDoKKyAgICAgICAgICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVk ZW50aWFsc19mcm9tX2dpdCgpCisgICAgICAgICAgICBpZiBub3QgdXNlcm5hbWUgb3Igbm90IHBh c3N3b3JkOgorICAgICAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCA9IHNlbGYuX2NyZWRl bnRpYWxzX2Zyb21fa2V5Y2hhaW4odXNlcm5hbWUpCiAKICAgICAgICAgaWYgbm90IHVzZXJuYW1l OgogICAgICAgICAgICAgdXNlcm5hbWUgPSB1c2VyLnByb21wdCgiJXMgbG9naW46ICIgJSBzZWxm Lmhvc3QpCiAKLSAgICAgICAgaWYgdXNlcm5hbWUgYW5kIG5vdCBwYXNzd29yZCBhbmQgc2VsZi5f a2V5cmluZzoKKyAgICAgICAgaWYgdXNlcm5hbWUgYW5kIG5vdCBwYXNzd29yZCBhbmQgc2VsZi5f a2V5cmluZyBhbmQgdXNlX3N0b3JlZF9jcmVkZW50aWFsczoKICAgICAgICAgICAgIHRyeToKICAg ICAgICAgICAgICAgICBwYXNzd29yZCA9IHNlbGYuX2tleXJpbmcuZ2V0X3Bhc3N3b3JkKHNlbGYu aG9zdCwgdXNlcm5hbWUpCiAgICAgICAgICAgICBleGNlcHQ6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkKaW5k ZXggMWI0ZmQ3ZWFlOWZhMDQ1MTQ1MTdmOWIzMjE1N2RiNmVjZDE2NGJhZi4uNjkzMmFmNWU0N2Fm NzIwYTE3ZjZmZDAwZGY2YzFiOTZkY2U2MGJkZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFsc191bml0dGVzdC5weQpAQCAtMjA3 LDMgKzIwNywzMSBAQCBwYXNzd29yZDogIlNFQ1JFVFNBVUNFIgogICAgICAgICAgICAgIyBGSVhN RTogVXNpbmcgcmVhZF9jcmVkZW50aWFscyBoZXJlIHNlZW1zIHRvbyBicm9hZCBhcyBoaWdoZXIt cHJpb3JpdHkKICAgICAgICAgICAgICMgY3JlZGVudGlhbCBzb3VyY2UgY291bGQgYmUgYWZmZWN0 ZWQgYnkgdGhlIHVzZXIncyBlbnZpcm9ubWVudC4KICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY3JlZGVudGlhbHMucmVhZF9jcmVkZW50aWFscyhGYWtlVXNlciksICgidGVzdEB3ZWJraXQu b3JnIiwgIk5PTU5PTU5PTSIpKQorCisgICAgZGVmIHRlc3RfZG9fbm90X3VzZV9zdG9yZWRfY3Jl ZGVudGlhbHMoc2VsZik6CisgICAgICAgIGNsYXNzIE1vY2tLZXlyaW5nKG9iamVjdCk6CisgICAg ICAgICAgICBkZWYgZ2V0X3Bhc3N3b3JkKHNlbGYsIGhvc3QsIHVzZXJuYW1lKToKKyAgICAgICAg ICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJvcigiU2hvdWxkIG5vdCByZWFkIGZyb20ga2V5cmlu Zy4iKQorCisgICAgICAgIGNsYXNzIEZha2VDcmVkZW50aWFscyhNb2NrZWRDcmVkZW50aWFscyk6 CisgICAgICAgICAgICBkZWYgX2NyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4oc2VsZiwgdXNlcm5h bWUpOgorICAgICAgICAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCJTaG91bGQgbm90IHJl YWQgZnJvbSBrZXljaGFpbi4iKQorCisgICAgICAgICAgICBkZWYgX2NyZWRlbnRpYWxzX2Zyb21f ZW52aXJvbm1lbnQoc2VsZik6CisgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3Io IlNob3VsZCBub3QgcmVhZCBmcm9tIGVudmlyb25tZW50LiIpCisKKyAgICAgICAgICAgIGRlZiBf b2ZmZXJfdG9fc3RvcmVfY3JlZGVudGlhbHNfaW5fa2V5cmluZyhzZWxmLCB1c2VybmFtZSwgcGFz c3dvcmQpOgorICAgICAgICAgICAgICAgIHBhc3MKKworICAgICAgICBjbGFzcyBGYWtlVXNlcihN b2NrVXNlcik6CisgICAgICAgICAgICBAY2xhc3NtZXRob2QKKyAgICAgICAgICAgIGRlZiBwcm9t cHQoY2xzLCBtZXNzYWdlLCByZXBlYXQ9MSwgcmF3X2lucHV0PXJhd19pbnB1dCk6CisgICAgICAg ICAgICAgICAgcmV0dXJuICJ0ZXN0QHdlYmtpdC5vcmciCisKKyAgICAgICAgICAgIEBjbGFzc21l dGhvZAorICAgICAgICAgICAgZGVmIHByb21wdF9wYXNzd29yZChjbHMsIG1lc3NhZ2UsIHJlcGVh dD0xLCByYXdfaW5wdXQ9cmF3X2lucHV0KToKKyAgICAgICAgICAgICAgICByZXR1cm4gIk5PTU5P TU5PTSIKKworICAgICAgICB3aXRoIF9UZW1wb3JhcnlEaXJlY3Rvcnkoc3VmZml4PSJub3RfYV9n aXRfcmVwbyIpIGFzIHRlbXBfZGlyX3BhdGg6CisgICAgICAgICAgICBjcmVkZW50aWFscyA9IEZh a2VDcmVkZW50aWFscygiZmFrZS5ob3N0bmFtZSIsIGN3ZD10ZW1wX2Rpcl9wYXRoLCBrZXlyaW5n PU1vY2tLZXlyaW5nKCkpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNyZWRlbnRpYWxz LnJlYWRfY3JlZGVudGlhbHMoRmFrZVVzZXIsIHVzZV9zdG9yZWRfY3JlZGVudGlhbHM9RmFsc2Up LCAoInRlc3RAd2Via2l0Lm9yZyIsICJOT01OT01OT00iKSkK