diff options
| -rw-r--r-- | BUILD | 7 | ||||
| -rw-r--r-- | org.eclipse.jgit/BUILD | 4 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java | 7 |
3 files changed, 3 insertions, 15 deletions
@@ -1,12 +1,5 @@ package(default_visibility = ["//visibility:public"]) -config_setting( - name = "jdk9", - values = { - "java_toolchain": "@bazel_tools//tools/jdk:toolchain_jdk9", - }, -) - genrule( name = "all", testonly = 1, diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD index b67bfac5b6..814ecec9b8 100644 --- a/org.eclipse.jgit/BUILD +++ b/org.eclipse.jgit/BUILD @@ -14,10 +14,6 @@ RESOURCES = glob(["resources/**"]) java_library( name = "jgit", srcs = SRCS, - javacopts = select({ - "//:jdk9": ["--add-modules=java.xml.bind"], - "//conditions:default": [], - }), resource_strip_prefix = "org.eclipse.jgit/resources", resources = RESOURCES, deps = [ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java index b4248ee3fc..7a973aff34 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java @@ -66,8 +66,8 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; import javax.crypto.spec.SecretKeySpec; -import javax.xml.bind.DatatypeConverter; +import org.bouncycastle.util.encoders.Hex; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.util.Base64; @@ -301,7 +301,7 @@ abstract class WalkEncryption { String DEFAULT_KEY_ALGO = JetS3tV2.ALGORITHM; String DEFAULT_KEY_SIZE = Integer.toString(JetS3tV2.KEY_SIZE); String DEFAULT_KEY_ITER = Integer.toString(JetS3tV2.ITERATIONS); - String DEFAULT_KEY_SALT = DatatypeConverter.printHexBinary(JetS3tV2.SALT); + String DEFAULT_KEY_SALT = Hex.toHexString(JetS3tV2.SALT); String EMPTY = ""; //$NON-NLS-1$ @@ -377,8 +377,7 @@ abstract class WalkEncryption { final byte[] salt; try { - salt = DatatypeConverter - .parseHexBinary(keySalt.replaceAll(REGEX_WS, EMPTY)); + salt = Hex.decode(keySalt.replaceAll(REGEX_WS, EMPTY)); } catch (Exception e) { throw securityError(X_KEY_SALT + EMPTY + keySalt); } |