diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-03-21 06:49:49 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-03-21 09:23:49 +0100 |
| commit | cee9d444e97858d441b5de0f4c357bccbe4952f2 (patch) | |
| tree | f279e16a1db393905511e91a76af497be255accf | |
| parent | 02fe1e0b5b237b090e91c4a5d1ab1ac7b938d0f6 (diff) | |
| download | jgit-cee9d444e97858d441b5de0f4c357bccbe4952f2.tar.gz jgit-cee9d444e97858d441b5de0f4c357bccbe4952f2.zip | |
Delegate crypto algorithm creation to InsecureCipherFactory
This is a preparation change to Bazel build implementation. Error
Prone rejects the code with variable crypto algorithm as insecure
see: [1].
[1] http://errorprone.info/bugpattern/InsecureCryptoUsage
Change-Id: I92db70a7da454bc364597a995e8be5dccc2d6427
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java index def9d93a86..1b434d3ddc 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java @@ -91,7 +91,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; -import javax.crypto.Cipher; import javax.crypto.SecretKeyFactory; import org.eclipse.jgit.api.Git; @@ -772,16 +771,16 @@ public class WalkEncryptionTest { String profile = props.getProperty(AmazonS3.Keys.CRYPTO_ALG); String version = props.getProperty(AmazonS3.Keys.CRYPTO_VER, WalkEncryption.Vals.DEFAULT_VERS); - String crytoAlgo; + String cryptoAlgo; String keyAlgo; switch (version) { case WalkEncryption.Vals.DEFAULT_VERS: case WalkEncryption.JGitV1.VERSION: - crytoAlgo = profile; + cryptoAlgo = profile; keyAlgo = profile; break; case WalkEncryption.JGitV2.VERSION: - crytoAlgo = props + cryptoAlgo = props .getProperty(profile + WalkEncryption.Keys.X_ALGO); keyAlgo = props .getProperty(profile + WalkEncryption.Keys.X_KEY_ALGO); @@ -790,7 +789,7 @@ public class WalkEncryptionTest { return false; } try { - Cipher.getInstance(crytoAlgo); + InsecureCipherFactory.create(cryptoAlgo); SecretKeyFactory.getInstance(keyAlgo); return true; } catch (Throwable e) { |