Merge branch '147-crypto_secretbox' into 'master' (c7e4d5ff) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

c7e4d5ff

Commit c7e4d5ff authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '147-crypto_secretbox' into 'master'

147 crypto secretbox

Closes #147

See merge request !27

parents c26d1a27 d9808c48

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-core/src/org/briarproject/crypto/AuthenticatedCipher.java 25 additions, 3 deletions

...core/src/org/briarproject/crypto/AuthenticatedCipher.java
briar-core/src/org/briarproject/crypto/XSalsa20Poly1305AC.java 125 additions, 0 deletions

...-core/src/org/briarproject/crypto/XSalsa20Poly1305AC.java
briar-tests/src/org/briarproject/crypto/XSalsa20Poly1305ACTest.java 89 additions, 0 deletions

...s/src/org/briarproject/crypto/XSalsa20Poly1305ACTest.java

with 239 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment