Skip to content

clamp BIO_read length in encrypt/decrypt_rsa_message #2050

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
dxbjavid wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

clamp BIO_read length in encrypt/decrypt_rsa_message #2050

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
10 changes: 8 additions & 2 deletions src/iperf_auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ int encrypt_rsa_message(const char *plaintext, EVP_PKEY *public_key, unsigned ch
encryptedtext_len = output_buffer_len;

BIO *bioBuff = BIO_new_mem_buf((void*)plaintext, (int)plaintext_len);
rsa_buffer_len = BIO_read(bioBuff, rsa_buffer, plaintext_len);
/* rsa_buffer only holds output_buffer_len bytes, so never read more than
that even when the input is longer (the truncation warned about above). */
int read_len = plaintext_len > (size_t)output_buffer_len ? output_buffer_len : (int)plaintext_len;
rsa_buffer_len = BIO_read(bioBuff, rsa_buffer, read_len);

int padding = RSA_PKCS1_OAEP_PADDING;
if (use_pkcs1_padding){
Expand Down Expand Up @@ -346,7 +349,10 @@ int decrypt_rsa_message(const unsigned char *encryptedtext, const int encryptedt
*plaintext = (unsigned char*)OPENSSL_malloc(output_buffer_len + 1);

BIO *bioBuff = BIO_new_mem_buf((void*)encryptedtext, encryptedtext_len);
rsa_buffer_len = BIO_read(bioBuff, rsa_buffer, encryptedtext_len);
/* rsa_buffer only holds output_buffer_len bytes, so never read more than
that even when the input is longer (the truncation warned about above). */
int read_len = encryptedtext_len > output_buffer_len ? output_buffer_len : encryptedtext_len;
rsa_buffer_len = BIO_read(bioBuff, rsa_buffer, read_len);

int padding = RSA_PKCS1_OAEP_PADDING;
if (use_pkcs1_padding){
Expand Down
Loading