Commit 29e962e
Jaipaul Cheernam
THRIFT-6170: Fix TSSLSocket build with OpenSSL 4.0
OpenSSL 4.0 removes SSLv3_method() and per-version TLS method
functions (TLSv1_method, TLSv1_1_method, TLSv1_2_method), the
deprecated ASN1_STRING_data() function, and returns const pointers
from X509_get_subject_name(), X509_NAME_get_entry(), and
X509_NAME_ENTRY_get_data().
- Guard SSLv3_method and TLS version methods with version check
- Replace ASN1_STRING_data with ASN1_STRING_get0_data
- Add const qualifiers for X509_NAME, X509_NAME_ENTRY, ASN1_STRING
This is backward-compatible with OpenSSL >= 1.1.0 since all
replacement APIs exist since that version.
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>1 parent 28d59c3 commit 29e962e
2 files changed
Lines changed: 15 additions & 8 deletions
File tree
- lib
- c_glib/src/thrift/c_glib/transport
- cpp/src/thrift/transport
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
288 | | - | |
289 | 288 | | |
290 | 289 | | |
291 | 290 | | |
| |||
710 | 709 | | |
711 | 710 | | |
712 | 711 | | |
713 | | - | |
714 | 712 | | |
715 | 713 | | |
716 | 714 | | |
| |||
835 | 833 | | |
836 | 834 | | |
837 | 835 | | |
| 836 | + | |
838 | 837 | | |
839 | 838 | | |
| 839 | + | |
| 840 | + | |
840 | 841 | | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
841 | 845 | | |
842 | 846 | | |
843 | 847 | | |
| |||
849 | 853 | | |
850 | 854 | | |
851 | 855 | | |
| 856 | + | |
852 | 857 | | |
853 | 858 | | |
854 | 859 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
185 | | - | |
| 185 | + | |
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
| 189 | + | |
189 | 190 | | |
190 | 191 | | |
191 | 192 | | |
192 | 193 | | |
193 | 194 | | |
194 | 195 | | |
| 196 | + | |
195 | 197 | | |
196 | 198 | | |
197 | 199 | | |
| |||
770 | 772 | | |
771 | 773 | | |
772 | 774 | | |
773 | | - | |
| 775 | + | |
774 | 776 | | |
775 | 777 | | |
776 | 778 | | |
| |||
796 | 798 | | |
797 | 799 | | |
798 | 800 | | |
799 | | - | |
| 801 | + | |
800 | 802 | | |
801 | | - | |
| 803 | + | |
802 | 804 | | |
803 | 805 | | |
804 | 806 | | |
805 | | - | |
| 807 | + | |
806 | 808 | | |
807 | 809 | | |
808 | 810 | | |
809 | 811 | | |
810 | 812 | | |
811 | | - | |
| 813 | + | |
812 | 814 | | |
813 | 815 | | |
814 | 816 | | |
| |||
0 commit comments