This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
commit 3898a76f5975472ff671c934fdca77a2c408fb76 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Dec 11 11:35:01 2022 -0500 Use File constant --- src/main/java/org/apache/commons/crypto/NativeCodeLoader.java | 6 +++--- src/main/java/org/apache/commons/crypto/OsInfo.java | 3 ++- src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java index 2808345..83da968 100644 --- a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java +++ b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java @@ -135,7 +135,7 @@ final class NativeCodeLoader { */ private static File extractLibraryFile(final String libFolderForCurrentOS, final String libraryFileName, final String targetFolder) { - final String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName; + final String nativeLibraryFilePath = libFolderForCurrentOS + File.separator + libraryFileName; // Attach UUID to the native library file to ensure multiple class loaders // can read the libcommons-crypto multiple times. @@ -214,10 +214,10 @@ final class NativeCodeLoader { // Load an OS-dependent native library inside a jar file nativeLibraryPath = "/org/apache/commons/crypto/native/" + OsInfo.getNativeLibFolderPathForCurrentOS(); - boolean hasNativeLib = hasResource(nativeLibraryPath + "/" + nativeLibraryName); + boolean hasNativeLib = hasResource(nativeLibraryPath + File.separator + nativeLibraryName); if (!hasNativeLib) { final String altName = "libcommons-crypto.jnilib"; - if (OsInfo.getOSName().equals("Mac") && hasResource(nativeLibraryPath + "/" + altName)) { + if (OsInfo.getOSName().equals("Mac") && hasResource(nativeLibraryPath + File.separator + altName)) { // Fix for openjdk7 for Mac nativeLibraryName = altName; hasNativeLib = true; diff --git a/src/main/java/org/apache/commons/crypto/OsInfo.java b/src/main/java/org/apache/commons/crypto/OsInfo.java index c2a7cca..01cca69 100644 --- a/src/main/java/org/apache/commons/crypto/OsInfo.java +++ b/src/main/java/org/apache/commons/crypto/OsInfo.java @@ -17,6 +17,7 @@ */ package org.apache.commons.crypto; +import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Locale; @@ -134,7 +135,7 @@ final class OsInfo { * @return the current OS's native lib folder. */ static String getNativeLibFolderPathForCurrentOS() { - return getOSName() + "/" + getArchName(); + return getOSName() + File.separator + getArchName(); } /** diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java index acf46ca..fad80dd 100644 --- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java +++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java @@ -46,6 +46,7 @@ import com.sun.jna.ptr.PointerByReference; */ class OpenSslJnaCipher implements CryptoCipher { + private static final String TRANSFORMATION_DELIM = "/"; private PointerByReference algo; private final PointerByReference context; private final AlgorithmMode algMode; @@ -382,7 +383,7 @@ class OpenSslJnaCipher implements CryptoCipher { */ final String[] parts = new String[3]; int count = 0; - final StringTokenizer parser = new StringTokenizer(transformation, "/"); + final StringTokenizer parser = new StringTokenizer(transformation, TRANSFORMATION_DELIM); while (parser.hasMoreTokens() && count < 3) { parts[count++] = parser.nextToken().trim(); }