Skip to content

Commit 5e56b00

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #251 from cconlon/1.15release
Prep for 1.15 Release
2 parents d56fa67 + cc6d150 commit 5e56b00

13 files changed

Lines changed: 310 additions & 165 deletions

File tree

‎ChangeLog.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
### wolfSSL JNI Release 1.15.0 (01/24/2025)
2+
3+
Release 1.15.0 has bug fixes and new features including:
4+
5+
**JSSE System/Security Property Support:**
6+
* Addition of JNI-level debug system property (`wolfssljni.debug=true`) (PR 235)
7+
8+
**JSSE Changes:**
9+
* Fix to close Socket when SSLSocket startHandshake() fails (PR 234)
10+
* Fixes for potential NullPointerException in SSLSocket Input/OutputStream (PR 233)
11+
* Add ability for `SSLSession.getRequestedServerNames()` to return SNI request on server side (PR 240)
12+
* Add check for legacy DHE keys, for cipher suites using keys less than 1024 bits (PR 243)
13+
* Optimize `byte[]` creation in `SSLEngine` when receiving app data (PR 244, 250)
14+
* Add ability for `SSLSocket.close()` to interrupt `read()/write()` operations waiting in `select()/poll()` (PR 246)
15+
16+
**JNI Changes:**
17+
* Always call `wolfSSL_get1_session()` inside `WolfSSLSession.getSession()` (PR 236)
18+
* Call `wc_RunAllCast_fips()` with wolfCrypt FIPS builds if available (PR 247)
19+
* Add ability to pass `CFLAGS` to `java.sh` (ie: `CFLAGS="-DTEST_DEFINE" ./java.sh`) (PR 248)
20+
* Remove incorrect `ATOMIC_USER` preprocessor gate around native `wolfSSL_GetSide()` (PR 246)
21+
22+
**Example Changes:**
23+
* Updated Android Studio example project, define `WOLFSSL_CERT_REQ` (PR 234)
24+
* Update Android Studio CMakeLists.txt with `WOLFSSL_CUSTOM_CONFIG` definition (PR 239)
25+
26+
**Testing Changes:**
27+
* Add GitHub Actions PRB test for Maven (Linux, macOS) builds (PR 232)
28+
* Add tests of `SSLSession` state at various points throughout the handshake (PR 233)
29+
* Add GitHub Actions PRB test for `--enable-jni CFLAGS="-DNO_SESSION_CACHE_REF"` build (PR 236)
30+
* Add GitHub Actions PRB test for `-DWOLFJNI_USE_IO_SELECT` (PR 246)
31+
32+
The wolfSSL JNI Manual is available at:
33+
https://www.wolfssl.com/documentation/manuals/wolfssljni. For build
34+
instructions and more detailed comments, please check the manual.
35+
136
### wolfSSL JNI Release 1.14.0 (11/7/2024)
237

338
Release 1.14.0 has bug fixes and new features including:

‎IDE/Android/.idea/misc.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IDE/Android/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ $ mv wolfssl-X.X.X wolfssljni/IDE/Android/app/src/main/cpp/wolfssl
4040
```
4141
$ cd /IDE/Android/app/src/main/cpp/
4242
$ git clone https://github.com/wolfssl/wolfssl
43+
$ cd wolfssl
44+
$ ./autogen.sh
4345
$ cp wolfssl/options.h.in wolfssl/options.h
4446
```
4547

‎IDE/Android/app/src/main/cpp/CMakeLists.txt‎

Lines changed: 74 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -125,44 +125,64 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
125125
endif()
126126

