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.

Sign up for GitHub

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

Add SealedBox support #127

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add SealedBox support #127

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
868b42b
Add preliminary (untested) SealedBox support
om26er Mar 13, 2019
4dc2e93
use the sodium() method which ensures thins are initialized
om26er Mar 13, 2019
8c6ebbd
Ensure public and private keys are not null when constructing
om26er Mar 22, 2019
970d009
No need to add unchecked exception to the signature
om26er Mar 22, 2019
809e320
Merge branch 'master' into implement-sealed-box
om26er Apr 27, 2019
b999518
Make decrypt a static method
om26er Apr 27, 2019
cd6e07e
Better error messaging
om26er Apr 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/main/java/org/libsodium/jni/crypto/SealedBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package org.libsodium.jni.crypto;

import org.libsodium.jni.encoders.Encoder;

import static org.libsodium.jni.NaCl.sodium;
import static org.libsodium.jni.SodiumConstants.SEAL_BYTES;
import static org.libsodium.jni.crypto.Util.isValid;

public class SealedBox {

private byte[] publicKey;
private byte[] privateKey;

public SealedBox(byte[] publicKey) {
this.publicKey = publicKey;
this.privateKey = null;
}

public SealedBox(String publicKey, Encoder encoder) {
this(encoder.decode(publicKey));
}

public SealedBox(byte[] publicKey, byte[] privateKey) {
this.publicKey = publicKey;
this.privateKey = privateKey;
}

public SealedBox(String publicKey, String privateKey, Encoder encoder) {
this(encoder.decode(publicKey), encoder.decode(privateKey));
}

public byte[] encrypt(byte[] message) {
if (publicKey == null)
Copy link
Owner

Choose a reason for hiding this comment

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

We need to avoid waiting until encrypt time to determine that the public key passed at initialization is incorrect.

Copy link
Author

Choose a reason for hiding this comment

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

Ok, moved that check into the constructor, now throwing IllegalArgumentException though that also inherits RuntimeException. Couldn't think of an appropriate checked exception here (if we want to go that way, we could do a custom exception though).

throw new RuntimeException("Encryption failed. Public key not available.");
byte[] ct = new byte[message.length + SEAL_BYTES];
isValid(sodium().crypto_box_seal(
Copy link
Owner

Choose a reason for hiding this comment

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

The Util class is marked deprecated and should not be used.

isValid is supposed to return a boolean, though throws a RuntimeException.

Copy link
Author

Choose a reason for hiding this comment

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

Ok, I have removed the usage of isValid and have moved the check internally.

What's the planned approach to deal with all the deprecated classes ?

Copy link
Owner

Choose a reason for hiding this comment

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

Planning to remove the deprecated classes in a major release.
The deprecated classes haven't been removed yet as it's unclear impact to downstream developers.

ct, message, message.length, publicKey),
"Encryption failed");
return ct;
}

public byte[] decrypt(byte[] ciphertext) {
if (privateKey == null)
Copy link
Owner

Choose a reason for hiding this comment

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

We need to avoid waiting until decrypt time to determine that the public key passed at initialization is incorrect.

Copy link
Author

Choose a reason for hiding this comment

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

Fixed that as well.

throw new RuntimeException("Decryption failed. Private key not available.");

byte[] message = new byte[ciphertext.length - SEAL_BYTES];
isValid(sodium().crypto_box_seal_open(
message, ciphertext, ciphertext.length, publicKey, privateKey),
"Decryption failed. Ciphertext failed verification");
return message;
}
}