Commit bce6931
authored
* gh-114572: Fix locking in cert_store_stats and get_ca_certs
cert_store_stats and get_ca_certs query the SSLContext's X509_STORE with
X509_STORE_get0_objects, but reading the result requires a lock. See
openssl/openssl#23224 for details.
Instead, use X509_STORE_get1_objects, newly added in that PR.
X509_STORE_get1_objects does not exist in current OpenSSLs, but we can
polyfill it with X509_STORE_lock and X509_STORE_unlock.
* Work around const-correctness problem
* Add missing X509_STORE_get1_objects failure check
* Add blurb
1 parent 58cb634 commit bce6931
File tree
2 files changed
+64
-5
lines changed- Misc/NEWS.d/next/Security
- Modules
2 files changed
+64
-5
lines changedLines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4553 | 4553 | | |
4554 | 4554 | | |
4555 | 4555 | | |
| 4556 | + | |
| 4557 | + | |
| 4558 | + | |
| 4559 | + | |
| 4560 | + | |
| 4561 | + | |
| 4562 | + | |
| 4563 | + | |
| 4564 | + | |
| 4565 | + | |
| 4566 | + | |
| 4567 | + | |
| 4568 | + | |
| 4569 | + | |
| 4570 | + | |
| 4571 | + | |
| 4572 | + | |
| 4573 | + | |
| 4574 | + | |
| 4575 | + | |
| 4576 | + | |
| 4577 | + | |
| 4578 | + | |
| 4579 | + | |
| 4580 | + | |
| 4581 | + | |
| 4582 | + | |
| 4583 | + | |
| 4584 | + | |
| 4585 | + | |
| 4586 | + | |
| 4587 | + | |
| 4588 | + | |
| 4589 | + | |
| 4590 | + | |
| 4591 | + | |
| 4592 | + | |
| 4593 | + | |
| 4594 | + | |
| 4595 | + | |
| 4596 | + | |
| 4597 | + | |
| 4598 | + | |
| 4599 | + | |
4556 | 4600 | | |
4557 | 4601 | | |
4558 | 4602 | | |
| |||
4582 | 4626 | | |
4583 | 4627 | | |
4584 | 4628 | | |
4585 | | - | |
| 4629 | + | |
| 4630 | + | |
| 4631 | + | |
| 4632 | + | |
| 4633 | + | |
| 4634 | + | |
4586 | 4635 | | |
4587 | 4636 | | |
4588 | 4637 | | |
| |||
4596 | 4645 | | |
4597 | 4646 | | |
4598 | 4647 | | |
4599 | | - | |
4600 | | - | |
4601 | | - | |
| 4648 | + | |
4602 | 4649 | | |
4603 | 4650 | | |
4604 | 4651 | | |
| 4652 | + | |
4605 | 4653 | | |
4606 | 4654 | | |
4607 | 4655 | | |
| |||
4633 | 4681 | | |
4634 | 4682 | | |
4635 | 4683 | | |
4636 | | - | |
| 4684 | + | |
| 4685 | + | |
| 4686 | + | |
| 4687 | + | |
| 4688 | + | |
| 4689 | + | |
4637 | 4690 | | |
4638 | 4691 | | |
4639 | 4692 | | |
| |||
4661 | 4714 | | |
4662 | 4715 | | |
4663 | 4716 | | |
| 4717 | + | |
4664 | 4718 | | |
4665 | 4719 | | |
4666 | 4720 | | |
| 4721 | + | |
4667 | 4722 | | |
4668 | 4723 | | |
4669 | 4724 | | |
| |||
0 commit comments