Merge pull request #120 from cconlon/0323

Prep for 1.12 Release
wolfSSL · Mar 30, 2023 · 67b9b5a · 67b9b5a
2 parents 12a9ce5 + 21ea49b
commit 67b9b5a
Show file tree

Hide file tree

Showing 125 changed files with 301 additions and 253 deletions.
diff --git a/IDE/Android/app/src/main/java/com/example/wolfssl/MainActivity.java b/IDE/Android/app/src/main/java/com/example/wolfssl/MainActivity.java
@@ -1,6 +1,6 @@
 /* MainActivity.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 

diff --git a/README.md b/README.md
@@ -34,9 +34,9 @@ the manual.
 ## Building
 
 ***Note 1)***
-The java.sh script uses a common location for the Java install location. If
+The `java.sh` script uses a common location for the Java install location. If
 your Java install location is different, this could lead to an error when
-running java.sh. In this case, you should modify java.sh to match your
+running `java.sh`. In this case, you should modify `java.sh` to match your
 environment.
 
 Build targets for ant are :
@@ -46,7 +46,11 @@ Build targets for ant are :
 * **ant clean**     (cleans all Java artifacts)
 * **ant cleanjni**  (cleans native artifacts)
 
-wolfJSSE currently supports compilation on Linux/Unix, OSX, and Android.
+wolfJSSE currently supports compilation on the following platforms:
+- Linux/Unix
+- Mac OSX
+- Android Studio
+- Android AOSP
 
 To build wolfJSSE in Linux/Unix environments, first download, compile, and
 install wolfSSL. wolfSSL can be downloaded from the wolfSSL
@@ -114,6 +118,13 @@ More verbose SSLEngine debug logs can be enabled by using the
 
 JDK debug logging can be enabled using the `-Djavax.net.debug=all` option.
 
+These system properties can also be set programmatically at runtime:
+
+```
+System.setProperty("wolfjsse.debug", "true");
+System.setProperty("wolfsslengine.debug", "true);
+```
+
 ## Building for Android
 
 wolfSSL JNI and JSSE can be built and used on the Android platform, either
@@ -167,6 +178,27 @@ Additional instructions can be found on the wolfSSL.com website:
 
 ## Behavior and Functionality Notes
 
+### JSSE Class Implementation Support
+
+wolfJSSE extends or implements the following JSSE classes:
+- javax.net.ssl.SSLContextSpi
+    - SSL, TLS, DEFAULT, TLSv1, TLSv1.1, TLSv1.2, TLSv1.3
+- javax.net.ssl.KeyManagerFactorySpi
+    - PKIX, X509, SunX509
+- javax.net.ssl.TrustManagerFactorySpi
+    - PKIX, X509, SunX509
+- javax.net.ssl.SSLEngine
+- javax.net.ssl.SSLSession
+- javax.net.ssl.X509KeyManager
+- javax.net.ssl.X509TrustManager
+- javax.net.ssl.SSLServerSocket
+- javax.net.ssl.SSLServerSocketFactory
+- javax.net.ssl.SSLSocket
+- javax.net.ssl.SSLSocketFactory
+- javax.net.ssl.SSLSessionContext
+- java.security.cert.X509Certificate
+- javax.security.cert.X509Certificate
+
 ### Secure Renegotiation Support
 
 wolfSSL JNI and JSSE provider wrap native wolfSSL APIs to enable and conduct
@@ -182,6 +214,22 @@ Or by defining `-DHAVE_SECURE_RENEGOTIATION`.
 
 ## Release Notes
 
+### wolfSSL JNI Release 1.12.0 (03/31/2023)
+
+Release 1.12.0 has bug fixes and new features including:
+
+**JNI and JSSE Changes:**
+* Additional synchronization support in WolfSSLCertificate (PR 118)
+* Prevent WolfSSLCertificate from freeing `WOLFSSL_X509` if not owned (PR 118)
+* Fix `X509KeyManager.getCertificateChain()` to return `null` when alias is `null` (PR 119)
+
+**Documentation Changes:**
+* Add Android Studio instructions for how to update source symlinks on Windows (PR 117)
+
+The wolfSSL JNI Manual is available at:
+https://www.wolfssl.com/documentation/manuals/wolfssljni. For build
+instructions and more detailed comments, please check the manual.
+
 ### wolfSSL JNI Release 1.11.0 (12/2/2022)
 
 Release 1.11.0 has bug fixes and new features including:

diff --git a/build.xml b/build.xml
@@ -14,7 +14,7 @@
     <!-- versioning/manifest properties -->
     <property name="implementation.vendor"  value="wolfSSL Inc." />
     <property name="implementation.title"   value="wolfSSL JNI/JSSE" />
-    <property name="implementation.version" value="1.11" />
+    <property name="implementation.version" value="1.12" />
 
     <!-- set properties for this build -->
     <property name="src.dir" value="src/java/"/>

diff --git a/examples/Client.java b/examples/Client.java
@@ -1,6 +1,6 @@
 /* Client.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyAtomicDecCtx.java b/examples/MyAtomicDecCtx.java
@@ -1,6 +1,6 @@
 /* MyAtomicDecCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyAtomicEncCtx.java b/examples/MyAtomicEncCtx.java
@@ -1,6 +1,6 @@
 /* MyAtomicEncContext.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyDecryptVerifyCallback.java b/examples/MyDecryptVerifyCallback.java
@@ -1,6 +1,6 @@
 /* MyDecryptVerifyCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccSharedSecretCallback.java b/examples/MyEccSharedSecretCallback.java
@@ -1,6 +1,6 @@
 /* MyEccSharedSecretCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccSharedSecretCtx.java b/examples/MyEccSharedSecretCtx.java
@@ -1,6 +1,6 @@
 /* MyEccSharedSecretCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccSignCallback.java b/examples/MyEccSignCallback.java
@@ -1,6 +1,6 @@
 /* MyEccSignCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccSignCtx.java b/examples/MyEccSignCtx.java
@@ -1,6 +1,6 @@
 /* MyEccSignCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccVerifyCallback.java b/examples/MyEccVerifyCallback.java
@@ -1,6 +1,6 @@
 /* MyEccVerifyCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyEccVerifyCtx.java b/examples/MyEccVerifyCtx.java
@@ -1,6 +1,6 @@
 /* MyEccVerifyCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyGenCookieCallback.java b/examples/MyGenCookieCallback.java
@@ -1,6 +1,6 @@
 /* MyGenCookieCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyGenCookieCtx.java b/examples/MyGenCookieCtx.java
@@ -1,6 +1,6 @@
 /* MyGenCookieCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyIOCtx.java b/examples/MyIOCtx.java
@@ -1,6 +1,6 @@
 /* MyIOCtx.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyLoggingCallback.java b/examples/MyLoggingCallback.java
@@ -1,6 +1,6 @@
 /* MyLoggingCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyMacEncryptCallback.java b/examples/MyMacEncryptCallback.java
@@ -1,6 +1,6 @@
 /* MyMacEncryptCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import java.io.*;

diff --git a/examples/MyMissingCRLCallback.java b/examples/MyMissingCRLCallback.java
@@ -1,6 +1,6 @@
 /* MyMissingCRLCallback.java
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
 import com.wolfssl.*;