127127
# Add preprocessor defines to CFLAGS, these match those placed into
128-
# wolfssl/options.h by configure if using: "./configure" on a Unix/Linux
129-
# platform. The options below have been chosen to match a FIPS Ready build,
130-
# and are based on the example user_settings.h file located here:
131-
# https://github.com/wolfSSL/wolfssl/blob/master/examples/configs/user_settings_fipsv5.h
128+
# wolfssl/options.h by configure if using the following configure on a Unix/Linux
129+
# platform with a wolfSSL FIPS Ready GPLv3 bundle:
130+
#
131+
# ./configure --enable-fips=ready --enable-jni
132+
#
132133
# This list may be configurable depending on use case and desired
133134
# optimizations, being careful not to break FIPS compatibility if targeting
134-
# FIPS proper in the future.
135-
add_definitions(-DHAVE_FIPS -DHAVE_FIPS_VERSION=5 -DHAVE_FIPS_VERSION_MINOR=3
136-
-DHAVE_HASHDRBG -DHAVE_THREAD_LS -DHAVE_REPRODUCIBLE_BUILD
137-
-DFP_MAX_BITS=16384 -DSP_INT_BITS=8192 -DWOLFSSL_PUBLIC_MP
138-
-DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING
139-
-DWC_RNG_SEED_CB -DWOLFSSL_VALIDATE_ECC_IMPORT -DWOLFSSL_VALIDATE_ECC_KEYGEN
140-
-DWOLFSSL_VALIDATE_FFC_IMPORT
141-
-DWOLFSSL_TLS13 -DHAVE_TLS_EXTENSIONS -DHAVE_ENCRYPT_THEN_MAC
142-
-DHAVE_SUPPORTED_CURVES -DHAVE_EXTENDED_MASTER -DHAVE_ONE_TIME_AUTH
143-
-DHAVE_SECURE_RENEGOTIATION -DHAVE_SERVER_RENEGOTIATION_INFO -DHAVE_SESSION_TICKET
144-
-DWOLFSSL_USE_ALIGN -DWOLFSSL_BASE64_ENCODE -DHAVE_CRL
145-
-DHAVE_EXT_CACHE -DWOLFSSL_VERIFY_CB_ALL_CERTS -DWOLFSSL_ALWAYS_VERIFY_CB
146-
-DWOLFSSL_DH_EXTRA -DWOLFSSL_WOLFSSH -DOPENSSL_EXTRA -DOPENSSL_ALL
147-
-DHAVE_FFDHE_Q -DHAVE_FFDHE_2048 -DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096
148-
-DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DHAVE_DH_DEFAULT_PARAMS -DHAVE_PUBLIC_FFDHE
149-
-DHAVE_ECC -DTFM_ECC256 -DECC_SHAMIR -DHAVE_ECC_CDH -DECC_USER_CURVES
150-
-DHAVE_ECC256 -DHAVE_ECC384 -DHAVE_ECC521 -DWOLFSSL_ECDSA_SET_K
151-
-DWC_RSA_PSS -DWOLFSSL_KEY_GEN -DWC_RSA_NO_PADDING
152-
-DWOLFSSL_AES_COUNTER -DHAVE_AESCCM -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT
153-
-DWOLFSSL_AES_OFB -DHAVE_AESGCM -DGCM_TABLE_4BIT -DWOLFSSL_CMAC
154-
-DWOLFSSL_SHA224 -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 -DWOLFSSL_NO_SHAKE256
155-
-DWOLFSSL_NOSHA512_224 -DWOLFSSL_NOSHA512_256 -DWOLFSSL_SHA3 -DHAVE_HKDF
156-
-DNO_OLD_TLS -DNO_PSK -DNO_DO178
157-
-DNO_RC4 -DNO_MD4 -DNO_MD5 -DNO_DES3 -DNO_DSA -DNO_RABBIT
158-
159-
-DWOLFSSL_JNI -DHAVE_EX_DATA -DHAVE_OCSP -DHAVE_CRL_MONITOR
160-
-DWOLFSSL_CERT_EXT -DWOLFSSL_CERT_GEN -DWOLFSSL_CERT_REQ
161-
-DHAVE_SNI -DHAVE_ALPN -DWOLFSSL_ENCRYPTED_KEYS -DNO_ERROR_QUEUE
162-
-DWOLFSSL_EITHER_SIDE -DWOLFSSL_PSS_LONG_SALT
163-
-DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_ERROR_CODE_OPENSSL
164-
-DWOLFSSL_EXTRA_ALERTS -DWOLFSSL_FORCE_CACHE_ON_TICKET
165-
-DWOLFSSL_AKID_NAME -DHAVE_CTS -DKEEP_PEER_CERT -DSESSION_CERTS
135+
# FIPS proper in the future. Please contact support@wolfssl.com for assistance
136+
# properly compiling for use with wolfCrypt FIPS variants.
137+
add_definitions(
138+
-DWOLFSSL_FIPS_READY -DHAVE_FIPS -DHAVE_FIPS_VERSION=7
139+
-DHAVE_FIPS_VERSION_MAJOR=7 -DHAVE_FIPS_VERSION_MINOR=0
140+
-DHAVE_FIPS_VERSION_PATCH=0 -DWC_RNG_SEED_CB -DHAVE_THREAD_LS
141+
142+
-DWOLFSSL_WOLFSSH -DNO_DO178 -DHAVE_REPRODUCIBLE_BUILD -DWC_NO_ASYNC_THREADING
143+
-DNO_OLD_TLS -DWOLFSSL_TLS13 -DHAVE_TLS_EXTENSIONS -DHAVE_SNI
144+
-DHAVE_KEYING_MATERIAL -DHAVE_TLS_EXTENSIONS -DHAVE_SUPPORTED_CURVES
145+
-DHAVE_EXTENDED_MASTER -DHAVE_ENCRYPT_THEN_MAC -DWOLFSSL_JNI -DHAVE_EX_DATA
146+
-DKEEP_PEER_CERT -DWOLFSSL_ALWAYS_VERIFY_CB -DWOLFSSL_DTLS -DOPENSSL_EXTRA
147+
-DOPENSSL_ALL -DWOLFSSL_ERROR_CODE_OPENSSL -DHAVE_CRL -DHAVE_CRL_MONITOR
148+
-DHAVE_OCSP -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER
149+
-DWOLFSSL_CERT_EXT -DWOLFSSL_CERT_GEN -DWOLFSSL_CERT_REQ -DWOLFSSL_KEY_GEN
150+
-DHAVE_ALPN -DWOLFSSL_ALT_CERT_CHAINS -DSESSION_CERTS -DWOLFSSL_ENCRYPTED_KEYS
151+
-DWOLFSSL_SYS_CA_CERTS -DWOLFSSL_ALT_NAMES -DWOLFSSL_EITHER_SIDE
152+
-DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_CERT_NAME_ALL
153+
-DHAVE_SERVER_RENEGOTIATION_INFO -DWOLFSSL_ASN_TEMPLATE -DWOLFSSL_ASN_PRINT
154+
-DWOLFSSL_BASE64_ENCODE -DERROR_QUEUE_PER_THREAD -DNO_ERROR_QUEUE
155+
-DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWOLFSSL_USE_ALIGN
156+
-DWOLFSSL_PUBLIC_MP
157+
158+
-DWC_RSA_BLINDING -DWC_RSA_PSS -DWOLFSSL_PSS_LONG_SALT -DWC_RSA_NO_PADDING
159+
160+
-DHAVE_ECC -DTFM_ECC256 -DECC_SHAMIR -DECC_MIN_KEY_SZ=192 -DHAVE_ECC_CDH
161+
-DECC_USER_CURVES -DHAVE_ECC192 -DHAVE_ECC224 -DHAVE_ECC256 -DHAVE_ECC384
162+
-DHAVE_ECC521 -DWOLFSSL_ECDSA_SET_K -DWOLFSSL_VALIDATE_ECC_IMPORT
163+
-DWOLFSSL_VALIDATE_ECC_KEYGEN
164+
165+
-DWOLFSSL_VALIDATE_FFC_IMPORT -DHAVE_FFDHE_Q -DHAVE_FFDHE_2048
166+
-DHAVE_FFDHE_3072 -DHAVE_FFDHE_4096 -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192
167+
-DHAVE_DH_DEFAULT_PARAMS
168+
169+
-DHAVE_HKDF -DHAVE_PBKDF2 -DHAVE_HASHDRBG -DWC_SRTP_KDF -DWOLFSSL_SRTP
170+
171+
-DHAVE_AESGCM -DGCM_TABLE_4BIT -DWOLFSSL_AESGCM_STREAM -DHAVE_AESCCM
172+
-DWOLFSSL_AES_COUNTER -DWOLFSSL_CMAC -DWOLFSSL_AES_OFB -DWOLFSSL_AES_CFB
173+
-DWOLFSSL_AES_XTS -DWOLFSSL_AESXTS_STREAM -DWOLFSSL_AES_DIRECT
174+
-DHAVE_AES_ECB -DHAVE_AES_KEYWRAP -DWOLFSSL_AES_XTS -DHAVE_AES_KEYWRAP
175+
176+
-DHAVE_ED25519 -DHAVE_ED25519_KEY_IMPORT -DHAVE_ED448 -DHAVE_ED448_KEY_IMPORT
177+
-DWOLFSSL_ED448_STREAMING_VERIFY
178+
179+
-DHAVE_CURVE25519 -DHAVE_CURVE448
180+
181+
-DWOLFSSL_SHA224 -DWOLFSSL_SHA384 -DWOLFSSL_SHA512 -DWOLFSSL_NOSHA512_224
182+
-DWOLFSSL_NOSHA512_256 -DWOLFSSL_SHA3 -DWOLFSSL_SHAKE128 -DWOLFSSL_SHAKE256
183+
184+
-DNO_DSA -DNO_RC4 -DNO_MD4 -DNO_DES3 -DNO_DES3_TLS_SUITES
185+
166186
-DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DWOLFSSL_CUSTOM_CONFIG
167187

168188
# For gethostbyname()
@@ -191,7 +211,8 @@ elseif("${WOLFSSL_MATH_LIB}" MATCHES "spmath")
191211
-DWOLFSSL_HAVE_SP_RSA -DWOLFSSL_SP_4096
192212
-DWOLFSSL_HAVE_SP_DH
193213
-DWOLFSSL_HAVE_SP_ECC -DWOLFSSL_SP_384 -DWOLFSSL_SP_521
194-
-DWOLFSSL_SP_LARGE_CODE)
214+
-DWOLFSSL_SP_LARGE_CODE
215+
-DFP_MAX_BITS=16384 -DSP_INT_BITS=8192)
195216

