|
|
@@ -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) { |