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

Kill use of getBytes() which depends on platform encoding. #105

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Kill use of getBytes() which depends on platform encoding. #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/main/java/org/libsodium/jni/crypto/Hash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,18 @@ public byte[] sha512(byte[] message) {
}

public String sha256(String message, Encoder encoder) {
byte[] hash = sha256(message.getBytes());
byte[] hash = sha256(encoder.decode( message ));
return encoder.encode(hash);
}

public String sha512(String message, Encoder encoder) {
byte[] hash = sha512(message.getBytes());
byte[] hash = sha512(encoder.decode( message ));
return encoder.encode(hash);
}

public String pwhash_scryptsalsa208sha256(String passwd, Encoder encoder, byte[] salt, int opslimit, int memlimit) {
buffer = new byte[KEY_LEN];
//sodium().crypto_pwhash(buffer, buffer.length, passwd.getBytes(), passwd.length(), salt, opslimit, memlimit,sodium().crypto_pwhash_alg_default());

sodium().crypto_pwhash_scryptsalsa208sha256(buffer, buffer.length, passwd.getBytes(), passwd.length(), salt, opslimit, memlimit);
sodium().crypto_pwhash_scryptsalsa208sha256(buffer, buffer.length, encoder.decode( passwd ), passwd.length(), salt, opslimit, memlimit);
return encoder.encode(buffer);
}

Expand All @@ -66,7 +64,7 @@ public byte[] blake2(byte[] message) throws UnsupportedOperationException {

public String blake2(String message, Encoder encoder) throws UnsupportedOperationException {
if (!blakeSupportedVersion()) throw new UnsupportedOperationException();
byte[] hash = blake2(message.getBytes());
byte[] hash = blake2(encoder.decode( message ));
return encoder.encode(hash);
}

Expand Down