Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ The table below shows which release corresponds to each branch, and what date th
- [#2730][2730] Fix atexception handlers in term mode
- [#2733][2733] loongarch64: fix incorrect mov assembly template
- [#2746][2746] elf: point people at libc_start_main_return when they look up __libc_start_main_ret
- [#2750][2750] fix: Fix DeprecationWarning when setting ssl=True in remote()

[2675]: https://github.com/Gallopsled/pwntools/pull/2675
[2652]: https://github.com/Gallopsled/pwntools/pull/2652
Expand Down Expand Up @@ -201,6 +202,7 @@ The table below shows which release corresponds to each branch, and what date th
[2739]: https://github.com/Gallopsled/pwntools/pull/2739
[2740]: https://github.com/Gallopsled/pwntools/pull/2740
[2746]: https://github.com/Gallopsled/pwntools/pull/2746
[2750]: https://github.com/Gallopsled/pwntools/pull/2750

## 4.15.1

Expand Down
2 changes: 1 addition & 1 deletion pwnlib/tubes/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def __init__(self, host, port,
ssl_args = ssl_args or {}
if "server_hostname" in ssl_args and sni:
log.error("sni and server_hostname cannot be set at the same time")
ssl_context = ssl_context or _ssl.SSLContext(_ssl.PROTOCOL_TLSv1_2)
ssl_context = ssl_context or _ssl.SSLContext(_ssl.PROTOCOL_TLS_CLIENT)
if isinstance(sni, str):
ssl_args["server_hostname"] = sni
elif sni:
Expand Down
Loading