196217
# SP Math architecture-specific settings (ex: assembly optimizations)
197218
if("${ANDROID_ABI}" MATCHES "arm64-v8a")
@@ -203,8 +224,7 @@ elseif("${WOLFSSL_MATH_LIB}" MATCHES "spmath")
203224
# Not using ASM, need to use WOLFSSL_SP_MATH_ALL for SW-only implementation
204225
add_definitions(-DWOLFSSL_SP_MATH_ALL)
205226
elseif("${ANDROID_ABI}" MATCHES "x86_64")
206-
# Using ASM for SP, need to use WOLFSSL_SP_MATH instead of WOLFSSL_SP_MATH_ALL
207-
add_definitions(-DWOLFSSL_SP_MATH)
227+
add_definitions(-DWOLFSSL_SP_MATH_ALL)
208228
add_definitions(-DWOLFSSL_SP_ASM -DWOLFSSL_SP_X86_64 -DWOLFSSL_SP_X86_64_ASM -DHAVE___UINT128_T)
209229
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sp_x86_64_asm.S)
210230
elseif("${ANDROID_ABI}" MATCHES "x86")
@@ -245,16 +265,21 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
245265
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wolfcrypt_first.c)
246266
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/hmac.c)
247267
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/random.c)
248-
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sha256.c)
249268
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/kdf.c)
250269
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/rsa.c)
251270
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/ecc.c)
252271
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/aes.c)
272+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sha256.c)
253273
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sha.c)
254274
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sha512.c)
255275
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/sha3.c)
256276
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/dh.c)
257277
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/cmac.c)
278+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/curve448.c)
279+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/ed448.c)
280+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/curve25519.c)
281+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/ed25519.c)
282+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/pwdbased.c)
258283
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/fips.c)
259284
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/fips_test.c)
260285
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wolfcrypt_last.c)
@@ -278,9 +303,18 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
278303
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/memory.c)
279304
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/asn.c)
280305
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/coding.c)
306+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/md5.c)
281307
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/pwdbased.c)
282308
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/pkcs12.c)
283309
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/tfm.c)
310+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wc_lms.c)
311+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wc_lms_impl.c)
312+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wc_xmss.c)
313+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/wc_xmss_impl.c)
314+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/fe_operations.c)
315+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/ge_operations.c)
316+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/fe_448.c)
317+
list(APPEND CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/ge_448.c)
284318
endif()
285319

