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

/dev/crypto engine: add missing RC4 parameter #7281

Closed
wants to merge 2 commits into from
Closed

/dev/crypto engine: add missing RC4 parameter #7281

wants to merge 2 commits into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Sep 20, 2018

Fixes #7280

@levitte levitte added branch: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch labels Sep 20, 2018
@levitte levitte mentioned this pull request Sep 20, 2018
Closed
@levitte
Copy link
Member Author

levitte commented Sep 20, 2018 •
edited

Issue submitter confirmed that this PR works as expected, see #7280 (comment)

@mattcaswell mattcaswell added the approval: done This pull request has the required number of approvals label Sep 20, 2018
mspncp
mspncp reviewed Sep 20, 2018
View reviewed changes
crypto/engine/eng_devcrypto.c Outdated
@@ -69,7 +69,7 @@ static const struct cipher_data_st {
{ NID_aes_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
{ NID_aes_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
#ifndef OPENSSL_NO_RC4
{ NID_rc4, 1, 16, 0, CRYPTO_ARC4 },
{ NID_rc4, 1, 16, 0, 0, CRYPTO_ARC4 },
Copy link
Contributor

Choose a reason for hiding this comment

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

note: evp.h has the following define:

# define         EVP_CIPH_STREAM_CIPHER          0x0

Copy link
Member Author

Choose a reason for hiding this comment

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

Oooh!

Copy link
Member Author

Choose a reason for hiding this comment

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

Okie, changed

@levitte
Copy link
Member Author

levitte commented Sep 20, 2018

Because of small change, this needs reapproving

levitte added a commit that referenced this pull request Sep 20, 2018
@levitte
/dev/crypto engine: add missing RC4 parameter
baa5cda 
Fixes #7280

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from #7281)

(cherry picked from commit f52f2c1)
levitte added a commit that referenced this pull request Sep 20, 2018
@levitte
/dev/crypto engine: add missing RC4 parameter
f52f2c1 
Fixes #7280

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from #7281)
@levitte
Copy link
Member Author

levitte commented Sep 20, 2018

Thank you
Merged

master:
f52f2c1 /dev/crypto engine: add missing RC4 parameter

1.1.1:
baa5cda /dev/crypto engine: add missing RC4 parameter

@levitte levitte closed this Sep 20, 2018
@mspncp mspncp added this to the 1.1.1a milestone Oct 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattcaswell mattcaswell mattcaswell approved these changes

@mspncp mspncp mspncp approved these changes

Assignees
No one assigned
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch
Projects
None yet
Milestone
1.1.1a
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@levitte @mattcaswell @mspncp