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

pass padding of 0 to EVP_CIPHER_CTX_set_padding #3450

Merged
merged 1 commit into from
Aug 25, 2022
Merged

pass padding of 0 to EVP_CIPHER_CTX_set_padding #3450

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions crypto/s2n_cbc_cipher_3des.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static int s2n_cbc_cipher_3des_set_decryption_key(struct s2n_session_key *key, s
{
POSIX_ENSURE_EQ(in->size, 192 / 8);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_DecryptInit_ex(key->evp_cipher_ctx, EVP_des_ede3_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand All @@ -67,7 +67,7 @@ static int s2n_cbc_cipher_3des_set_encryption_key(struct s2n_session_key *key, s
{
POSIX_ENSURE_EQ(in->size, 192 / 8);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_EncryptInit_ex(key->evp_cipher_ctx, EVP_des_ede3_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand Down
8 changes: 4 additions & 4 deletions crypto/s2n_cbc_cipher_aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int s2n_cbc_cipher_aes128_set_decryption_key(struct s2n_session_key *key, struct
POSIX_ENSURE_EQ(in->size, 128 / 8);

/* Always returns 1 */
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_DecryptInit_ex(key->evp_cipher_ctx, EVP_aes_128_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand All @@ -72,7 +72,7 @@ static int s2n_cbc_cipher_aes128_set_encryption_key(struct s2n_session_key *key,
{
POSIX_ENSURE_EQ(in->size, 128 / 8);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_EncryptInit_ex(key->evp_cipher_ctx, EVP_aes_128_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand All @@ -82,7 +82,7 @@ static int s2n_cbc_cipher_aes256_set_decryption_key(struct s2n_session_key *key,
{
POSIX_ENSURE_EQ(in->size, 256 / 8);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_DecryptInit_ex(key->evp_cipher_ctx, EVP_aes_256_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand All @@ -92,7 +92,7 @@ int s2n_cbc_cipher_aes256_set_encryption_key(struct s2n_session_key *key, struct
{
POSIX_ENSURE_EQ(in->size, 256 / 8);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
POSIX_GUARD_OSSL(EVP_EncryptInit_ex(key->evp_cipher_ctx, EVP_aes_256_cbc(), NULL, in->data, NULL), S2N_ERR_KEY_INIT);

return 0;
Expand Down
16 changes: 8 additions & 8 deletions crypto/s2n_composite_cipher_aes_sha.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ static int s2n_composite_cipher_aes128_sha_set_encryption_key(struct s2n_session
{
POSIX_ENSURE_EQ(in->size, 16);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_EncryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_128_cbc_hmac_sha1(), NULL, in->data, NULL);

return 0;
Expand All @@ -215,7 +215,7 @@ static int s2n_composite_cipher_aes128_sha_set_decryption_key(struct s2n_session
{
POSIX_ENSURE_EQ(in->size, 16);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_DecryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_128_cbc_hmac_sha1(), NULL, in->data, NULL);

return 0;
Expand All @@ -225,7 +225,7 @@ static int s2n_composite_cipher_aes256_sha_set_encryption_key(struct s2n_session
{
POSIX_ENSURE_EQ(in->size, 32);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_EncryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_256_cbc_hmac_sha1(), NULL, in->data, NULL);

return 0;
Expand All @@ -235,7 +235,7 @@ static int s2n_composite_cipher_aes256_sha_set_decryption_key(struct s2n_session
{
POSIX_ENSURE_EQ(in->size, 32);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_DecryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_256_cbc_hmac_sha1(), NULL, in->data, NULL);

return 0;
Expand All @@ -245,7 +245,7 @@ static int s2n_composite_cipher_aes128_sha256_set_encryption_key(struct s2n_sess
{
POSIX_ENSURE_EQ(in->size, 16);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_EncryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_128_cbc_hmac_sha256(), NULL, in->data, NULL);

return 0;
Expand All @@ -255,7 +255,7 @@ static int s2n_composite_cipher_aes128_sha256_set_decryption_key(struct s2n_sess
{
POSIX_ENSURE_EQ(in->size, 16);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_DecryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_128_cbc_hmac_sha256(), NULL, in->data, NULL);

return 0;
Expand All @@ -265,7 +265,7 @@ static int s2n_composite_cipher_aes256_sha256_set_encryption_key(struct s2n_sess
{
POSIX_ENSURE_EQ(in->size, 32);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_EncryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_256_cbc_hmac_sha256(), NULL, in->data, NULL);

return 0;
Expand All @@ -275,7 +275,7 @@ static int s2n_composite_cipher_aes256_sha256_set_decryption_key(struct s2n_sess
{
POSIX_ENSURE_EQ(in->size, 32);

EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, EVP_CIPH_NO_PADDING);
EVP_CIPHER_CTX_set_padding(key->evp_cipher_ctx, 0);
EVP_DecryptInit_ex(key->evp_cipher_ctx, s2n_evp_aes_256_cbc_hmac_sha256(), NULL, in->data, NULL);

return 0;
Expand Down