Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix buffer-overrun bug in net #17728

Merged
merged 12 commits into from
Apr 16, 2021
Merged

Fix buffer-overrun bug in net #17728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0299652
make cuchar uint8
shirleyquirk Apr 15, 2021
4b83054
changing cuchar highlighted a buffer-overrun in net
shirleyquirk Apr 15, 2021
f2690db
ocd
shirleyquirk Apr 15, 2021
94a9e0d
yikes
shirleyquirk Apr 15, 2021
4f72a21
changelog
shirleyquirk Apr 15, 2021
8947b37
sorry, ok that should be a separate pr
shirleyquirk Apr 15, 2021
1aab700
i can't git
shirleyquirk Apr 15, 2021
644b4bd
cuchar change
shirleyquirk Apr 15, 2021
9b5a148
u
shirleyquirk Apr 15, 2021
fb72b7f
s/map/aliases
shirleyquirk Apr 15, 2021
3004924
backward compat
shirleyquirk Apr 15, 2021
0a48546
make backportable
shirleyquirk Apr 16, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

## Standard library additions and changes

- Fixed buffer overflow bugs in `net`
shirleyquirk marked this conversation as resolved.
Show resolved Hide resolved

- Added `sections` iterator in `parsecfg`.

- Make custom op in macros.quote work for all statements.
Expand Down
7 changes: 3 additions & 4 deletions lib/pure/net.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,12 +690,11 @@ when defineSsl:
let ctx = SslContext(context: ssl.SSL_get_SSL_CTX)
let hintString = if hint == nil: "" else: $hint
let (identityString, pskString) = (ctx.clientGetPskFunc)(hintString)
if psk.len.cuint > max_psk_len:
if pskString.len.cuint > max_psk_len:
return 0
if identityString.len.cuint >= max_identity_len:
return 0

copyMem(identity, identityString.cstring, pskString.len + 1) # with the last zero byte
copyMem(identity, identityString.cstring, identityString.len + 1) # with the last zero byte
copyMem(psk, pskString.cstring, pskString.len)

return pskString.len.cuint
Expand All @@ -716,7 +715,7 @@ when defineSsl:
max_psk_len: cint): cuint {.cdecl.} =
let ctx = SslContext(context: ssl.SSL_get_SSL_CTX)
let pskString = (ctx.serverGetPskFunc)($identity)
if psk.len.cint > max_psk_len:
if pskString.len.cint > max_psk_len:
return 0
copyMem(psk, pskString.cstring, pskString.len)

Expand Down