Merge pull request #78 from joshjdevl/disable-pwhash_scryptsalsa

Disable pwhash scryptsalsa

build-linux.sh

@@ -4,6 +4,7 @@
 
 ./submodule-update.sh
 
+gradle generateSWIGsource --full-stacktrace
 gradle build --full-stacktrace
 ./build-kaliumjni.sh
 ./build-libsodiumjni.sh

build.sh

@@ -4,18 +4,10 @@ set -ev
 
 . ./setenv.sh
 
-rm -rf libsodium
-
-git submodule init
-git submodule sync
-#git submodule update --remote --merge
-git submodule update
+./submodule-update.sh
 
 pushd libsodium
 
-git fetch && git checkout stable
-git reset --hard origin/stable
-git pull
 ./autogen.sh
 ./configure --quiet
 make --quiet && make --quiet check 

jni/sodium.i

@@ -1060,6 +1060,7 @@ const char * crypto_pwhash_primitive(void);
 /*
     PW-Hash scryptsalsa208sha256
 */
+/*
 size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
 
 size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
@@ -1097,6 +1098,7 @@ int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd,
                                           uint32_t p,
                                           uint8_t * buf,
                                           size_t buflen);
+*/
 
 /*
     ScalarMult Curve25519

src/main/java/org/libsodium/jni/crypto/Hash.java

@@ -50,7 +50,7 @@ public String sha512(String message, Encoder encoder) {
 
     public String pwhash_scryptsalsa208sha256(String passwd, Encoder encoder, byte[] salt, int opslimit, int memlimit) {
         buffer = new byte[KEY_LEN];
-        sodium().crypto_pwhash_scryptsalsa208sha256(buffer, buffer.length, passwd.getBytes(), passwd.length(), salt, opslimit, memlimit);
+        sodium().crypto_pwhash(buffer, buffer.length, passwd.getBytes(), passwd.length(), salt, opslimit, memlimit,sodium().crypto_pwhash_alg_default());
         return encoder.encode(buffer);
     }
 

src/main/java/org/libsodium/jni/encoders/Encoder.java

@@ -20,7 +20,7 @@
 
 public interface Encoder {
 
-    public static final Charset CHARSET = Charset.forName("US-ASCII");
+    public static final Charset CHARSET = Charset.forName("UTF-8");
 
     public static final Hex HEX = new Hex();
     public static final Raw RAW = new Raw();