Merge pull request #186 from cconlon/release113

Prep for 1.13 Release
wolfSSL · Apr 9, 2024 · afd613b · afd613b
2 parents da8b026 + 5948162
commit afd613b
Show file tree

Hide file tree

Showing 7 changed files with 425 additions and 361 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ and more!
 ## User Manual
 
 The wolfSSL JNI/JSSE Manual is available on the wolfSSL website:
-[wolfSSL JNI Manual](https://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf).
+[wolfSSL JNI Manual](https://www.wolfssl.com/documentation/manuals/wolfssljni/).
 
 For additional build instructions and more detailed comments, please reference
 the manual.
@@ -186,7 +186,7 @@ an application can include this as a dependency in the application's
         <dependency>
             <groupId>com.wolfssl</groupId>
             <artifactId>wolfssl-jsse</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
+            <version>1.13.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     ...
@@ -303,9 +303,9 @@ wolfJSSE extends or implements the following JSSE classes:
 - 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.SSLSession / ExtendedSSLSession
+- javax.net.ssl.X509KeyManager / X509ExtendedKeyManager
+- javax.net.ssl.X509TrustManager / X509ExtendedTrustManager
 - javax.net.ssl.SSLServerSocket
 - javax.net.ssl.SSLServerSocketFactory
 - javax.net.ssl.SSLSocket
@@ -329,292 +329,7 @@ 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:
-
-**JNI and JSSE Changes:**
-* Add support for system properties: keyStore, keyStoreType, keyStorePassword (PR 74)
-* Add support for secure renegotiation if available in native wolfSSL (PR 75)
-* Fix compilation against newer wolfSSL versions that have dtls.c (PR 107)
-* Fixes and cleanup to SSLEngine implementation (PR 108)
-* Fixes for SSLEngine synchronization issues (PR 108)
-* Add non-standard X509TrustManager.checkServerTrusted() for use on Android (PR 109)
-* Add RPM packaging support (PR 110)
-* Fix SSLSocketFactory.createSocket() to allow for null host (PR 111)
-* Remove @Override on SSLEngine.getHandshakeSession() for older Java versions (PR 114)
-
-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.10.0 (8/11/2022)
-
-Release 1.10.0 has bug fixes and new features including:
-
-**JNI and JSSE Changes:**
-* Add SSLEngine.getApplicationProtocol(), fixes Undertow compatibility (PR 84)
-* Wrap wolfSSL\_UseALPN() at JNI level (PR 84)
-* Fix compile error for wolfSSL < 4.2.0 and wolfSSL\_set\_alpn\_protos() (PR 84)
-* Fix NullPointerException when no selected ALPN is available (PR 84)
-* Fix JNI build when wolfSSL compiled with --disable-filesystem (PR 104)
-* Fix SSLEngine compatibility with data larger than TLS record size (PR 105)
-* Refactor SSLEngine handshake status to be more inline with SunJSSE (PR 105)
-* Add verbose SSLEngine logging with "wolfsslengine.debug" property (PR 105)
-
-**Documentation Changes**
-* Fix missing Javadoc warnings in ALPN code
-
-**Example Changes:**
-* Update Android Studio IDE project to use Android 11 (SDK 30)
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-### wolfSSL JNI Release 1.9.0 (5/5/2022)
-
-Release 1.9.0 has bug fixes and new features including:
-
-**JNI and JSSE Changes:**
-* Add synchronization to class cleanup/free routines (PR 78)
-* Fix JNI native casting to use utintptr\_t instead of intptr\_t (PR 79)
-* Add support for newer Java versions (ex: Java 17) (PR 90)
-* Remove HC-128 support (PR 94). Native wolfSSL removed with
-[PR #4767](https://github.com/wolfSSL/wolfssl/pull/4767)
-* Remove RABBIT support (PR 96). Native wolfSSL removed with
-[PR #4774](https://github.com/wolfSSL/wolfssl/pull/4767)
-* Remove IDEA support (PR 97). Native wolfSSL removed in
-[PR #4806](https://github.com/wolfSSL/wolfssl/pull/4806).
-* Fix typecasting issues and cleanup for native argument checking (PR 98, 99)
-* Add Socket timeout support for native SSL\_connect/write() (PR 95)
-* SSLSocket.getSession() now tries to do TLS handshake if not completed (PR 76)
-* Fix shutdown/close\_notify alert handling in WolfSSLEngine (PR 83)
-* Fix WolfSSLSocket to test if close() called before object init (PR 88)
-* Add support for loading default system CA certs on Java 9+ (PR 89)
-* Fix timeout behavior with WolfSSLSession.connect() (PR 100)
-
-**Example Changes:**
-* Print wolfJSSE provider info in JSSE ProviderTest (PR 77)
-* Add option to ClientJSSE to do one session resumption (PR 80)
-* Update example certificates and keys (PR 81)
-
-**Documentation Changes:**
-* Add missing Javadocs, fix warnings on newer Java versions (PR 92)
-
-**Testing Changes:**
-* Update junit dependency to 4.13.2 (PR 91)
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-### wolfSSL JNI Release 1.8.0 (11/12/2021)
-
-Release 1.8.0 has bug fixes and new features including:
-
-* wolfCrypt FIPS 140-3 and FIPS Ready compatibility
-* Add Socket method wrappers, fixes behavior when inner Socket used with JSSE
-* Add wrappers to get FIPS verifyCore hash (FIPS error cb or directly)
-* Fix potential NullPointerException with several clone() methods
-* Refactor of SSLSessionContext implementation
-* Fix behavior of WolfSSLSocket.getSoTimeout() when external Socket is wrapped
-* Fix timeout used in socketSelect to correctly handle fractional sec timeouts
-* Fix memory leak when custom X509TrustManager is used with wolfJSSE
-* Add support for multiple X509TrustManager objects across multiple sessions
-* Call WolfSSL.cleanup() in finalizer to release library resources earlier
-* Release native WOLFSSL memory sooner, when WolfSSLSocket is closed
-* Better management and freeing of native WolfSSLCertificate memory
-* Release native logging callback when library is freed
-* Release native wolfCrypt FIPS callback when library is freed
-* Release CTX-level Java verify callback when CTX is freed
-* Release CTX-level Java CRL callback when CTX is freed
-* Better global reference cleanup in error conditions
-* Fix unused variable warnings in non-FIPS builds
-* Use one static WolfSSL object across all WolfSSLProvider objects
-* Release local JNI array inside WolfSSLSession.read() on function exit
-* Add multi-threaded JSSE provider client and server examples
-* Update Android AOSP install script to create missing blank files if needed
-* Update Android AOSP build fies to define `SIZEOF_LONG` and `SIZEOF_LONG_LONG`
-* Update IDE/Android example Android Studio project
-* Fix default cipher suite list order used in JSSE WolfSSLContext objects
-* Fix FIPS Ready compatibility with `WC_RNG_SEED_CB`
-* Update Android AOSP Android.mk to compile wolfCrypt kdf.c
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-### wolfSSL JNI Release 1.7.0 (01/15/2021)
-
-Release 1.7.0 has bug fixes and new features including:
-
-* Fixes for Infer analysis warnings
-* Throw exception in DEFAULT\_Context creation if engineInit() fails
-* Defer creating DEFAULT WolfSSLContext until first use
-* Check if Socket is open before doing TLS shutdown in WolfSSLSocket.close()
-* Only load X509TrustStore issuers when needed by native wolfSSL verification
-* Fix compiler warnings when used with older versions of native wolfSSL
-* Verify and load intermediate CA certs in WolfSSLTrustX509.certManagerVerify()
-* Add support for setSoTimeout() in WolfSSLSocket
-* Fix suites length check in WolfSSLEngineHelper.setLocalCiphers()
-* Check for connection closed before completing handshake in SSLSocket.read/write
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.6.0 (08/26/2020)
-
-Release 1.6.0 has bug fixes and new features including:
-
-* Support for custom TrustManager checkClientTrusted(), checkServerTrusted()
-* wolfJSSE TrustManager registered as PKIX provider
-* Improved support for auto-loading system CA certificates
-* Improved Android TrustManager support
-* Use AndroidCAStore KeyStore when available on Android
-* Support for X509Certificate.getSubjectAlternativeNames()
-* Fix for native memory leak in JSSE WolfSSLTrustX509
-* Optimization of WolfSSLTrustX509 to hold less memory at idle
-* Addition of missing finalize() methods in some JSSE classes
-* Casts to uintptr\_t instead of intptr\_t at native JNI level
-* Conversion to use GetByteArrayElements for potential memory use savings
-* Consistently use wolfCrypt XMALLOC/XFREE for native memory allocation
-* Use javah in build.xml for older ant/Java versions without nativeheaderdir
-* Add JSSE debug logging for native wolfSSL with wolfssl.debug system parameter
-* Add more JSSE-level debug messages for easier troubleshooting
-* Add internal implementation of SSLParameters, WolfSSLParameters
-* Add client-side SNI support
-* Fix warnings when DH is disabled (--disable-dh)
-* Add Java thread ID to JSSE debug log messages for easier multithreaded debug
-* Improve handshake synchronization in WolfSSLSocket for multi-threaded apps
-* Add support for jsse.enableSNIExtension system property
-* Add client-side session ticket support
-* Add support for jdk.tls.client.enableSessionTicketExtension system property
-* Enable session ticket and session cert support by default on Android AOSP
-* Fixes compatibility with OkHttp on Android
-* Add support for non-blocking socket operations in WolfSSLSession/Socket
-* Moves I/O mutex locking to native level for more efficient locking
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.5.0 (01/17/2020)
-
-Release 1.5.0 has bug fixes and new features including:
-
-* New JSSE provider (wolfJSSE) including TLS 1.3 support!
-* Add JSSE debug logging with wolfjsse.debug system parameter
-* Add JSSE install script and helper files for Android AOSP
-* Add JSSE example apps (examples/provider)
-* Add JNI wrappers to detect if native features/protocols are compiled in
-* Add JNI wrapper for PKCS#8 offset getter
-* Add JNI wrapper for wolfSSL\_get\_ciphers\_iana()
-* Update build.xml to use nativeheaderdir instead of javah target
-* Update tests to use junit-4.13 / hamcrest-all-1.3
-* Update to build, now ant build does not build and run tests / examples
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.4.0 (11/16/2018)
-
-Release 1.4.0 has bug fixes and new features including:
-
-* Better support for conditional native wolfSSL feature dependencies
-* Adds methods for checking if native features are enabled
-* Optional method for loading native JNI library from a specific path
-* TLS 1.0 functions are compiled out unless WOLFSSL\_ALLOW\_TLSV10 is defined
-* Wrapper for native wolfCrypt ECC shared secret public key callback
-* Allow other HmacSHA hash types to be used in Atomic User callback examples
-* Error string buffer size set to use WOLFSSL\_MAX\_ERROR\_SZ
-* Fix for RSA doSign() output length
-* Fix for I/O, Atomic User, and Public Key callback registration in examples
-* Updated example key and certificate files
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.3.0 (12/04/2015)
-
-Release 1.3.0 has bug fixes and new features including:
-
-* Updated support to wolfSSL 3.7.0
-* Added finalizers for WolfSSLContext and WolfSSLSession classes
-* Fix for SSLv3 now disabled by default in wolfSSL proper
-* SSLv3 now marked as @Deprecated
-* PSK (pre-shared key) support for client and server
-* Better error checking and exception handling
-* New WolfSSLJNIException class
-* WolfSSLSession now cached in native WOLFSSL struct for callbacks
-* Easier inclusion of junit4 in build.xml
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.2.0 (06/02/2015)
-
-Release 1.2.0 has bug fixes and new features including:
-
-* Updated support for wolfSSL 3.4.6 and CyaSSL to wolfSSL name change
-* Benchmark functionality in example client
-* Updated example certificates
-* Better detection of Java home on Mac and Linux
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.1.0 (10/25/2013)
-
-Release 1.1.0 has bug fixes and new features including:
-
-* Updated support for CyaSSL 2.9.4
-* Updated example certificates and CRLs
-* Now expects user to have JUnit JARs pre-installed on dev platform
-* Updated unit tests, JUnit4 style
-* Android support
-* CRL monitor now optional in server mode
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
-
-
-### wolfSSL JNI Release 1.0.0 (10/25/2013)
-
-Release 1.0.0 is the first public release of wolfSSL JNI, the Java wrapper for
-the CyaSSL embedded SSL library.
-
-The wolfSSL JNI Manual is available at:
-http://www.wolfssl.com/documentation/wolfSSL-JNI-Manual.pdf. For build
-instructions and more detailed comments, please check the manual.
+Release notes can be found in [ChangeLog.md](./ChangeLog.md).
 
 ## Support
 

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.12" />
+    <property name="implementation.version" value="1.13" />
 
     <!-- set properties for this build -->
     <property name="src.dir" value="src/java/"/>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.wolfssl</groupId>
 	<artifactId>wolfssl-jsse</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>wolfssl-jsse</name>
     <url>https://www.wolfssl.com</url>

diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java b/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java
@@ -71,8 +71,8 @@ public void errorCallback(int ok, int err, String hash) {
      * wolfSSL JSSE Provider class
      */
     public WolfSSLProvider() {
-        super("wolfJSSE", 1.12, "wolfSSL JSSE Provider");
-        //super("wolfJSSE", "1.12", "wolfSSL JSSE Provider");
+        super("wolfJSSE", 1.13, "wolfSSL JSSE Provider");
+        //super("wolfJSSE", "1.13", "wolfSSL JSSE Provider");
 
         /* load native wolfSSLJNI library */
         WolfSSL.loadLibrary();