Skip to content

Add __msan_unpoison for X25519 assembly output buffers #10

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

Open
alexey-milovidov wants to merge 1 commit into
base: ClickHouse/openssl-3.5.5
Choose a base branch
from
Open

Add __msan_unpoison for X25519 assembly output buffers #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions crypto/ec/curve25519.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@

#include "internal/numbers.h"

#if defined(__has_feature)
# if __has_feature(memory_sanitizer)
# include <sanitizer/msan_interface.h>
# endif
#endif

#if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))

#define BASE_2_64_IMPLEMENTED
Expand Down Expand Up @@ -5846,6 +5852,12 @@ int ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
{
static const uint8_t kZeros[32] = { 0 };
x25519_scalar_mult(out_shared_key, private_key, peer_public_value);
#if defined(__has_feature)
# if __has_feature(memory_sanitizer)
/* x25519_scalar_mult may use assembly that MSan cannot instrument. */
__msan_unpoison(out_shared_key, 32);
# endif
#endif
/* The all-zero output results when the input is a point of small order. */
return CRYPTO_memcmp(kZeros, out_shared_key, 32) != 0;
}
Expand Down Expand Up @@ -5875,5 +5887,11 @@ void ossl_x25519_public_from_private(uint8_t out_public_value[32],
fe_mul(zplusy, zplusy, zminusy_inv);
fe_tobytes(out_public_value, zplusy);

#if defined(__has_feature)
# if __has_feature(memory_sanitizer)
__msan_unpoison(out_public_value, 32);
# endif
#endif

OPENSSL_cleanse(e, sizeof(e));
}
Loading