Commit b12968c
authored
* [3.11] gh-156293: ssl: do not call the servername callback through a released SSLContext
The servername (SNI) callback located its SSLContext through a borrowed
pointer registered with OpenSSL, which can outlive the SSLContext object.
Look the context up from the SSL object instead, and unregister the
callback when the context is deallocated.
Backport of 87665c9,
adapted to this branch's servername callback code.
* [3.11] gh-156293: Document sni_callback dispatch after a context switch
1 parent 5aa989c commit b12968c
4 files changed
Lines changed: 126 additions & 12 deletions
File tree
- Doc/library
- Lib/test
- Misc/NEWS.d/next/Security
- Modules
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1748 | 1748 | | |
1749 | 1749 | | |
1750 | 1750 | | |
| 1751 | + | |
| 1752 | + | |
| 1753 | + | |
| 1754 | + | |
| 1755 | + | |
| 1756 | + | |
1751 | 1757 | | |
1752 | 1758 | | |
1753 | 1759 | | |
| |||
1771 | 1777 | | |
1772 | 1778 | | |
1773 | 1779 | | |
| 1780 | + | |
| 1781 | + | |
| 1782 | + | |
| 1783 | + | |
| 1784 | + | |
1774 | 1785 | | |
1775 | 1786 | | |
1776 | 1787 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2040 | 2040 | | |
2041 | 2041 | | |
2042 | 2042 | | |
| 2043 | + | |
| 2044 | + | |
| 2045 | + | |
| 2046 | + | |
| 2047 | + | |
| 2048 | + | |
| 2049 | + | |
| 2050 | + | |
| 2051 | + | |
| 2052 | + | |
| 2053 | + | |
| 2054 | + | |
| 2055 | + | |
| 2056 | + | |
| 2057 | + | |
| 2058 | + | |
| 2059 | + | |
| 2060 | + | |
| 2061 | + | |
| 2062 | + | |
| 2063 | + | |
| 2064 | + | |
| 2065 | + | |
| 2066 | + | |
| 2067 | + | |
| 2068 | + | |
| 2069 | + | |
| 2070 | + | |
| 2071 | + | |
| 2072 | + | |
| 2073 | + | |
| 2074 | + | |
| 2075 | + | |
| 2076 | + | |
| 2077 | + | |
| 2078 | + | |
| 2079 | + | |
| 2080 | + | |
| 2081 | + | |
| 2082 | + | |
| 2083 | + | |
| 2084 | + | |
| 2085 | + | |
| 2086 | + | |
| 2087 | + | |
| 2088 | + | |
| 2089 | + | |
| 2090 | + | |
| 2091 | + | |
| 2092 | + | |
| 2093 | + | |
| 2094 | + | |
| 2095 | + | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
| 2108 | + | |
| 2109 | + | |
| 2110 | + | |
| 2111 | + | |
| 2112 | + | |
| 2113 | + | |
| 2114 | + | |
| 2115 | + | |
| 2116 | + | |
| 2117 | + | |
| 2118 | + | |
| 2119 | + | |
| 2120 | + | |
| 2121 | + | |
| 2122 | + | |
2043 | 2123 | | |
2044 | 2124 | | |
2045 | 2125 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3256 | 3256 | | |
3257 | 3257 | | |
3258 | 3258 | | |
| 3259 | + | |
| 3260 | + | |
| 3261 | + | |
3259 | 3262 | | |
3260 | 3263 | | |
3261 | 3264 | | |
| |||
4412 | 4415 | | |
4413 | 4416 | | |
4414 | 4417 | | |
4415 | | - | |
| 4418 | + | |
4416 | 4419 | | |
4417 | 4420 | | |
4418 | | - | |
| 4421 | + | |
4419 | 4422 | | |
4420 | 4423 | | |
4421 | 4424 | | |
4422 | 4425 | | |
| 4426 | + | |
4423 | 4427 | | |
4424 | 4428 | | |
4425 | 4429 | | |
4426 | | - | |
4427 | | - | |
4428 | | - | |
| 4430 | + | |
| 4431 | + | |
| 4432 | + | |
| 4433 | + | |
| 4434 | + | |
| 4435 | + | |
| 4436 | + | |
| 4437 | + | |
| 4438 | + | |
| 4439 | + | |
| 4440 | + | |
| 4441 | + | |
| 4442 | + | |
| 4443 | + | |
| 4444 | + | |
4429 | 4445 | | |
4430 | 4446 | | |
4431 | 4447 | | |
4432 | 4448 | | |
4433 | | - | |
4434 | | - | |
4435 | | - | |
4436 | 4449 | | |
4437 | 4450 | | |
4438 | 4451 | | |
| |||
4453 | 4466 | | |
4454 | 4467 | | |
4455 | 4468 | | |
4456 | | - | |
| 4469 | + | |
4457 | 4470 | | |
4458 | 4471 | | |
4459 | 4472 | | |
| |||
4476 | 4489 | | |
4477 | 4490 | | |
4478 | 4491 | | |
4479 | | - | |
| 4492 | + | |
4480 | 4493 | | |
4481 | 4494 | | |
4482 | 4495 | | |
4483 | 4496 | | |
4484 | 4497 | | |
4485 | 4498 | | |
4486 | | - | |
| 4499 | + | |
4487 | 4500 | | |
4488 | 4501 | | |
4489 | 4502 | | |
| |||
4504 | 4517 | | |
4505 | 4518 | | |
4506 | 4519 | | |
| 4520 | + | |
| 4521 | + | |
4507 | 4522 | | |
4508 | 4523 | | |
4509 | 4524 | | |
4510 | 4525 | | |
4511 | 4526 | | |
| 4527 | + | |
| 4528 | + | |
4512 | 4529 | | |
4513 | 4530 | | |
4514 | 4531 | | |
| |||
4548 | 4565 | | |
4549 | 4566 | | |
4550 | 4567 | | |
4551 | | - | |
4552 | 4568 | | |
4553 | 4569 | | |
4554 | 4570 | | |
| |||
0 commit comments