From mboxrd@z Thu Jan  1 00:00:00 1970
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
From: Tomas Mraz <tmraz@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/openssl] rebase_40beta: more fixes from upstream CVS
Date: Tue, 09 Jun 2026 12:42:45 GMT
Message-ID: <178100896583.1.8967430749407829397.rpms-openssl-12aab15a0382@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/openssl
X-Git-Branch: rebase_40beta
X-Git-Rev: 12aab15a0382a3b52261d6f0a460d2f794b7bfa1

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvb3BlbnNzbAogICAgICAgICAgICBCcmFuY2ggOiByZWJhc2VfNDBiZXRhCiAg
ICAgICAgICAgIENvbW1pdCA6IDEyYWFiMTVhMDM4MmEzYjUyMjYxZDZmMGE0NjBkMmY3OTRiN2Jm
YTEKICAgICAgICAgICAgQXV0aG9yIDogVG9tYXMgTXJheiA8dG1yYXpAZmVkb3JhcHJvamVjdC5v
cmc+CiAgICAgICAgICAgIERhdGUgICA6IDIwMTItMTEtMjBUMjI6MzM6NDIrMDE6MDAKICAgICAg
ICAgICAgU3RhdHMgIDogKzI5Ni8tMTAgaW4gMyBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6
IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvb3BlbnNzbC9jLzEyYWFiMTVhMDM4
MmEzYjUyMjYxZDZmMGE0NjBkMmY3OTRiN2JmYTE/YnJhbmNoPXJlYmFzZV80MGJldGEKCiAgICAg
ICAgICAgIExvZzoKICAgICAgICAgICAgbW9yZSBmaXhlcyBmcm9tIHVwc3RyZWFtIENWUwoKLSBm
aXggRFNBIGtleSBwYWlyd2lzZSBjaGVjayAoIzg3ODU5NykKCi0tLQpkaWZmIC0tZ2l0IGEvb3Bl
bnNzbC0xLjAuMWMtYmFja3BvcnRzMi5wYXRjaCBiL29wZW5zc2wtMS4wLjFjLWJhY2twb3J0czIu
cGF0Y2gKaW5kZXggYTY0NzdlNy4uMmU4NDliYyAxMDA2NDQKLS0tIGEvb3BlbnNzbC0xLjAuMWMt
YmFja3BvcnRzMi5wYXRjaAorKysgYi9vcGVuc3NsLTEuMC4xYy1iYWNrcG9ydHMyLnBhdGNoCkBA
IC0xLDYgKzEsNiBAQAogZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvYXBwcy9jbXMuYy5iYWNrcG9y
dHMyIG9wZW5zc2wtMS4wLjFjL2FwcHMvY21zLmMKIC0tLSBvcGVuc3NsLTEuMC4xYy9hcHBzL2Nt
cy5jLmJhY2twb3J0czIJMjAxMi0wMS0wNSAxNDo0NjoyNy4wMDAwMDAwMDAgKzAxMDAKLSsrKyBv
cGVuc3NsLTEuMC4xYy9hcHBzL2Ntcy5jCTIwMTItMDktMDcgMTA6MzQ6NDIuMDAwMDAwMDAwICsw
MjAwCisrKysgb3BlbnNzbC0xLjAuMWMvYXBwcy9jbXMuYwkyMDEyLTExLTE0IDIwOjI3OjUwLjI0
MDIxMTcwNyArMDEwMAogQEAgLTIzMyw2ICsyMzMsOCBAQCBpbnQgTUFJTihpbnQgYXJnYywgY2hh
ciAqKmFyZ3YpCiAgCQllbHNlIGlmICghc3RyY21wKCphcmdzLCItY2FtZWxsaWEyNTYiKSkKICAJ
CQkJY2lwaGVyID0gRVZQX2NhbWVsbGlhXzI1Nl9jYmMoKTsKQEAgLTE5LDkgKzE5LDIwIEBAIGRp
ZmYgLXVwIG9wZW5zc2wtMS4wLjFjL2FwcHMvY21zLmMuYmFja3BvcnRzMiBvcGVuc3NsLTEuMC4x
Yy9hcHBzL2Ntcy5jCiAgCiAgCQlpZiAoc2VjcmV0X2tleSkKICAJCQl7CitkaWZmIC11cCBvcGVu
c3NsLTEuMC4xYy9jcnlwdG8vYXNuMS9hX3N0cmV4LmMuYmFja3BvcnRzMiBvcGVuc3NsLTEuMC4x
Yy9jcnlwdG8vYXNuMS9hX3N0cmV4LmMKKy0tLSBvcGVuc3NsLTEuMC4xYy9jcnlwdG8vYXNuMS9h
X3N0cmV4LmMuYmFja3BvcnRzMgkyMDExLTAxLTAzIDAyOjMwOjU4LjAwMDAwMDAwMCArMDEwMAor
KysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9hc24xL2Ffc3RyZXguYwkyMDEyLTExLTIwIDIyOjEz
OjA1LjcyMjc2Njk4MCArMDEwMAorQEAgLTU2Nyw2ICs1NjcsNyBAQCBpbnQgQVNOMV9TVFJJTkdf
dG9fVVRGOCh1bnNpZ25lZCBjaGFyICoqCisgCWlmKG1iZmxhZyA9PSAtMSkgcmV0dXJuIC0xOwor
IAltYmZsYWcgfD0gTUJTVFJJTkdfRkxBRzsKKyAJc3RtcC5kYXRhID0gTlVMTDsKKysJc3RtcC5s
ZW5ndGggPSAwOworIAlyZXQgPSBBU04xX21ic3RyaW5nX2NvcHkoJnN0ciwgaW4tPmRhdGEsIGlu
LT5sZW5ndGgsIG1iZmxhZywgQl9BU04xX1VURjhTVFJJTkcpOworIAlpZihyZXQgPCAwKSByZXR1
cm4gcmV0OworIAkqb3V0ID0gc3RtcC5kYXRhOwogZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvY3J5
cHRvL2JuL2JuX2xjbC5oLmJhY2twb3J0czIgb3BlbnNzbC0xLjAuMWMvY3J5cHRvL2JuL2JuX2xj
bC5oCi0tLS0gb3BlbnNzbC0xLjAuMWMvY3J5cHRvL2JuL2JuX2xjbC5oLmJhY2twb3J0czIJMjAx
Mi0wOS0wNiAxNzoyNToyMi4wMDAwMDAwMDAgKzAyMDAKLSsrKyBvcGVuc3NsLTEuMC4xYy9jcnlw
dG8vYm4vYm5fbGNsLmgJMjAxMi0wOS0wNyAxMDoyMjo0My4wMDAwMDAwMDAgKzAyMDAKKy0tLSBv
cGVuc3NsLTEuMC4xYy9jcnlwdG8vYm4vYm5fbGNsLmguYmFja3BvcnRzMgkyMDEyLTExLTE0IDIw
OjI3OjQ5LjY5NjE5OTgxMSArMDEwMAorKysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9ibi9ibl9s
Y2wuaAkyMDEyLTExLTE0IDIwOjI3OjUwLjI0MDIxMTcwNyArMDEwMAogQEAgLTI4MiwxNiArMjgy
LDIzIEBAIGV4dGVybiAiQyIgewogICMgIGVuZGlmCiAgIyBlbGlmIGRlZmluZWQoX19taXBzKSAm
JiAoZGVmaW5lZChTSVhUWV9GT1VSX0JJVCkgfHwgZGVmaW5lZChTSVhUWV9GT1VSX0JJVF9MT05H
KSkKQEAgLTQ4LDkgKzU5LDMwIEBAIGRpZmYgLXVwIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9ibi9i
bl9sY2wuaC5iYWNrcG9ydHMyIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9ibi9iCiAgIyAgZW5kaWYK
ICAjIGVuZGlmCQkvKiBjcHUgKi8KICAjZW5kaWYJCS8qIE9QRU5TU0xfTk9fQVNNICovCitkaWZm
IC11cCBvcGVuc3NsLTEuMC4xYy9jcnlwdG8vZXZwL2VfYWVzLmMuYmFja3BvcnRzMiBvcGVuc3Ns
LTEuMC4xYy9jcnlwdG8vZXZwL2VfYWVzLmMKKy0tLSBvcGVuc3NsLTEuMC4xYy9jcnlwdG8vZXZw
L2VfYWVzLmMuYmFja3BvcnRzMgkyMDEyLTExLTE0IDIwOjI3OjUwLjIzODIxMTY2NCArMDEwMAor
KysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9ldnAvZV9hZXMuYwkyMDEyLTExLTIwIDIyOjEwOjA2
LjM1MDg5MTcwMyArMDEwMAorQEAgLTk2OCw4ICs5NjgsNiBAQCBzdGF0aWMgaW50IGFlc19nY21f
Y2lwaGVyKEVWUF9DSVBIRVJfQ1RYCisgCisgCWlmICghZ2N0eC0+aXZfc2V0KQorIAkJcmV0dXJu
IC0xOworLQlpZiAoIWN0eC0+ZW5jcnlwdCAmJiBnY3R4LT50YWdsZW4gPCAwKQorLQkJcmV0dXJu
IC0xOworIAlpZiAoaW4pCisgCQl7CisgCQlpZiAob3V0ID09IE5VTEwpCitAQCAtMTAxMSw2ICsx
MDA5LDggQEAgc3RhdGljIGludCBhZXNfZ2NtX2NpcGhlcihFVlBfQ0lQSEVSX0NUWAorIAkJewor
IAkJaWYgKCFjdHgtPmVuY3J5cHQpCisgCQkJeworKwkJCWlmIChnY3R4LT50YWdsZW4gPCAwKQor
KwkJCQlyZXR1cm4gLTE7CisgCQkJaWYgKENSWVBUT19nY20xMjhfZmluaXNoKCZnY3R4LT5nY20s
CisgCQkJCQljdHgtPmJ1ZiwgZ2N0eC0+dGFnbGVuKSAhPSAwKQorIAkJCQlyZXR1cm4gLTE7CiBk
aWZmIC11cCBvcGVuc3NsLTEuMC4xYy9jcnlwdG8vbW9kZXMvZ2NtMTI4LmMuYmFja3BvcnRzMiBv
cGVuc3NsLTEuMC4xYy9jcnlwdG8vbW9kZXMvZ2NtMTI4LmMKIC0tLSBvcGVuc3NsLTEuMC4xYy9j
cnlwdG8vbW9kZXMvZ2NtMTI4LmMuYmFja3BvcnRzMgkyMDEyLTAxLTI1IDE4OjU2OjI0LjAwMDAw
MDAwMCArMDEwMAotKysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9tb2Rlcy9nY20xMjguYwkyMDEy
LTA5LTA3IDEwOjI0OjU2LjAwMDAwMDAwMCArMDIwMAorKysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0
by9tb2Rlcy9nY20xMjguYwkyMDEyLTExLTE0IDIwOjI3OjUwLjI0MTIxMTcyOSArMDEwMAogQEAg
LTEzOTgsNyArMTM5OCw3IEBAIGludCBDUllQVE9fZ2NtMTI4X2ZpbmlzaChHQ00xMjhfQ09OVEVY
VAogIAl2b2lkICgqZ2NtX2dtdWx0X3ApKHU2NCBYaVsyXSxjb25zdCB1MTI4IEh0YWJsZVsxNl0p
CT0gY3R4LT5nbXVsdDsKICAjZW5kaWYKQEAgLTYwLDkgKzkyLDU3IEBAIGRpZmYgLXVwIG9wZW5z
c2wtMS4wLjFjL2NyeXB0by9tb2Rlcy9nY20xMjguYy5iYWNrcG9ydHMyIG9wZW5zc2wtMS4wLjFj
L2NyeXB0by9tCiAgCQlHQ01fTVVMKGN0eCxYaSk7CiAgCiAgCWlmIChpc19lbmRpYW4ubGl0dGxl
KSB7CitkaWZmIC11cCBvcGVuc3NsLTEuMC4xYy9jcnlwdG8vc2hhL2FzbS9zaGExLWFybXY0LWxh
cmdlLnBsLmJhY2twb3J0czIgb3BlbnNzbC0xLjAuMWMvY3J5cHRvL3NoYS9hc20vc2hhMS1hcm12
NC1sYXJnZS5wbAorLS0tIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9zaGEvYXNtL3NoYTEtYXJtdjQt
bGFyZ2UucGwuYmFja3BvcnRzMgkyMDEyLTExLTE0IDIwOjI3OjUwLjI5MzIxMjg2NiArMDEwMAor
KysrIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9zaGEvYXNtL3NoYTEtYXJtdjQtbGFyZ2UucGwJMjAx
Mi0xMS0yMCAyMjoyMDoxNS4wMTUwNDE3MTkgKzAxMDAKK0BAIC0xNzcsNiArMTc3LDcgQEAgZm9y
KCRpPTA7JGk8NTskaSsrKSB7CisgJGNvZGUuPTw8X19fOworIAl0ZXEJJFhpLHNwCisgCWJuZQku
TF8wMF8xNQkJQCBbKCgxMSs0KSo1KzIpKjNdCisrCXN1YglzcCxzcCwjMjUqNAorIF9fXworIAkm
Qk9EWV8wMF8xNShAVik7CXVuc2hpZnQoQFYscG9wKEBWKSk7CisgCSZCT0RZXzE2XzE5KEBWKTsJ
dW5zaGlmdChAVixwb3AoQFYpKTsKK0BAIC0xODYsNyArMTg3LDYgQEAgX19fCisgJGNvZGUuPTw8
X19fOworIAorIAlsZHIJJEssLkxLXzIwXzM5CQlAIFsrMTUrMTYqNF0KKy0Jc3ViCXNwLHNwLCMy
NSo0CisgCWNtbglzcCwjMAkJCUAgWyszXSwgY2xlYXIgY2FycnkgdG8gZGVub3RlIDIwXzM5Cisg
LkxfMjBfMzlfb3JfNjBfNzk6CisgX19fCitkaWZmIC11cCBvcGVuc3NsLTEuMC4xYy9zc2wvczNf
c3J2ci5jLmJhY2twb3J0czIgb3BlbnNzbC0xLjAuMWMvc3NsL3MzX3NydnIuYworLS0tIG9wZW5z
c2wtMS4wLjFjL3NzbC9zM19zcnZyLmMuYmFja3BvcnRzMgkyMDEyLTA0LTE1IDE5OjIzOjQxLjAw
MDAwMDAwMCArMDIwMAorKysrIG9wZW5zc2wtMS4wLjFjL3NzbC9zM19zcnZyLmMJMjAxMi0xMS0y
MCAyMjoyMzoyMS42ODQ3NTUxODIgKzAxMDAKK0BAIC0xMTgxLDcgKzExODEsNyBAQCBpbnQgc3Ns
M19nZXRfY2xpZW50X2hlbGxvKFNTTCAqcykKKyAJCQlnb3RvIGZfZXJyOworIAkJCX0KKyAJCX0K
Ky0JCWlmIChzc2xfY2hlY2tfY2xpZW50aGVsbG9fdGxzZXh0KHMpIDw9IDApIHsKKysJCWlmIChz
c2xfY2hlY2tfY2xpZW50aGVsbG9fdGxzZXh0X2Vhcmx5KHMpIDw9IDApIHsKKyAJCQlTU0xlcnIo
U1NMX0ZfU1NMM19HRVRfQ0xJRU5UX0hFTExPLFNTTF9SX0NMSUVOVEhFTExPX1RMU0VYVCk7Cisg
CQkJZ290byBlcnI7CisgCQl9CitAQCAtMTQwMyw2ICsxNDAzLDE2IEBAIGludCBzc2wzX2dldF9j
bGllbnRfaGVsbG8oU1NMICpzKQorIAkgKiBzLT50bXAubmV3X2NpcGhlcgktIHRoZSBuZXcgY2lw
aGVyIHRvIHVzZS4KKyAJICovCisgCisrCS8qIEhhbmRsZXMgVExTIGV4dGVuc2lvbnMgdGhhdCB3
ZSBjb3VsZG4ndCBjaGVjayBlYXJsaWVyICovCisrCWlmIChzLT52ZXJzaW9uID49IFNTTDNfVkVS
U0lPTikKKysJCXsKKysJCWlmIChzc2xfY2hlY2tfY2xpZW50aGVsbG9fdGxzZXh0X2xhdGUocykg
PD0gMCkKKysJCQl7CisrCQkJU1NMZXJyKFNTTF9GX1NTTDNfR0VUX0NMSUVOVF9IRUxMTywgU1NM
X1JfQ0xJRU5USEVMTE9fVExTRVhUKTsKKysJCQlnb3RvIGVycjsKKysJCQl9CisrCQl9CisrCisg
CWlmIChyZXQgPCAwKSByZXQ9MTsKKyAJaWYgKDApCisgCQl7CiBkaWZmIC11cCBvcGVuc3NsLTEu
MC4xYy9zc2wvc3NsX2NlcnQuYy5iYWNrcG9ydHMyIG9wZW5zc2wtMS4wLjFjL3NzbC9zc2xfY2Vy
dC5jCiAtLS0gb3BlbnNzbC0xLjAuMWMvc3NsL3NzbF9jZXJ0LmMuYmFja3BvcnRzMgkyMDExLTA1
LTExIDE1OjM3OjUyLjAwMDAwMDAwMCArMDIwMAotKysrIG9wZW5zc2wtMS4wLjFjL3NzbC9zc2xf
Y2VydC5jCTIwMTItMDktMDcgMTA6MzM6NTQuMDAwMDAwMDAwICswMjAwCisrKysgb3BlbnNzbC0x
LjAuMWMvc3NsL3NzbF9jZXJ0LmMJMjAxMi0xMS0xNCAyMDoyNzo1MC4yNDEyMTE3MjkgKzAxMDAK
IEBAIC0xNjQsMTQgKzE2NCwxNCBAQCBzdGF0aWMgdm9pZCBzc2xfY2VydF9zZXRfZGVmYXVsdF9t
ZChDRVJUCiAgCXsKICAJLyogU2V0IGRpZ2VzdCB2YWx1ZXMgdG8gZGVmYXVsdHMgKi8KQEAgLTgw
LDEwICsxNjAsMjEyIEBAIGRpZmYgLXVwIG9wZW5zc2wtMS4wLjFjL3NzbC9zc2xfY2VydC5jLmJh
Y2twb3J0czIgb3BlbnNzbC0xLjAuMWMvc3NsL3NzbF9jZXJ0LmMKICAjZW5kaWYKICAJfQogIAor
ZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvc3NsL3NzbF9saWIuYy5iYWNrcG9ydHMyIG9wZW5zc2wt
MS4wLjFjL3NzbC9zc2xfbGliLmMKKy0tLSBvcGVuc3NsLTEuMC4xYy9zc2wvc3NsX2xpYi5jLmJh
Y2twb3J0czIJMjAxMi0wMS0wNSAxMToyMjozOS4wMDAwMDAwMDAgKzAxMDAKKysrKyBvcGVuc3Ns
LTEuMC4xYy9zc2wvc3NsX2xpYi5jCTIwMTItMTEtMjAgMjI6MjU6MjkuMjQzNTA5NzU1ICswMTAw
CitAQCAtMjI4Nyw3ICsyMjg3LDcgQEAgaW50IHNzbF9jaGVja19zcnZyX2VjY19jZXJ0X2FuZF9h
bGcoWDUwOQorICNlbmRpZgorIAorIC8qIFRISVMgTkVFRFMgQ0xFQU5JTkcgVVAgKi8KKy1YNTA5
ICpzc2xfZ2V0X3NlcnZlcl9zZW5kX2NlcnQoU1NMICpzKQorK0NFUlRfUEtFWSAqc3NsX2dldF9z
ZXJ2ZXJfc2VuZF9wa2V5KGNvbnN0IFNTTCAqcykKKyAJeworIAl1bnNpZ25lZCBsb25nIGFsZ19r
LGFsZ19hOworIAlDRVJUICpjOworQEAgLTIzNDUsOSArMjM0NSwxNyBAQCBYNTA5ICpzc2xfZ2V0
X3NlcnZlcl9zZW5kX2NlcnQoU1NMICpzKQorIAkJU1NMZXJyKFNTTF9GX1NTTF9HRVRfU0VSVkVS
X1NFTkRfQ0VSVCxFUlJfUl9JTlRFUk5BTF9FUlJPUik7CisgCQlyZXR1cm4oTlVMTCk7CisgCQl9
CistCWlmIChjLT5wa2V5c1tpXS54NTA5ID09IE5VTEwpIHJldHVybihOVUxMKTsKKyAKKy0JcmV0
dXJuKGMtPnBrZXlzW2ldLng1MDkpOworKwlyZXR1cm4gYy0+cGtleXMgKyBpOworKwl9CisrCisr
WDUwOSAqc3NsX2dldF9zZXJ2ZXJfc2VuZF9jZXJ0KGNvbnN0IFNTTCAqcykKKysJeworKwlDRVJU
X1BLRVkgKmNwazsKKysJY3BrID0gc3NsX2dldF9zZXJ2ZXJfc2VuZF9wa2V5KHMpOworKwlpZiAo
IWNwaykKKysJCXJldHVybiBOVUxMOworKwlyZXR1cm4gY3BrLT54NTA5OworIAl9CisgCisgRVZQ
X1BLRVkgKnNzbF9nZXRfc2lnbl9wa2V5KFNTTCAqcyxjb25zdCBTU0xfQ0lQSEVSICpjaXBoZXIs
IGNvbnN0IEVWUF9NRCAqKnBtZCkKK0BAIC0yNzgwLDcgKzI3ODgsOSBAQCB2b2lkIHNzbF9jbGVh
cl9jaXBoZXJfY3R4KFNTTCAqcykKKyAvKiBGaXggdGhpcyBmdW5jdGlvbiBzbyB0aGF0IGl0IHRh
a2VzIGFuIG9wdGlvbmFsIHR5cGUgcGFyYW1ldGVyICovCisgWDUwOSAqU1NMX2dldF9jZXJ0aWZp
Y2F0ZShjb25zdCBTU0wgKnMpCisgCXsKKy0JaWYgKHMtPmNlcnQgIT0gTlVMTCkKKysJaWYgKHMt
PnNlcnZlcikKKysJCXJldHVybihzc2xfZ2V0X3NlcnZlcl9zZW5kX2NlcnQocykpOworKwllbHNl
IGlmIChzLT5jZXJ0ICE9IE5VTEwpCisgCQlyZXR1cm4ocy0+Y2VydC0+a2V5LT54NTA5KTsKKyAJ
ZWxzZQorIAkJcmV0dXJuKE5VTEwpOworZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvc3NsL3NzbF9s
b2NsLmguYmFja3BvcnRzMiBvcGVuc3NsLTEuMC4xYy9zc2wvc3NsX2xvY2wuaAorLS0tIG9wZW5z
c2wtMS4wLjFjL3NzbC9zc2xfbG9jbC5oLmJhY2twb3J0czIJMjAxMi0xMS0xNCAyMDoyNzo1MC4w
NTYyMDc2ODIgKzAxMDAKKysrKyBvcGVuc3NsLTEuMC4xYy9zc2wvc3NsX2xvY2wuaAkyMDEyLTEx
LTIwIDIyOjI1OjI5LjI0NDUwOTc3NyArMDEwMAorQEAgLTgxNCw3ICs4MTQsOCBAQCBpbnQgc3Ns
X3ZlcmlmeV9jZXJ0X2NoYWluKFNTTCAqcyxTVEFDS19PCisgaW50IHNzbF91bmRlZmluZWRfZnVu
Y3Rpb24oU1NMICpzKTsKKyBpbnQgc3NsX3VuZGVmaW5lZF92b2lkX2Z1bmN0aW9uKHZvaWQpOwor
IGludCBzc2xfdW5kZWZpbmVkX2NvbnN0X2Z1bmN0aW9uKGNvbnN0IFNTTCAqcyk7CistWDUwOSAq
c3NsX2dldF9zZXJ2ZXJfc2VuZF9jZXJ0KFNTTCAqKTsKKytDRVJUX1BLRVkgKnNzbF9nZXRfc2Vy
dmVyX3NlbmRfcGtleShjb25zdCBTU0wgKnMpOworK1g1MDkgKnNzbF9nZXRfc2VydmVyX3NlbmRf
Y2VydChjb25zdCBTU0wgKik7CisgRVZQX1BLRVkgKnNzbF9nZXRfc2lnbl9wa2V5KFNTTCAqcyxj
b25zdCBTU0xfQ0lQSEVSICpjLCBjb25zdCBFVlBfTUQgKipwbWQpOworIGludCBzc2xfY2VydF90
eXBlKFg1MDkgKngsRVZQX1BLRVkgKnBrZXkpOworIHZvaWQgc3NsX3NldF9jZXJ0X21hc2tzKENF
UlQgKmMsIGNvbnN0IFNTTF9DSVBIRVIgKmNpcGhlcik7CitAQCAtMTA2NSw3ICsxMDY2LDggQEAg
aW50IHNzbF9wYXJzZV9jbGllbnRoZWxsb190bHNleHQoU1NMICpzLAorIGludCBzc2xfcGFyc2Vf
c2VydmVyaGVsbG9fdGxzZXh0KFNTTCAqcywgdW5zaWduZWQgY2hhciAqKmRhdGEsIHVuc2lnbmVk
IGNoYXIgKmQsIGludCBuLCBpbnQgKmFsKTsKKyBpbnQgc3NsX3ByZXBhcmVfY2xpZW50aGVsbG9f
dGxzZXh0KFNTTCAqcyk7CisgaW50IHNzbF9wcmVwYXJlX3NlcnZlcmhlbGxvX3Rsc2V4dChTU0wg
KnMpOworLWludCBzc2xfY2hlY2tfY2xpZW50aGVsbG9fdGxzZXh0KFNTTCAqcyk7CisraW50IHNz
bF9jaGVja19jbGllbnRoZWxsb190bHNleHRfZWFybHkoU1NMICpzKTsKKytpbnQgc3NsX2NoZWNr
X2NsaWVudGhlbGxvX3Rsc2V4dF9sYXRlKFNTTCAqcyk7CisgaW50IHNzbF9jaGVja19zZXJ2ZXJo
ZWxsb190bHNleHQoU1NMICpzKTsKKyAKKyAjaWZuZGVmIE9QRU5TU0xfTk9fSEVBUlRCRUFUUwog
ZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvc3NsL3QxX2xpYi5jLmJhY2twb3J0czIgb3BlbnNzbC0x
LjAuMWMvc3NsL3QxX2xpYi5jCiAtLS0gb3BlbnNzbC0xLjAuMWMvc3NsL3QxX2xpYi5jLmJhY2tw
b3J0czIJMjAxMi0wMy0yMSAyMjozMjo1Ny4wMDAwMDAwMDAgKzAxMDAKLSsrKyBvcGVuc3NsLTEu
MC4xYy9zc2wvdDFfbGliLmMJMjAxMi0wOS0wNyAxMDozMzo1NC4wMDAwMDAwMDAgKzAyMDAKLUBA
IC0yNDE0LDcgKzI0MTQsNyBAQCBpbnQgdGxzMV9wcm9jZXNzX3NpZ2FsZ3MoU1NMICpzLCBjb25z
dCB1CisrKysgb3BlbnNzbC0xLjAuMWMvc3NsL3QxX2xpYi5jCTIwMTItMTEtMjAgMjI6MjU6Mjku
MjQ0NTA5Nzc3ICswMTAwCitAQCAtMTc2Myw3ICsxNzYzLDcgQEAgaW50IHNzbF9wcmVwYXJlX3Nl
cnZlcmhlbGxvX3Rsc2V4dChTU0wgKgorIAlyZXR1cm4gMTsKKyAJfQorIAorLWludCBzc2xfY2hl
Y2tfY2xpZW50aGVsbG9fdGxzZXh0KFNTTCAqcykKKytpbnQgc3NsX2NoZWNrX2NsaWVudGhlbGxv
X3Rsc2V4dF9lYXJseShTU0wgKnMpCisgCXsKKyAJaW50IHJldD1TU0xfVExTRVhUX0VSUl9OT0FD
SzsKKyAJaW50IGFsID0gU1NMX0FEX1VOUkVDT0dOSVpFRF9OQU1FOworQEAgLTE3ODIsNDIgKzE3
ODIsMTIgQEAgaW50IHNzbF9jaGVja19jbGllbnRoZWxsb190bHNleHQoU1NMICpzKQorIAllbHNl
IGlmIChzLT5pbml0aWFsX2N0eCAhPSBOVUxMICYmIHMtPmluaXRpYWxfY3R4LT50bHNleHRfc2Vy
dmVybmFtZV9jYWxsYmFjayAhPSAwKSAJCQorIAkJcmV0ID0gcy0+aW5pdGlhbF9jdHgtPnRsc2V4
dF9zZXJ2ZXJuYW1lX2NhbGxiYWNrKHMsICZhbCwgcy0+aW5pdGlhbF9jdHgtPnRsc2V4dF9zZXJ2
ZXJuYW1lX2FyZyk7CisgCistCS8qIElmIHN0YXR1cyByZXF1ZXN0IHRoZW4gYXNrIGNhbGxiYWNr
IHdoYXQgdG8gZG8uCistIAkgKiBOb3RlOiB0aGlzIG11c3QgYmUgY2FsbGVkIGFmdGVyIHNlcnZl
cm5hbWUgY2FsbGJhY2tzIGluIGNhc2UgCistIAkgKiB0aGUgY2VydGlmaWNhdGUgaGFzIGNoYW5n
ZWQuCistIAkgKi8KKy0JaWYgKChzLT50bHNleHRfc3RhdHVzX3R5cGUgIT0gLTEpICYmIHMtPmN0
eCAmJiBzLT5jdHgtPnRsc2V4dF9zdGF0dXNfY2IpCistCQl7CistCQlpbnQgcjsKKy0JCXIgPSBz
LT5jdHgtPnRsc2V4dF9zdGF0dXNfY2Iocywgcy0+Y3R4LT50bHNleHRfc3RhdHVzX2FyZyk7Cist
CQlzd2l0Y2ggKHIpCistCQkJeworLQkJCS8qIFdlIGRvbid0IHdhbnQgdG8gc2VuZCBhIHN0YXR1
cyByZXF1ZXN0IHJlc3BvbnNlICovCistCQkJY2FzZSBTU0xfVExTRVhUX0VSUl9OT0FDSzoKKy0J
CQkJcy0+dGxzZXh0X3N0YXR1c19leHBlY3RlZCA9IDA7CistCQkJCWJyZWFrOworLQkJCS8qIHN0
YXR1cyByZXF1ZXN0IHJlc3BvbnNlIHNob3VsZCBiZSBzZW50ICovCistCQkJY2FzZSBTU0xfVExT
RVhUX0VSUl9PSzoKKy0JCQkJaWYgKHMtPnRsc2V4dF9vY3NwX3Jlc3ApCistCQkJCQlzLT50bHNl
eHRfc3RhdHVzX2V4cGVjdGVkID0gMTsKKy0JCQkJZWxzZQorLQkJCQkJcy0+dGxzZXh0X3N0YXR1
c19leHBlY3RlZCA9IDA7CistCQkJCWJyZWFrOworLQkJCS8qIHNvbWV0aGluZyBiYWQgaGFwcGVu
ZWQgKi8KKy0JCQljYXNlIFNTTF9UTFNFWFRfRVJSX0FMRVJUX0ZBVEFMOgorLQkJCQlyZXQgPSBT
U0xfVExTRVhUX0VSUl9BTEVSVF9GQVRBTDsKKy0JCQkJYWwgPSBTU0xfQURfSU5URVJOQUxfRVJS
T1I7CistCQkJCWdvdG8gZXJyOworLQkJCX0KKy0JCX0KKy0JZWxzZQorLQkJcy0+dGxzZXh0X3N0
YXR1c19leHBlY3RlZCA9IDA7CistCisgI2lmZGVmIFRMU0VYVF9UWVBFX29wYXF1ZV9wcmZfaW5w
dXQKKyAgCXsKKyAJCS8qIFRoaXMgc29ydCBvZiBiZWxvbmdzIGludG8gc3NsX3ByZXBhcmVfc2Vy
dmVyaGVsbG9fdGxzZXh0KCksCisgCQkgKiBidXQgd2UgbWlnaHQgYmUgc2VuZGluZyBhbiBhbGVy
dCBpbiByZXNwb25zZSB0byB0aGUgY2xpZW50IGhlbGxvLAorLQkJICogc28gdGhpcyBoYXMgdG8g
aGFwcGVuIGhlcmUgaW4gc3NsX2NoZWNrX2NsaWVudGhlbGxvX3Rsc2V4dCgpLiAqLworKwkJICog
c28gdGhpcyBoYXMgdG8gaGFwcGVuIGhlcmUgaW4KKysJCSAqIHNzbF9jaGVja19jbGllbnRoZWxs
b190bHNleHRfZWFybHkoKS4gKi8KKyAKKyAJCWludCByID0gMTsKKyAJCitAQCAtMTg2OSw4ICsx
ODM5LDggQEAgaW50IHNzbF9jaGVja19jbGllbnRoZWxsb190bHNleHQoU1NMICpzKQorIAkJCX0K
KyAJfQorIAorLSNlbmRpZgorICBlcnI6CisrI2VuZGlmCisgCXN3aXRjaCAocmV0KQorIAkJewor
IAkJY2FzZSBTU0xfVExTRVhUX0VSUl9BTEVSVF9GQVRBTDoKK0BAIC0xODg4LDYgKzE4NTgsNzEg
QEAgaW50IHNzbF9jaGVja19jbGllbnRoZWxsb190bHNleHQoU1NMICpzKQorIAkJfQorIAl9Cisg
CisraW50IHNzbF9jaGVja19jbGllbnRoZWxsb190bHNleHRfbGF0ZShTU0wgKnMpCisrCXsKKysJ
aW50IHJldCA9IFNTTF9UTFNFWFRfRVJSX09LOworKwlpbnQgYWw7CisrCisrCS8qIElmIHN0YXR1
cyByZXF1ZXN0IHRoZW4gYXNrIGNhbGxiYWNrIHdoYXQgdG8gZG8uCisrIAkgKiBOb3RlOiB0aGlz
IG11c3QgYmUgY2FsbGVkIGFmdGVyIHNlcnZlcm5hbWUgY2FsbGJhY2tzIGluIGNhc2UgCisrIAkg
KiB0aGUgY2VydGlmaWNhdGUgaGFzIGNoYW5nZWQsIGFuZCBtdXN0IGJlIGNhbGxlZCBhZnRlciB0
aGUgY2lwaGVyCisrCSAqIGhhcyBiZWVuIGNob3NlbiBiZWNhdXNlIHRoaXMgbWF5IGluZmx1ZW5j
ZSB3aGljaCBjZXJ0aWZpY2F0ZSBpcyBzZW50CisrIAkgKi8KKysJaWYgKChzLT50bHNleHRfc3Rh
dHVzX3R5cGUgIT0gLTEpICYmIHMtPmN0eCAmJiBzLT5jdHgtPnRsc2V4dF9zdGF0dXNfY2IpCisr
CQl7CisrCQlpbnQgcjsKKysJCUNFUlRfUEtFWSAqY2VydHBrZXk7CisrCQljZXJ0cGtleSA9IHNz
bF9nZXRfc2VydmVyX3NlbmRfcGtleShzKTsKKysJCS8qIElmIG5vIGNlcnRpZmljYXRlIGNhbid0
IHJldHVybiBjZXJ0aWZpY2F0ZSBzdGF0dXMgKi8KKysJCWlmIChjZXJ0cGtleSA9PSBOVUxMKQor
KwkJCXsKKysJCQlzLT50bHNleHRfc3RhdHVzX2V4cGVjdGVkID0gMDsKKysJCQlyZXR1cm4gMTsK
KysJCQl9CisrCQkvKiBTZXQgY3VycmVudCBjZXJ0aWZpY2F0ZSB0byBvbmUgd2Ugd2lsbCB1c2Ug
c28KKysJCSAqIFNTTF9nZXRfY2VydGlmaWNhdGUgZXQgYWwgY2FuIHBpY2sgaXQgdXAuCisrCQkg
Ki8KKysJCXMtPmNlcnQtPmtleSA9IGNlcnRwa2V5OworKwkJciA9IHMtPmN0eC0+dGxzZXh0X3N0
YXR1c19jYihzLCBzLT5jdHgtPnRsc2V4dF9zdGF0dXNfYXJnKTsKKysJCXN3aXRjaCAocikKKysJ
CQl7CisrCQkJLyogV2UgZG9uJ3Qgd2FudCB0byBzZW5kIGEgc3RhdHVzIHJlcXVlc3QgcmVzcG9u
c2UgKi8KKysJCQljYXNlIFNTTF9UTFNFWFRfRVJSX05PQUNLOgorKwkJCQlzLT50bHNleHRfc3Rh
dHVzX2V4cGVjdGVkID0gMDsKKysJCQkJYnJlYWs7CisrCQkJLyogc3RhdHVzIHJlcXVlc3QgcmVz
cG9uc2Ugc2hvdWxkIGJlIHNlbnQgKi8KKysJCQljYXNlIFNTTF9UTFNFWFRfRVJSX09LOgorKwkJ
CQlpZiAocy0+dGxzZXh0X29jc3BfcmVzcCkKKysJCQkJCXMtPnRsc2V4dF9zdGF0dXNfZXhwZWN0
ZWQgPSAxOworKwkJCQllbHNlCisrCQkJCQlzLT50bHNleHRfc3RhdHVzX2V4cGVjdGVkID0gMDsK
KysJCQkJYnJlYWs7CisrCQkJLyogc29tZXRoaW5nIGJhZCBoYXBwZW5lZCAqLworKwkJCWNhc2Ug
U1NMX1RMU0VYVF9FUlJfQUxFUlRfRkFUQUw6CisrCQkJCXJldCA9IFNTTF9UTFNFWFRfRVJSX0FM
RVJUX0ZBVEFMOworKwkJCQlhbCA9IFNTTF9BRF9JTlRFUk5BTF9FUlJPUjsKKysJCQkJZ290byBl
cnI7CisrCQkJfQorKwkJfQorKwllbHNlCisrCQlzLT50bHNleHRfc3RhdHVzX2V4cGVjdGVkID0g
MDsKKysKKysgZXJyOgorKwlzd2l0Y2ggKHJldCkKKysJCXsKKysJCWNhc2UgU1NMX1RMU0VYVF9F
UlJfQUxFUlRfRkFUQUw6CisrCQkJc3NsM19zZW5kX2FsZXJ0KHMsU1NMM19BTF9GQVRBTCxhbCk7
IAorKwkJCXJldHVybiAtMTsKKysKKysJCWNhc2UgU1NMX1RMU0VYVF9FUlJfQUxFUlRfV0FSTklO
RzoKKysJCQlzc2wzX3NlbmRfYWxlcnQocyxTU0wzX0FMX1dBUk5JTkcsYWwpOworKwkJCXJldHVy
biAxOyAKKysKKysJCWRlZmF1bHQ6CisrCQkJcmV0dXJuIDE7CisrCQl9CisrCX0KKysKKyBpbnQg
c3NsX2NoZWNrX3NlcnZlcmhlbGxvX3Rsc2V4dChTU0wgKnMpCisgCXsKKyAJaW50IHJldD1TU0xf
VExTRVhUX0VSUl9OT0FDSzsKK0BAIC0yNDE0LDcgKzI0NDksNyBAQCBpbnQgdGxzMV9wcm9jZXNz
X3NpZ2FsZ3MoU1NMICpzLCBjb25zdCB1CiAgCSAqLwogICNpZm5kZWYgT1BFTlNTTF9OT19EU0EK
ICAJaWYgKCFjLT5wa2V5c1tTU0xfUEtFWV9EU0FfU0lHTl0uZGlnZXN0KQpAQCAtOTIsNyArMzc0
LDcgQEAgZGlmZiAtdXAgb3BlbnNzbC0xLjAuMWMvc3NsL3QxX2xpYi5jLmJhY2twb3J0czIgb3Bl
bnNzbC0xLjAuMWMvc3NsL3QxX2xpYi5jCiAgI2VuZGlmCiAgI2lmbmRlZiBPUEVOU1NMX05PX1JT
QQogIAlpZiAoIWMtPnBrZXlzW1NTTF9QS0VZX1JTQV9TSUdOXS5kaWdlc3QpCi1AQCAtMjQyNSw3
ICsyNDI1LDcgQEAgaW50IHRsczFfcHJvY2Vzc19zaWdhbGdzKFNTTCAqcywgY29uc3QgdQorQEAg
LTI0MjUsNyArMjQ2MCw3IEBAIGludCB0bHMxX3Byb2Nlc3Nfc2lnYWxncyhTU0wgKnMsIGNvbnN0
IHUKICAjZW5kaWYKICAjaWZuZGVmIE9QRU5TU0xfTk9fRUNEU0EKICAJaWYgKCFjLT5wa2V5c1tT
U0xfUEtFWV9FQ0NdLmRpZ2VzdCkKCmRpZmYgLS1naXQgYS9vcGVuc3NsLTEuMC4xYy1maXBzLnBh
dGNoIGIvb3BlbnNzbC0xLjAuMWMtZmlwcy5wYXRjaAppbmRleCA5ZDU2YTEzLi5lMWU2MjAwIDEw
MDY0NAotLS0gYS9vcGVuc3NsLTEuMC4xYy1maXBzLnBhdGNoCisrKyBiL29wZW5zc2wtMS4wLjFj
LWZpcHMucGF0Y2gKQEAgLTk0NSw3ICs5NDUsNyBAQCBkaWZmIC11cCBvcGVuc3NsLTEuMC4xYy9j
cnlwdG8vZHNhL2RzYV9rZXkuYy5maXBzIG9wZW5zc2wtMS4wLjFjL2NyeXB0by9kc2EvZHNhXwog
Kwl1bnNpZ25lZCBjaGFyIHRic1tdID0gIkRTQSBQYWlyd2lzZSBDaGVjayBEYXRhIjsKICsJaW50
IHJldCA9IDA7CiArCi0rCWlmICgocGs9RVZQX1BLRVlfbmV3KCkpICE9IE5VTEwpCisrCWlmICgo
cGs9RVZQX1BLRVlfbmV3KCkpID09IE5VTEwpCiArCQlnb3RvIGVycjsKICsKICsJRVZQX1BLRVlf
c2V0MV9EU0EocGssIGRzYSk7CgpkaWZmIC0tZ2l0IGEvb3BlbnNzbC5zcGVjIGIvb3BlbnNzbC5z
cGVjCmluZGV4IDU2ZGY1NGUuLjUzMGM1NTUgMTAwNjQ0Ci0tLSBhL29wZW5zc2wuc3BlYworKysg
Yi9vcGVuc3NsLnNwZWMKQEAgLTIyLDcgKzIyLDcgQEAgU3VtbWFyeTogVXRpbGl0aWVzIGZyb20g
dGhlIGdlbmVyYWwgcHVycG9zZSBjcnlwdG9ncmFwaHkgbGlicmFyeSB3aXRoIFRMUyBpbXBsZW0K
IE5hbWU6IG9wZW5zc2wKIFZlcnNpb246IDEuMC4xYwogIyBEbyBub3QgZm9yZ2V0IHRvIGJ1bXAg
U0hMSUJfVkVSU0lPTiBvbiB2ZXJzaW9uIHVwZ3JhZGVzCi1SZWxlYXNlOiA4JXs/ZGlzdH0KK1Jl
bGVhc2U6IDklez9kaXN0fQogRXBvY2g6IDEKICMgV2UgaGF2ZSB0byByZW1vdmUgY2VydGFpbiBw
YXRlbnRlZCBhbGdvcml0aG1zIGZyb20gdGhlIG9wZW5zc2wgc291cmNlCiAjIHRhcmJhbGwgd2l0
aCB0aGUgaG9iYmxlLW9wZW5zc2wgc2NyaXB0IHdoaWNoIGlzIGluY2x1ZGVkIGJlbG93LgpAQCAt
NDMxLDYgKzQzMSwxMCBAQCBybSAtcmYgJFJQTV9CVUlMRF9ST09ULyV7X2xpYmRpcn0vZmlwc2Nh
bmlzdGVyLioKICVwb3N0dW4gbGlicyAtcCAvc2Jpbi9sZGNvbmZpZwogCiAlY2hhbmdlbG9nCisq
IFR1ZSBOb3YgMjAgMjAxMiBUb21hcyBNcmF6IDx0bXJhekByZWRoYXQuY29tPiAxLjAuMWMtOQor
LSBtb3JlIGZpeGVzIGZyb20gdXBzdHJlYW0gQ1ZTCistIGZpeCBEU0Ega2V5IHBhaXJ3aXNlIGNo
ZWNrICgjODc4NTk3KQorCiAqIFRodSBOb3YgMTUgMjAxMiBUb21hcyBNcmF6IDx0bXJhekByZWRo
YXQuY29tPiAxLjAuMWMtOAogLSB1c2UgMTAyNCBiaXQgREggcGFyYW1ldGVycyBpbiBzX3NlcnZl
ciBhcyA1MTIgYml0IGlzIG5vdCBhbGxvd2VkCiAgIGluIEZJUFMgbW9kZSBhbmQgaXQgaXMgcXVp
dGUgd2VhayBhbnl3YXkK