Skip to content

Conversation

@marekoid
Copy link
Contributor

@marekoid marekoid commented Mar 24, 2020

Copied relevant bits for our decryption needs from:
https://github.com/freeeve/nacl-java/blob/0369ed1b166591db9f7a2d511a3554c2376871dd/src/main/java/com/caligochat/nacl/SecretBox.java
adjusting the entry point to take the key in the constructor,
have preconditions checked and better signalling AuthenticityException,
and added the clearKey method.

Added MIT License to the copied files.

CC @pusher/mobile

Copied relevant bits for our decryption needs from:
https://github.com/freeeve/nacl-java/blob/0369ed1b166591db9f7a2d511a3554c2376871dd/src/main/java/com/caligochat/nacl/SecretBox.java
adjusting the entry point to take the key in the constructor,
have preconditions checked and better signalling AuthenticityException,
and added the clearKey method.

Added MIT License to the copied files.
@marekoid marekoid requested review from daniellevass and mdpye March 24, 2020 13:54
Copy link
Contributor

@daniellevass daniellevass left a comment

Choose a reason for hiding this comment

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

Left one small comment - but the rest of it makes sense 👍

@@ -0,0 +1,137 @@
/*
Copyright 2015 Eve Freeman
Copy link
Contributor

Choose a reason for hiding this comment

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

should this one have the copyright even though bits of it have been edited?

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess what i'm more trying to say is, should we highlight the bits which you've changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is a "substantial portion of the Software", indeed most of the stuff here is copied. I added though Pusher's copyright as well: 451a3f2
The whole SDK is also licensed on MIT so easy compatibility-wise.

@marekoid marekoid requested review from daniellevass and mdpye March 24, 2020 14:35
@marekoid marekoid merged commit fa6a54d into decrypt-integration Mar 25, 2020
@marekoid marekoid deleted the decrypt branch March 25, 2020 10:40
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.

4 participants