286320
# wolfSSL will be compiled as a SHARED library

‎IDE/Android/app/src/main/java/com/example/wolfssl/MainActivity.java‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,22 @@ public void onClick(View v) {
5252
}
5353
};
5454

55+
private void setDisplayText(String s)
56+
{
57+
runOnUiThread(() -> {
58+
TextView tv = (TextView) findViewById(R.id.sample_text);
59+
tv.setText(s);
60+
});
61+
}
62+
63+
private void appendDisplayText(String s)
64+
{
65+
runOnUiThread(() -> {
66+
TextView tv = (TextView) findViewById(R.id.sample_text);
67+
tv.append(s);
68+
});
69+
}
70+
5571
@Override
5672
protected void onCreate(Bundle savedInstanceState) {
5773
super.onCreate(savedInstanceState);
@@ -60,8 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
6076
Button button = (Button) findViewById(R.id.button);
6177
button.setOnClickListener(buttonListener);
6278

63-
TextView tv = (TextView) findViewById(R.id.sample_text);
64-
tv.setText("wolfSSL JNI Android Studio Example App");
79+
setDisplayText("wolfSSL JNI Android Studio Example App\n");
6580
}
6681

6782
public void testFindProvider(TextView tv)
@@ -71,15 +86,18 @@ public void testFindProvider(TextView tv)
7186
WolfSSL.loadLibrary();
7287

7388
/* create new SSLEngine */
74-
Security.addProvider(new WolfSSLProvider());
89+
Security.insertProviderAt(new WolfSSLProvider(), 1);
7590

