Fixes for native callback length checks, callback ByteBuffer docs, and dist packaging cleanup

Makefile

@@ -164,6 +164,8 @@ dist:
 		exit 1 ; }
 	@mkdir -p "$(NAME)-$(VERSION)"
 	@cp -pr $(DIST_FILES) "$(NAME)-$(VERSION)"
+	@rm -f "$(NAME)-$(VERSION)"/$(NATIVE_SRC_DIR)/*.o \
+		"$(NAME)-$(VERSION)"/$(NATIVE_SRC_DIR)/*.d
 	tar -zcf "$(NAME)-$(VERSION).tar.gz" "$(NAME)-$(VERSION)"
 	@rm -rf "$(NAME)-$(VERSION)"
 

native/com_wolfssl_WolfSSLContext.c

@@ -3223,7 +3223,12 @@ int  NativeDecryptVerifyCb(WOLFSSL* ssl, unsigned char* decOut,
             }
             return -1;
         }
-        *padSz = (unsigned int)tmpVal;
+        /* Reject negative and too large padSz values */
+        if ((tmpVal < 0) || (tmpVal > (jlong)decSz)) {
+            retval = -1;
+        } else {
+            *padSz = (unsigned int)tmpVal;
+        }
     }
 
     /* delete local refs, detach JNIEnv from thread */
@@ -3533,7 +3538,12 @@ int NativeVerifyDecryptCb(WOLFSSL* ssl, unsigned char* decOut,
             }
             return -1;
         }
-        *padSz = (unsigned int)tmpVal;
+        /* Reject negative and too large padSz values */
+        if ((tmpVal < 0) || (tmpVal > (jlong)decSz)) {
+            retval = -1;
+        } else {
+            *padSz = (unsigned int)tmpVal;
+        }
     }
 
     /* delete local refs, detach JNIEnv from thread */
@@ -5537,6 +5547,11 @@ int  NativeRsaVerifyCb(WOLFSSL* ssl, unsigned char* sig, unsigned int sigSz,
         return -1;
     }
 
+    if ((retval > 0) && ((unsigned int)retval > sigSz)) {
+        /* wolfSSL uses positive return as the output length */
+        retval = -1;
+    }
+
     /* point out* to the beginning of our decrypted buffer */
     if (retval > 0)
         *out = sig;
@@ -5833,6 +5848,11 @@ int NativeRsaSignCheckCb(WOLFSSL* ssl, unsigned char* sig, unsigned int sigSz,
         return -1;
     }
 
