#65 make padding pass a Pointer so we can return the length

Author: gurpreet-

src/main/java/com/goterl/lazycode/lazysodium/LazySodium.java

@@ -13,6 +13,7 @@
 import com.goterl.lazycode.lazysodium.utils.*;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
 
 import java.nio.charset.Charset;
@@ -175,13 +176,13 @@ public byte[] randomBytesDeterministic(int size, byte[] seed) {
     //// -------------------------------------------|
 
     @Override
-    public boolean sodiumPad(int paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen) {
-        return successful(getSodium().sodium_pad(paddedBuffLen, buf, unpaddedBufLen, blockSize, maxBufLen));
+    public boolean sodiumPad(IntByReference paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen) {
+        return successful(getSodium().sodium_pad(paddedBuffLen.getPointer(), buf, unpaddedBufLen, blockSize, maxBufLen));
     }
 
     @Override
-    public boolean sodiumUnpad(int unPaddedBuffLen, char[] buf, int paddedBufLen, int blockSize) {
-        return successful(getSodium().sodium_unpad(unPaddedBuffLen, buf, paddedBufLen, blockSize));
+    public boolean sodiumUnpad(IntByReference unPaddedBuffLen, char[] buf, int paddedBufLen, int blockSize) {
+        return successful(getSodium().sodium_unpad(unPaddedBuffLen.getPointer(), buf, paddedBufLen, blockSize));
     }
 
 

src/main/java/com/goterl/lazycode/lazysodium/Sodium.java

@@ -92,9 +92,9 @@ public native int sodium_base642bin(byte[] bin,
     //// PADDING
     //// -------------------------------------------|
 
-    public native int sodium_pad(int paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen);
+    public native int sodium_pad(Pointer paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen);
 
-    public native int sodium_unpad(int paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize);
+    public native int sodium_unpad(Pointer paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize);
 
 
 

src/main/java/com/goterl/lazycode/lazysodium/interfaces/Padding.java

@@ -9,6 +9,8 @@
 package com.goterl.lazycode.lazysodium.interfaces;
 
 
+import com.sun.jna.ptr.IntByReference;
+
 public interface Padding {
 
     interface Native {
@@ -25,19 +27,19 @@ interface Native {
          *                  to be.
          * @return False if the padded buffer length would exceed {@code maxBufLen}.
          */
-        boolean sodiumPad(int paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen);
+        boolean sodiumPad(IntByReference paddedBuffLen, char[] buf, int unpaddedBufLen, int blockSize, int maxBufLen);
 
         /**
          * Computes the original, unpadded length of a message previously padded using
-         * {@link #sodiumPad(int, char[], int, int, int)}. The original length is put into
+         * {@link #sodiumPad(IntByReference, char[], int, int, int)}. The original length is put into
          * {@code unpaddedBufLen}.
          * @param unpaddedBufLen This will be populated with the unpadded buffer length.
          * @param buf The buffer.
          * @param paddedBufLen The padded buffer size.
          * @param blockSize The block size.
          * @return True if the buffer was unpadded.
          */
-        boolean sodiumUnpad(int unpaddedBufLen, char[] buf, int paddedBufLen, int blockSize);
+        boolean sodiumUnpad(IntByReference unpaddedBufLen, char[] buf, int paddedBufLen, int blockSize);
     }
 
     interface Lazy {

src/test/java/com/goterl/lazycode/lazysodium/PaddingTest.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Terl Tech Ltd • 14/06/19 17:54 • goterl.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package com.goterl.lazycode.lazysodium;
+import com.sun.jna.ptr.IntByReference;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class PaddingTest extends BaseTest {
+
+
+    @Test
+    public void pad() {
+        IntByReference ref = new IntByReference(0);
+        char[] b = new char[4];
+
+        lazySodium.sodiumPad(ref, b, 4, 4, 10);
+        TestCase.assertEquals(8, ref.getValue());
+    }
+
+}