7691
Provider p = Security.getProvider("wolfJSSE");
7792
if (p == null) {
78-
System.out.println("Unable to find wolfJSSE provider");
79-
return;
93+
appendDisplayText("Unable to find wolfJSSE provider\n");
8094
}
8195
else {
82-
96+
appendDisplayText("Successfully found wolfJSSE provider\n");
8397
}
98+
99+
appendDisplayText("\n");
100+
appendDisplayText("For more detailed example, see:\n");
101+
appendDisplayText("github.com/wolfssl/wolfssl-examples\n");
84102
}
85103
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ an application can include this as a dependency in the application's
224224
<dependency>
225225
<groupId>com.wolfssl</groupId>
226226
<artifactId>wolfssl-jsse</artifactId>
227-
<version>1.14.0-SNAPSHOT</version>
227+
<version>1.15.0-SNAPSHOT</version>
228228
</dependency>
229229
</dependencies>
230230
...

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<!-- versioning/manifest properties -->
1515
<property name="implementation.vendor" value="wolfSSL Inc." />
1616
<property name="implementation.title" value="wolfSSL JNI/JSSE" />
17-
<property name="implementation.version" value="1.14" />
17+
<property name="implementation.version" value="1.15" />
1818

1919
<!-- set properties for this build -->
2020
<property name="src.dir" value="src/java/"/>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.wolfssl</groupId>
66
<artifactId>wolfssl-jsse</artifactId>
7-
<version>1.14.0-SNAPSHOT</version>
7+
<version>1.15.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>wolfssl-jsse</name>
1010
<url>https://www.wolfssl.com</url>

‎scripts/infer.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ infer --fail-on-issue run -- javac \
3939
src/java/com/wolfssl/WolfSSLCertRequest.java \
4040
src/java/com/wolfssl/WolfSSLCertificate.java \
4141
src/java/com/wolfssl/WolfSSLContext.java \
42+
src/java/com/wolfssl/WolfSSLDebug.java \
4243
src/java/com/wolfssl/WolfSSLDecryptVerifyCallback.java \
4344
src/java/com/wolfssl/WolfSSLEccSharedSecretCallback.java \
4445
src/java/com/wolfssl/WolfSSLEccSignCallback.java \
@@ -52,6 +53,7 @@ infer --fail-on-issue run -- javac \
5253
src/java/com/wolfssl/WolfSSLLoggingCallback.java \
5354
src/java/com/wolfssl/WolfSSLMacEncryptCallback.java \
5455
src/java/com/wolfssl/WolfSSLMissingCRLCallback.java \
56+
src/java/com/wolfssl/WolfSSLNativeLoggingCallback.java \
5557
src/java/com/wolfssl/WolfSSLPskClientCallback.java \
5658
src/java/com/wolfssl/WolfSSLPskServerCallback.java \
5759
src/java/com/wolfssl/WolfSSLRsaDecCallback.java \
@@ -69,15 +71,13 @@ infer --fail-on-issue run -- javac \
6971
src/java/com/wolfssl/provider/jsse/WolfSSLAuthStore.java \
7072
src/java/com/wolfssl/provider/jsse/WolfSSLContext.java \
7173
src/java/com/wolfssl/provider/jsse/WolfSSLCustomUser.java \
72-
src/java/com/wolfssl/provider/jsse/WolfSSLDebug.java \
7374
src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java \
7475
src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java \
7576
src/java/com/wolfssl/provider/jsse/WolfSSLGenericHostName.java \
7677
src/java/com/wolfssl/provider/jsse/WolfSSLImplementSSLSession.java \
7778
src/java/com/wolfssl/provider/jsse/WolfSSLInternalVerifyCb.java \
7879
src/java/com/wolfssl/provider/jsse/WolfSSLKeyManager.java \
7980
src/java/com/wolfssl/provider/jsse/WolfSSLKeyX509.java \
80-
src/java/com/wolfssl/provider/jsse/WolfSSLNativeLoggingCallback.java \
8181
src/java/com/wolfssl/provider/jsse/WolfSSLParametersHelper.java \
8282
src/java/com/wolfssl/provider/jsse/WolfSSLParameters.java \
8383
src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java \
@@ -104,8 +104,10 @@ if [ "$RETVAL" == '0' ] && [ "$KEEP" == 'no' ]; then
104104
rm -r ./infer-out
105105
fi
106106

107-
if [ "$RETVAL" == '2' ]; then
107+
if [ "$RETVAL" == '1' ] || [ "$RETVAL" == '2' ]; then
108108
# GitHub Actions expects return of 1 to mark step as failure
109109
exit 1
110110
fi
111111

112+
exit 0
113+

0 commit comments

Comments
 (0)