Add RSA-OAEP via #95 #142
Merged
Add RSA-OAEP via #95 #142
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add RSAES_OAEP type to AsymmetricKeyAlgorithm * Adds AsymmetricKeyAlgorithm.RSAES_OAEP and implements plain text and cipher length check * Add encrypter for (RSAES_OAEP, A256CBCHS512) * Add decrypter for (RSAES_OAEP, A256CBCHS512) * Rename new AsymmetricKeyAlgorithm case to RSAOAEP * Fix length checks * Add Encrypter Tests * Add Decrypter Tests
…wift into resolve-conflicts-95 # Conflicts: # JOSESwift/Sources/Algorithms.swift # JOSESwift/Sources/CryptoImplementation/RSA.swift # JOSESwift/Sources/Decrypter.swift # JOSESwift/Sources/Encrypter.swift # Tests/RSADecrypterTests.swift # Tests/RSAEncrypterTests.swift
ghost
self-assigned this
ghost
requested review from
ghost
mentioned this pull request
ghost
reviewed
Feb 13, 2019
Co-Authored-By: daniel-mohemian <[email protected]>
Co-Authored-By: daniel-mohemian <[email protected]>
Co-Authored-By: daniel-mohemian <[email protected]>
# Conflicts: # CHANGELOG.md # README.md
| @@ -67,15 +69,23 @@ internal extension AsymmetricKeyAlgorithm { | |||
| /// | |||
| /// - RSA1_5: For detailed information about the allowed plain text length for RSAES-PKCS1-v1_5, | |||
| /// please refer to [RFC-3447, Section 7.2](https://tools.ietf.org/html/rfc3447#section-7.2). | |||
| /// - RSAOAEP256: For detailed information about the allowed plain text length for RSA-OAEP, | |||
| /// - RSAOAEP: For detailed information about the allowed plain text length for RSA-OAEP, | |||
There was a problem hiding this comment.
Before the comma: Should be RSAES-OAEP.
| /// - RSAOAEP256: For detailed information about the allowed plain text length for RSA-OAEP, | ||
| /// - RSAOAEP: For detailed information about the allowed plain text length for RSA-OAEP, | ||
| /// please refer to [RFC-3447, Section 7.1](https://tools.ietf.org/html/rfc3447#section-7.1). | ||
| /// - RSAOAEP256: For detailed information about the allowed plain text length for RSA-OAEP-256, |
There was a problem hiding this comment.
Before the comma: Should be RSAES-OAEP-256.
| // and https://www.rfc-editor.org/errata_search.php?rfc=3447) | ||
| // C: ciphertext to be decrypted, an octet string of length k, where k >= 2hLen + 2 | ||
| case .RSAOAEP, .RSAOAEP256: | ||
| // For detailed information about the allowed cipher length for RSA-OAEP and RSA-OAEP-256, |
There was a problem hiding this comment.
Same same: RSAES-OAEP and ``RSAES-OAEP-256`
| // For detailed information about the allowed cipher length for RSA-OAEP and RSA-OAEP-256, | ||
| // please refer to RFC-3447 (https://tools.ietf.org/html/rfc3447#section-7.1.2, | ||
| // https://www.rfc-editor.org/errata_search.php?rfc=3447): | ||
| // The ciphertext to be decrypted is an an octet string of length k, |
There was a problem hiding this comment.
is an an octet -> is an octet
JOSESwift/Sources/Decrypter.swift
Outdated
| // For detailed information, please refer to this RFC(https://tools.ietf.org/html/rfc3218#section-2.3.2) | ||
| // and http://www.ietf.org/mail-archive/web/jose/current/msg01832.html | ||
| // Generate a random CEK to substitue in case we fail to decrypt the CEK. | ||
| // This is to prevent the to prevent MMA (Million Message Attack) against RSA. |
There was a problem hiding this comment.
This it to prevent the to prevent MMA -> This is to prevent the MMA
Tests/JWERSATests.swift
Outdated
| @@ -34,17 +57,28 @@ class JWETests: RSACryptoTestCase { | |||
| YP_e_rhz0PVg9QnJXiRl030ggI9GGs3E_0pEPBs9_WJ3E60qQVoXTIMbJXSQ.bQc-W1Ph_0_3kX570pT8gjDlGyiK3kF8PlHiT7GWfMo | |||
| """.data(using: .utf8)! | |||
|
|
|||
| let compactSerializedJWERSAOAEPSHA = """ | |||
Tests/RSADecrypterTests.swift
Outdated
| """ | ||
|
|
||
| // printf "The true sign of intelligence is not knowledge but imagination." | openssl pkeyutl -encrypt -pubin -inkey alice.pub.pem -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha1 -pkeyopt rsa_mgf1_md:sha1 -out >(base64) | ||
| // *NOTE*: openssl v1.1.x is required to encrypt data using RSA-OAEP with SHA256 digest |
Tests/RSADecrypterTests.swift
Outdated
| mNYaDDsxfYHg3LzWsVyhqpFuZQ6hhklG9lJr6OBBuk/+pcJYdHuYEuLnJhPeKqF/9xgMOU0e0xLMtkQW+IfDMlm0oAVavHrxk7A4T5L9+yjuxNj\ | ||
| N16k2Rqiw== | ||
| """ | ||
|
|
||
| // printf "The true sign of intelligence is not knowledge but imagination." | openssl pkeyutl -encrypt -pubin -inkey bob.pub.pem -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 -pkeyopt rsa_mgf1_md:sha256 -out >(base64) | ||
| // *NOTE*: openssl v1.1.x is required to encrypt data using RSA-OAEP with SHA256 digest |
| """ | ||
|
|
||
| // printf "The true sign of intelligence is not knowledge but imagination." | openssl pkeyutl -encrypt -pubin -inkey bob.pub.pem -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha1 -pkeyopt rsa_mgf1_md:sha1 -out >(base64) | ||
| // *NOTE*: openssl v1.1.x is required to encrypt data using RSA-OAEP with SHA256 digest |
ghost
approved these changes
Feb 19, 2019
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The original #95 branch was pretty far behind master so I figured it was easier to merge the implementation on my machine and redo the tests.
All props to @garrefa for the RSA-OAEP implementation effort and @stulevine for making the RSA tests easily expandable.