+    if ((retval > 0) && ((unsigned int)retval > sigSz)) {
+        /* wolfSSL uses positive return as the output length */
+        retval = -1;
+    }
+
     /* point out* to the beginning of decrypted buffer */
     if (retval > 0) {
         *out = sig;
@@ -6070,6 +6090,11 @@ int NativeRsaPssSignCheckCb(WOLFSSL* ssl, unsigned char* sig,
         return -1;
     }
 
+    if ((retval > 0) && ((unsigned int)retval > sigSz)) {
+        /* wolfSSL uses positive return as the output length */
+        retval = -1;
+    }
+
     /* point out* to the beginning of decrypted buffer */
     if (retval > 0) {
         *out = sig;
@@ -6648,6 +6673,11 @@ int  NativeRsaDecCb(WOLFSSL* ssl, unsigned char* in, unsigned int inSz,
         retval = -1;
     }
 
+    if ((retval > 0) && ((unsigned int)retval > inSz)) {
+        /* wolfSSL uses positive return as the output length */
+        retval = -1;
+    }
+
     /* point out* to the beginning of our decrypted buffer */
     if (retval > 0)
         *out = in;

native/com_wolfssl_WolfSSLSession.c

@@ -7066,7 +7066,7 @@ int NativeSSLIORecvCb(WOLFSSL *ssl, char *buf, int sz, void *ctx)
             return WOLFSSL_CBIO_ERR_GENERAL;
         }
 
-        /* call Java send callback, ignore ctx since Java handles it */
+        /* call Java receive callback, ignore ctx since Java handles it */
         retval = (*jenv)->CallIntMethod(jenv, (jobject)(*g_cachedSSLObj),
             g_sslIORecvMethodId, (jobject)(*g_cachedSSLObj), inData, (jint)sz);
 

src/java/com/wolfssl/WolfSSLByteBufferIORecvCallback.java

@@ -50,6 +50,10 @@ public interface WolfSSLByteBufferIORecvCallback {
      * be read from the transport layer. The callback should read data and
      * place the data into the buffer provided. The number of bytes read should
      * be returned. The callback should return an error code on error.
+     * <p>
+     * The <b>buf</b> ByteBuffer wraps native memory that is only valid
+     * until this method returns. Do not use it, or any duplicate or
+     * slice of it, after returning.
      *
      * @param ssl   the current SSL session object from which the callback was
      *              initiated.

src/java/com/wolfssl/WolfSSLByteBufferIOSendCallback.java

@@ -51,6 +51,10 @@ public interface WolfSSLByteBufferIOSendCallback {
      * The callback should send data from the provided ByteBuffer (buf) across
      * the transport layer. The number of bytes sent should be returned, or
      * a negative error code on error.
+     * <p>
+     * The <b>buf</b> ByteBuffer wraps native memory that is only valid
+     * until this method returns. Do not use it, or any duplicate or
+     * slice of it, after returning.
      *
      * @param ssl   the current SSL session object from which the callback was
      *              initiated.

src/java/com/wolfssl/WolfSSLDecryptVerifyCallback.java

@@ -42,6 +42,10 @@ public interface WolfSSLDecryptVerifyCallback {
      * Atomic record layer decrypt/verify callback method.
      * This method acts as the decrypt/verify callback to be used with
      * the wolfSSL atomic record layer processing.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLEccSharedSecretCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLEccSharedSecretCallback {
     /**
      * ECC shared secret callback method.
      * This method acts as ECC shared secret callback.
+     * <p>
+     * The <b>out</b> buffer, and <b>pubKeyDer</b> on the client side, wrap
+     * native memory that is only valid until this method returns. Do not
+     * use them, or any duplicate or slice of them, after returning.
      *
      * @param ssl         the current SSL session object from which the
      *                    callback was initiated.

src/java/com/wolfssl/WolfSSLEccSignCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLEccSignCallback {
     /**
      * ECC signing callback method.
      * This method acts as ECC signing callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLEccVerifyCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLEccVerifyCallback {
     /**
      * ECC verification callback method.
      * This method acts as ECC verification callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLMacEncryptCallback.java

@@ -42,6 +42,10 @@ public interface WolfSSLMacEncryptCallback {
      * Atomic record layer MAC Encrypt callback method.
      * This method acts as the Atomic User Record Processing Mac/Encrypt
      * callback to be used with the wolfSSL atomic record layer processing.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl           the current SSL session object from which the
      *                      callback was initiated.

src/java/com/wolfssl/WolfSSLRsaDecCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaDecCallback {
     /**
      * RSA private decrypt callback method.
      * This method acts as RSA private decrypt callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLRsaEncCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaEncCallback {
     /**
      * RSA public encrypt callback method.
      * This method acts as RSA public enrypt callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLRsaPssSignCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaPssSignCallback {
     /**
      * RSA-PSS signing callback method.
      * This method acts as RSA-PSS signing callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl    the current SSL session object from which the callback was
      *               initiated.

src/java/com/wolfssl/WolfSSLRsaPssVerifyCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaPssVerifyCallback {
     /**
      * RSA-PSS verification callback method.
      * This method acts as RSA-PSS verification callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl    the current SSL session object from which the callback
      *               was initiated.

src/java/com/wolfssl/WolfSSLRsaSignCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaSignCallback {
     /**
      * RSA signing callback method.
      * This method acts as RSA signing callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLRsaVerifyCallback.java

@@ -40,6 +40,10 @@ public interface WolfSSLRsaVerifyCallback {
     /**
      * RSA verification callback method.
      * This method acts as RSA verification callback.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.

src/java/com/wolfssl/WolfSSLVerifyDecryptCallback.java

@@ -43,6 +43,10 @@ public interface WolfSSLVerifyDecryptCallback {
      * Atomic record layer verify/decrypt callback method.
      * This method acts as the verify/decrypt callback to be used with
      * the wolfSSL atomic record layer processing.
+     * <p>
+     * ByteBuffer arguments wrap native memory that is only valid until
+     * this method returns. Do not use them, or any duplicate or slice of
+     * them, after returning.
      *
      * @param ssl       the current SSL session object from which the
      *                  callback was initiated.