Updated pwhash longs to NativeLongs

Caused by platforms parsing the memLimit param different. That is, Ubuntu vs Android crashed alternately when changing the memLimit param to an int or a long
terl · Nov 27, 2018 · c19a630 · c19a630
1 parent 8e405d5
commit c19a630
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ plugins {
 ext {
     artifactId = "lazysodium-android"
     groupId = "com.goterl.lazycode"
-    version = '3.4.2'
+    version = '3.5.0'
     description = "Lazysodium (Android) makes it effortless for Android " +
             "developers to get started with Libsodium's cryptography."
     androidTestDir = "src/androidTest/java/com/goterl/lazycode/lazysodium"

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/AEADAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/AEADAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 22/05/18 11:04 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/AuthAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/AuthAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 14/05/18 00:54 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/BoxAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/BoxAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 12/05/18 15:09 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/DiffieHellmanAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/DiffieHellmanAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 31/07/18 18:54 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/GenericHashAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/GenericHashAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 11/05/18 23:19 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/HashAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/HashAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 18/05/18 21:45 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/HelperAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/HelperAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 18/05/18 18:35 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/KeyDerivationAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/KeyDerivationAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 04/05/18 22:58 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/KeyExchangeAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/KeyExchangeAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 10/05/18 23:39 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/PwHashAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/PwHashAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 03/05/18 11:37 • goterl.com
  *
@@ -14,6 +13,7 @@
 import com.goterl.lazycode.lazysodium.exceptions.SodiumException;
 import com.goterl.lazycode.lazysodium.interfaces.PwHash;
 import com.goterl.lazycode.lazysodium.interfaces.Scrypt;
+import com.sun.jna.NativeLong;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,7 +43,7 @@ public void nativeHash() throws SodiumException {
                 PwHash.BYTES_MIN,
                 lazySodium.randomBytesBuf(PwHash.SALTBYTES),
                 5L,
-                8192 * 2,
+                new NativeLong(8192 * 2),
                 PwHash.Alg.PWHASH_ALG_ARGON2ID13
         );
 
@@ -57,7 +57,7 @@ public void strMin() throws SodiumException {
         String hash = pwHashLazy.cryptoPwHashStr(
                 PASSWORD,
                 3,
-                PwHash.ARGON2ID_MEMLIMIT_MIN
+                PwHash.MEMLIMIT_MIN
         );
 
         boolean isCorrect = pwHashLazy.cryptoPwHashStrVerify(hash, PASSWORD);

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecretBoxAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecretBoxAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 11/05/18 12:18 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecretStreamAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecretStreamAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 07/05/18 12:05 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecureMemoryAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SecureMemoryAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 05/06/18 00:15 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/ShortHashAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/ShortHashAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 10/05/18 22:20 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SignAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/SignAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 12/05/18 18:55 • goterl.com
  *

diff --git a/app/src/androidTest/java/com/goterl/lazycode/lazysodium/StreamAndroidTest.java b/app/src/androidTest/java/com/goterl/lazycode/lazysodium/StreamAndroidTest.java
@@ -1,4 +1,3 @@
-package com.goterl.lazycode.lazysodium;
 /*
  * Copyright (c) Terl Tech Ltd • 17/07/18 23:21 • goterl.com
  *

diff --git a/lazysodium-java b/lazysodium-java
+1 −1		build.gradle
+7 −6		src/main/java/com/goterl/lazycode/lazysodium/LazySodium.java
+4 −3		src/main/java/com/goterl/lazycode/lazysodium/Sodium.java
+18 −17		src/main/java/com/goterl/lazycode/lazysodium/interfaces/PwHash.java
+7 −0		src/main/java/com/goterl/lazycode/lazysodium/utils/BaseChecker.java
+3 −2		src/test/java/PwHashAndroidTest.java