Repository: commons-crypto Updated Branches: refs/heads/master 98bec4c43 -> 1baf9a840
CRYPTO-38: Always use blocks Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/1baf9a84 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/1baf9a84 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/1baf9a84 Branch: refs/heads/master Commit: 1baf9a840dee158844e5b98c750dc1f297dc7157 Parents: 98bec4c Author: Sun Dapeng <s...@apache.org> Authored: Fri Apr 29 10:19:56 2016 +0800 Committer: Sun Dapeng <s...@apache.org> Committed: Fri Apr 29 10:49:27 2016 +0800 ---------------------------------------------------------------------- .gitignore | 4 ++- .../apache/commons/crypto/cipher/JceCipher.java | 6 ++--- .../commons/crypto/cipher/OpensslCipher.java | 3 ++- .../commons/crypto/utils/NativeCodeLoader.java | 26 ++++++++++++-------- .../org/apache/commons/crypto/utils/OSInfo.java | 6 +++-- .../commons/crypto/utils/ReflectionUtils.java | 10 +++++--- .../org/apache/commons/crypto/utils/Utils.java | 4 +-- 7 files changed, 35 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 8a5dd74..f5a8711 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,6 @@ dist/ unit-tests.log /lib/ src/main/resources/com/intel/chimera/native/ -src/main/resources/com/intel/chimera/native/* \ No newline at end of file +src/main/resources/com/intel/chimera/native/* +.externalToolBuilders/* +maven-eclipse.xml http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java index 4ec3fc2..873d092 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java +++ b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java @@ -28,8 +28,6 @@ import java.util.Properties; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.ShortBufferException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; import org.apache.commons.crypto.utils.Utils; @@ -101,9 +99,9 @@ public class JceCipher implements Cipher { Utils.checkNotNull(params); int cipherMode = javax.crypto.Cipher.DECRYPT_MODE; - if (mode == ENCRYPT_MODE) + if (mode == ENCRYPT_MODE) { cipherMode = javax.crypto.Cipher.ENCRYPT_MODE; - + } cipher.init(cipherMode, key, params); } http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java b/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java index d1a621f..72b247b 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java +++ b/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java @@ -95,8 +95,9 @@ public class OpensslCipher implements Cipher { Utils.checkNotNull(params); int cipherMode = Openssl.DECRYPT_MODE; - if (mode == ENCRYPT_MODE) + if (mode == ENCRYPT_MODE) { cipherMode = Openssl.ENCRYPT_MODE; + } byte[] iv; if (params instanceof IvParameterSpec) { iv = ((IvParameterSpec) params).getIV(); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/utils/NativeCodeLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/utils/NativeCodeLoader.java b/src/main/java/org/apache/commons/crypto/utils/NativeCodeLoader.java index 92f4dba..b8d92e5 100644 --- a/src/main/java/org/apache/commons/crypto/utils/NativeCodeLoader.java +++ b/src/main/java/org/apache/commons/crypto/utils/NativeCodeLoader.java @@ -85,14 +85,15 @@ public class NativeCodeLoader { .getLibName(); // Resolve the library file name with a suffix (e.g., dll, .so, etc.) - if (nativeLibraryName == null) + if (nativeLibraryName == null) { nativeLibraryName = System.mapLibraryName("commons-crypto"); - + } if (nativeLibraryPath != null) { File nativeLib = new File(nativeLibraryPath, nativeLibraryName); - if (nativeLib.exists()) + if (nativeLib.exists()) { return nativeLib; + } } // Load an OS-dependent native library inside a jar file @@ -188,15 +189,18 @@ public class NativeCodeLoader { nativeIn = NativeCodeLoader.class.getResourceAsStream(nativeLibraryFilePath); extractedLibIn = new FileInputStream(extractedLibFile); - if (!contentsEquals(nativeIn, extractedLibIn)) + if (!contentsEquals(nativeIn, extractedLibIn)) { throw new RuntimeException(String.format( "Failed to write a native library file at %s", extractedLibFile)); + } } finally { - if (nativeIn != null) + if (nativeIn != null) { nativeIn.close(); - if (extractedLibIn != null) + } + if (extractedLibIn != null) { extractedLibIn.close(); + } } } @@ -225,18 +229,19 @@ public class NativeCodeLoader { public static String getVersion() { URL versionFile = NativeCodeLoader.class .getResource("/META-INF/maven/org.apache.commons.crypto/commons-crypto/pom.properties"); - if (versionFile == null) + if (versionFile == null) { versionFile = NativeCodeLoader.class .getResource("/org/apache/commons/crypto/VERSION"); - + } String version = "unknown"; try { if (versionFile != null) { Properties versionData = new Properties(); versionData.load(versionFile.openStream()); version = versionData.getProperty("version", version); - if (version.equals("unknown")) + if (version.equals("unknown")) { version = versionData.getProperty("VERSION", version); + } version = version.trim().replaceAll("[^0-9M\\.]", ""); } } catch (IOException e) { @@ -257,8 +262,9 @@ public class NativeCodeLoader { int ch = in1.read(); while (ch != -1) { int ch2 = in2.read(); - if (ch != ch2) + if (ch != ch2) { return false; + } ch = in1.read(); } int ch2 = in2.read(); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/utils/OSInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/utils/OSInfo.java b/src/main/java/org/apache/commons/crypto/utils/OSInfo.java index 4cf7420..86e099f 100644 --- a/src/main/java/org/apache/commons/crypto/utils/OSInfo.java +++ b/src/main/java/org/apache/commons/crypto/utils/OSInfo.java @@ -143,8 +143,9 @@ public class OSInfo { + "' -name 'libjvm.so' | head -1 | xargs readelf -A | " + "grep 'Tag_ABI_VFP_args: VFP registers'" }; int exitCode = Runtime.getRuntime().exec(cmdarray).waitFor(); - if (exitCode == 0) + if (exitCode == 0) { return "armhf"; + } } catch (IOException e) { // ignored: fall back to "arm" arch (soft-float ABI) } catch (InterruptedException e) { @@ -152,8 +153,9 @@ public class OSInfo { } } else { String lc = osArch.toLowerCase(Locale.US); - if (archMapping.containsKey(lc)) + if (archMapping.containsKey(lc)) { return archMapping.get(lc); + } } return translateArchNameToFolderName(osArch); } http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java index cff9406..99e6d8c 100644 --- a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java +++ b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java @@ -111,12 +111,13 @@ public class ReflectionUtils { if (theClass == null) { theClass = defaultValue; } - if (theClass != null && !xface.isAssignableFrom(theClass)) + if (theClass != null && !xface.isAssignableFrom(theClass)) { throw new RuntimeException(theClass+" not "+xface.getName()); - else if (theClass != null) + } else if (theClass != null) { return theClass.asSubclass(xface); - else + } else { return null; + } } catch (Exception e) { throw new RuntimeException(e); } @@ -134,8 +135,9 @@ public class ReflectionUtils { */ public static Class<?> getClass(String name, Class<?> defaultValue) { String valueString = System.getProperty(name); - if (valueString == null) + if (valueString == null) { return defaultValue; + } try { return getClassByName(valueString); } catch (ClassNotFoundException e) { http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1baf9a84/src/main/java/org/apache/commons/crypto/utils/Utils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/utils/Utils.java b/src/main/java/org/apache/commons/crypto/utils/Utils.java index 3c2ef86..c12fd9c 100644 --- a/src/main/java/org/apache/commons/crypto/utils/Utils.java +++ b/src/main/java/org/apache/commons/crypto/utils/Utils.java @@ -72,9 +72,9 @@ public class Utils { InputStream is = Thread.currentThread().getContextClassLoader() .getResourceAsStream(COMMONS_CRYPTO_SYSTEM_PROPERTIES_FILE); - if (is == null) + if (is == null) { return; // no configuration file is found - + } // Load property file Properties props = new Properties(); props.load(is);
