Merge branch 'use-xsalsa20-poly1305' into 'master' (d7f20401) · 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

d7f20401

Commit d7f20401 authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'use-xsalsa20-poly1305' into 'master'

Use XSalsa20-Poly1305 instead of AES-GCM for transport encryption and password storage.

This patch integrates @str4d's new authenticated cipher implementation. It depends on !18.

See merge request !35

parents 83a2552a ec3eafbb

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/invitation/AddContactActivity.java 5 additions, 4 deletions

...g/briarproject/android/invitation/AddContactActivity.java
briar-api/src/org/briarproject/api/transport/TransportConstants.java 1 addition, 1 deletion

...rc/org/briarproject/api/transport/TransportConstants.java
briar-core/src/org/briarproject/crypto/AuthenticatedCipher.java 8 additions, 8 deletions

...core/src/org/briarproject/crypto/AuthenticatedCipher.java
briar-core/src/org/briarproject/crypto/AuthenticatedCipherImpl.java 0 additions, 57 deletions

.../src/org/briarproject/crypto/AuthenticatedCipherImpl.java
briar-core/src/org/briarproject/crypto/CryptoComponentImpl.java 10 additions, 10 deletions

...core/src/org/briarproject/crypto/CryptoComponentImpl.java
briar-core/src/org/briarproject/crypto/CryptoModule.java 12 additions, 11 deletions

briar-core/src/org/briarproject/crypto/CryptoModule.java
briar-core/src/org/briarproject/crypto/XSalsa20Poly1305AuthenticatedCipher.java 10 additions, 10 deletions

...arproject/crypto/XSalsa20Poly1305AuthenticatedCipher.java
briar-tests/src/org/briarproject/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java 18 additions, 14 deletions

...oject/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java

with 64 additions and 115 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