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.

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

Merge origin master in #1

Merged
merged 4 commits into from
Aug 22, 2018
Merged

Merge origin master in #1

merged 4 commits into from
Aug 22, 2018

Conversation

garrefa
Copy link
Owner

@garrefa garrefa commented Aug 22, 2018

No description provided.

garrefa and others added 4 commits July 18, 2018 14:00
* Add direct encryption sketch

* Change encryptor initializer parameter name

* Add symmetric decryption

* Make base64url and secure random public

* [87] Implement symmetric JWKs

* [87] Update gitignore

* [87] Remove shared data file

* [87] Commit workspace checks

* [87] Add basic test suite for direct encryption

* [87] Clean up encrypter

* [87] Add swiftlint exception

* [87] Update decryption

* [87] Extend direct encryption tests

* [87] Add old encrypter initializer for compatability

* [87] Update tests fro encrypter init

* [87] Add old decrypter init for comapatibility

* [87] Update decrypter tests

* [87] Update header tests for direct

* [87] Update sym key documentation

* [87] Add symmetric JWK tests

* [87] Implement symmetirc jek set support and tests

* Update readme

* [87] Fix comment headers

* [87] Fix more comments and some typos

* [87] Fix formatting

* [87] Formatting

* [87] Add empty encrypted key commetn

* [87] Formatting

* [87] Add json to key doc

* [87] Update error message

* [87] Rename key type to OCT
* [JOSE-80] Add shared user data introduced Xcode 9.3 to gitignore

* [JOSE-80] Add failure test case for decrypting empty data

* [JOSE-80] Better assertions for failure case

* [JOSE-80] privateKey2048 -> privateKeyAlice2048

* [JOSE-80] publicKey2048 -> publicKeyAlice2048

* [JOSE-80] Add Bob’s 2048 bit private key

* [JOSE-80] Add encryption test for Bob’s key

* [JOSE-80] keyPair2048 -> keyPairAlice2048

* [JOSE-80] Read Bob’s keypair from plist file

* [JOSE-80] cipherTextBase64URL -> cipherTextWithAliceKeyBase64URL

* [JOSE-80] Load Bob’s key data; update cipher texts; add Bob decryption tests

* [JOSE-80] Add test for encrypting the same data twice

* [JOSE-80] Add test to check if Alice’s and Bob’s cipher texts differ

* [JOSE-80] Add equality for decryption error

* [JOSE-80] Add default decryption error

* [JOSE-80] Decrypting with the wrong key should throw an error

* [JOSE-80] Update Bob’s cipher text

* [JOSE-80] Fix Base64 variable names

* [JOSE-80] Use multiline literals for cipher texts

* [JOSE-80] Re-generate Alice’s cypher text with openssl; adjust test

* [JOSE-80] Re-generate Bob’s cypher text with openssl; adjust test

* [JOSE-80] Better comments

* [JOSE-80] Remove nonsensical empty string test

* [JOSE-80] Rename TestKey.plist -> TestKeys.plist

* [JOSE-80] Add decrypter test for zero-length data

* [JOSE-80] Add tests for encrypting message of length `mLen` and `mLen + 1`

* [JOSE-80] Better naming for zero length decryption test

* [JOSE-80] Add decryption tests for `len=k`, `len=k-1`, `len=k+1`

* [JOSE-80] Use Alice’s key for new tests
…rifiers (#97)

* Add direct encryption sketch

* Change encryptor initializer parameter name

* Add symmetric decryption

* Make base64url and secure random public

* [87] Implement symmetric JWKs

* [87] Update gitignore

* [87] Remove shared data file

* [87] Commit workspace checks

* [87] Add basic test suite for direct encryption

* [87] Clean up encrypter

* [87] Add swiftlint exception

* [87] Update decryption

* [87] Extend direct encryption tests

* [87] Add old encrypter initializer for compatability

* [87] Update tests fro encrypter init

* [87] Add old decrypter init for comapatibility

* [87] Update decrypter tests

* [87] Update header tests for direct

* [87] Update sym key documentation

* [87] Add symmetric JWK tests

* [87] Implement symmetirc jek set support and tests

* Update readme

* [87] Fix comment headers

* [87] Fix more comments and some typos

* [87] Fix formatting

* [87] Formatting

* [87] Add empty encrypted key commetn

* [87] Formatting

* [87] Add json to key doc

* [67] Make verifier init gneric not verifier itself

* [67] Add explicit verifier and decrypter methods

* [67] Add verifier tests

* [67] Add more tests

* [87] Update error message

* [87] Rename key type to OCT

* [67] Add decrypter tests

* [67] Fis alg in test

* [67] Rename test

* [67] Add isValid width explicit verifier function for JWS

* [67] Deprecate old verifying and decryption functions

* [67] Update readme

* [67] Fix merge errors

* Remove newline

* Fix comment in tests

* Fix test description

* Align test descriptions
@garrefa garrefa merged commit 9f5f898 into garrefa:master Aug 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants