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

Use memset_s to clear auth password. #106

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Use memset_s to clear auth password. #106

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5d3280
Use memset_s to clear auth password.
dhruvCW Jul 19, 2023
0ceb159
replace memset_s with explicit_bzero
dhruvCW Aug 15, 2023
332604a
Merge branch 'main' into secure_memset
dhruvCW Sep 14, 2023
03cc077
Merge branch 'main' into secure_memset
dhruvCW Sep 20, 2023
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
7 changes: 6 additions & 1 deletion src/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <fcntl.h>
#include <string.h>

#include "trilogy/client.h"
#include "trilogy/error.h"
Expand Down Expand Up @@ -401,7 +402,11 @@ int trilogy_auth_switch_send(trilogy_conn_t *conn, const trilogy_handshake_t *ha
void trilogy_auth_clear_password(trilogy_conn_t *conn)
{
if (conn->socket->opts.password) {
memset(conn->socket->opts.password, 0, conn->socket->opts.password_len);
# ifdef __STDC_WANT_LIB_EXT1__
memset_s(conn->socket->opts.password, conn->socket->opts.password_len, 0, conn->socket->opts.password_len);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is not always defined, so it would need a detection mechanism to see if it's available.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup realized too late that memset_s is not in posix. I believe explicit_bzero would be the alternative. Need to do an if def to handle this 😑

#else
explicit_bzero(conn->socket->opts.password, conn->socket->opts.password_len);
#endif
}
}

Expand Down