diff --git a/native/com_wolfssl_WolfSSL.h b/native/com_wolfssl_WolfSSL.h index 58df449..9f6f4eb 100644 --- a/native/com_wolfssl_WolfSSL.h +++ b/native/com_wolfssl_WolfSSL.h @@ -311,6 +311,8 @@ extern "C" { #define com_wolfssl_WolfSSL_WOLFSSL_FFDHE_8192 260L #undef com_wolfssl_WolfSSL_INVALID_DEVID #define com_wolfssl_WolfSSL_INVALID_DEVID -2L +#undef com_wolfssl_WolfSSL_WOLFSSL_LEFT_MOST_WILDCARD_ONLY +#define com_wolfssl_WolfSSL_WOLFSSL_LEFT_MOST_WILDCARD_ONLY 64L /* * Class: com_wolfssl_WolfSSL * Method: init diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index 17bad4d..ad2293e 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -299,19 +299,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/java/com/wolfssl/WolfSSL.java b/src/java/com/wolfssl/WolfSSL.java index b1429b0..841238e 100644 --- a/src/java/com/wolfssl/WolfSSL.java +++ b/src/java/com/wolfssl/WolfSSL.java @@ -586,7 +586,7 @@ public class WolfSSL { /* ------------------------- Flag Values ---------------------------- */ /** WolfSSLCertificate.checkHost() match only wildcards in left-most * position, used for LDAPS hostname verification. */ - public static int WOLFSSL_LEFT_MOST_WILDCARD_ONLY = 0x40; + public static final int WOLFSSL_LEFT_MOST_WILDCARD_ONLY = 0x40; /* ------------------------ Internal state -------------------------- */ diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLContext.java b/src/java/com/wolfssl/provider/jsse/WolfSSLContext.java index 9cf96fa..b459d6e 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLContext.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLContext.java @@ -86,7 +86,7 @@ public class WolfSSLContext extends SSLContextSpi { /* Allow ability for user to hard-code and override version, cipher * suite, and NO_* disable options. Otherwise just sets defaults * into ctxAttr. */ - WolfSSLCustomUser ctxAttr = WolfSSLCustomUser.GetCtxAttributes + WolfSSLCustomUser ctxAttr = WolfSSLCustomUser.getCtxAttributes (this.currentVersion, ciphersIana); /* Explicitly set SSLContext version if overridden by diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLCustomUser.java b/src/java/com/wolfssl/provider/jsse/WolfSSLCustomUser.java index 39a9026..ab4ba52 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLCustomUser.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLCustomUser.java @@ -39,11 +39,11 @@ import com.wolfssl.WolfSSL.TLS_VERSION; */ public class WolfSSLCustomUser { /** SSL/TLS version to be used with new SSLContext objects. */ - public TLS_VERSION version; + TLS_VERSION version; /** String array of allowed cipher suites for new SSLContext objects */ - public String[] list; + String[] list; /** Mask of options to set for the associated native WOLFSSL_CTX */ - public long noOptions; + long noOptions; /** Default WolfSSLCustomUser constructor */ public WolfSSLCustomUser() { } @@ -65,7 +65,7 @@ public class WolfSSLCustomUser { * list needs to contain a subset of the default cipher * list. If it is null, default list is applied. */ - public static WolfSSLCustomUser GetCtxAttributes(TLS_VERSION version, + public static WolfSSLCustomUser getCtxAttributes(TLS_VERSION version, String[] list) { WolfSSLCustomUser ctxAttr = new WolfSSLCustomUser(); diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java b/src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java index 7cd9788..81c8765 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java @@ -167,12 +167,12 @@ public class WolfSSLEngine extends SSLEngine { protected BiFunction, String> alpnSelector = null; /** Turn on extra/verbose SSLEngine debug logging */ - public boolean extraDebugEnabled = false; + private boolean extraDebugEnabled = false; /** Turn on Send/Recv callback debug to print out bytes sent/received. * WARNING: enabling this will slow down sending and receiving data, * enough so that app may run into timeouts. Enable with caution. */ - public boolean ioDebugEnabled = false; + private boolean ioDebugEnabled = false; /** * Turns on additional debugging based on system properties set. @@ -264,7 +264,7 @@ public class WolfSSLEngine extends SSLEngine { } try { - this.engineHelper.LoadKeyAndCertChain(null, this); + this.engineHelper.loadKeyAndCertChain(null, this); certKeyLoaded = true; } catch (CertificateEncodingException | IOException | WolfSSLException e) { @@ -281,7 +281,7 @@ public class WolfSSLEngine extends SSLEngine { * * This logic is not included directly in WolfSSLEngine constructors * to avoid possible 'this' escape before subclass is fully initialized - * when using 'this' in LoadKeyAndCertChain(). + * when using 'this' in loadKeyAndCertChain(). * * @throws SSLException if initialization fails */ diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java b/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java index 59b0165..537253e 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java @@ -329,7 +329,7 @@ public class WolfSSLEngineHelper { * @throws IOException on error concatenating certificate chain into * single byte array */ - protected synchronized void LoadKeyAndCertChain( + protected synchronized void loadKeyAndCertChain( Socket sock, SSLEngine engine) throws WolfSSLException, CertificateEncodingException, IOException { diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLKeyManager.java b/src/java/com/wolfssl/provider/jsse/WolfSSLKeyManager.java index 6d1ed24..f40a05c 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLKeyManager.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLKeyManager.java @@ -106,7 +106,7 @@ public class WolfSSLKeyManager extends KeyManagerFactorySpi { "KeyStore type from wolfjsse.keystore.type.required"); } - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( file, this.pswd, type); } else { @@ -114,7 +114,7 @@ public class WolfSSLKeyManager extends KeyManagerFactorySpi { * FIPS is being used */ if (wksAvailable && (requiredType == null || requiredType.equals("WKS"))) { - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( file, this.pswd, "WKS"); } @@ -123,7 +123,7 @@ public class WolfSSLKeyManager extends KeyManagerFactorySpi { (requiredType == null || requiredType.equals("BKS"))) { WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, () -> "Detected Android VM, trying BKS KeyStore type"); - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( file, this.pswd, "BKS"); } @@ -133,7 +133,7 @@ public class WolfSSLKeyManager extends KeyManagerFactorySpi { WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, () -> "javax.net.ssl.keyStoreType system property " + "not set, trying type: JKS"); - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( file, this.pswd, "JKS"); } } diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java b/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java index affad89..5387022 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java @@ -168,7 +168,7 @@ public final class WolfSSLProvider extends Provider { * @throws WolfSSLException if error registering native crypto callback * function */ - public void setDevId(int devId) throws WolfSSLException { + public static void setDevId(int devId) throws WolfSSLException { /* Store devId into static WolfSSL variable, used by * WolfSSLContext (SSLContext) */ diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java b/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java index e9c5a65..2e2d13b 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java @@ -543,9 +543,9 @@ public class WolfSSLSocket extends SSLSocket { () -> "loading private key and cert chain"); if (this.socket != null) { - EngineHelper.LoadKeyAndCertChain(this.socket, null); + EngineHelper.loadKeyAndCertChain(this.socket, null); } else { - EngineHelper.LoadKeyAndCertChain(this, null); + EngineHelper.loadKeyAndCertChain(this, null); } } else { throw new WolfSSLException( diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLTrustManager.java b/src/java/com/wolfssl/provider/jsse/WolfSSLTrustManager.java index 8ede84e..743cd47 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLTrustManager.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLTrustManager.java @@ -126,7 +126,7 @@ public class WolfSSLTrustManager extends TrustManagerFactorySpi { "wolfjsse.keystore.type.required"); } - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( tsFile, passArr, tsType); } else { @@ -134,7 +134,7 @@ public class WolfSSLTrustManager extends TrustManagerFactorySpi { * FIPS is being used */ if (wksAvailable && (requiredType == null || requiredType.equals("WKS"))) { - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( tsFile, passArr, "WKS"); } @@ -143,7 +143,7 @@ public class WolfSSLTrustManager extends TrustManagerFactorySpi { (requiredType == null || requiredType.equals("BKS"))) { WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, () -> "Detected Android VM, trying BKS KeyStore type"); - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( tsFile, passArr, "BKS"); } @@ -153,7 +153,7 @@ public class WolfSSLTrustManager extends TrustManagerFactorySpi { WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, () -> "javax.net.ssl.trustStoreType system property " + "not set, trying type: JKS"); - sysStore = WolfSSLUtil.LoadKeyStoreFileByType( + sysStore = WolfSSLUtil.loadKeyStoreFileByType( tsFile, passArr, "JKS"); } } @@ -699,7 +699,7 @@ public class WolfSSLTrustManager extends TrustManagerFactorySpi { /* Get JAVA_HOME for trying to load system certs next */ if (certs == null) { - javaHome = WolfSSLUtil.GetJavaHome(); + javaHome = WolfSSLUtil.getJavaHome(); if (javaHome == null) { WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, () -> "$JAVA_HOME not set, unable to load system " + diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLUtil.java b/src/java/com/wolfssl/provider/jsse/WolfSSLUtil.java index 9098027..b04a78f 100644 --- a/src/java/com/wolfssl/provider/jsse/WolfSSLUtil.java +++ b/src/java/com/wolfssl/provider/jsse/WolfSSLUtil.java @@ -605,7 +605,7 @@ public class WolfSSLUtil { * * @return String path to Java home directory, otherwise null if not set */ - protected static String GetJavaHome() { + protected static String getJavaHome() { String javaHome = System.getenv("JAVA_HOME"); @@ -672,7 +672,7 @@ public class WolfSSLUtil { * @return new KeyStore object loaded with KeyStore file, or null * if unable to load KeyStore */ - protected static KeyStore LoadKeyStoreFileByType(String file, char[] pass, + protected static KeyStore loadKeyStoreFileByType(String file, char[] pass, String type) { KeyStore ks = null;