From 31ff8955d6ed23aa41456b00b1f151913f28120d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 5 Nov 2024 02:00:24 +0100 Subject: [PATCH] Update bouncycastle to 1.79 Change-Id: Ib81d73075ebc9dcdc73aacf30fa02ad56a502d51 --- WORKSPACE | 18 +++++++++--------- .../keys/OCBPBEProtectionRemoverFactory.java | 7 +++++++ .../org.eclipse.jgit.target/jgit-4.17.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.18.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.19.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.20.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.21.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.22.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.23.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.24.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.25.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.26.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.27.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.28.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.29.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.30.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.31.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.32.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.33.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 10 +++++----- .../maven/dependencies.tpd | 8 ++++---- pom.xml | 2 +- 22 files changed, 111 insertions(+), 104 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dc4d322558..1050a44cff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -296,32 +296,32 @@ maven_jar( sha1 = "6f4beb9b482ea0d9db9db0564742aa2e4e0bf3c4", ) -BOUNCYCASTLE_VER = "1.78.1" +BOUNCYCASTLE_VER = "1.79" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "6c8dbcec20355278ec54840e735f63db2479150e", - src_sha1 = "2ddef60d84dd8c14ebce4c13100f0bc55fed6922", + sha1 = "904dd8a8e1c9f7d58d1ffa7f4ca3fb00736a601f", + src_sha1 = "9e372826141edb213d5921131ee68dc276dc99ef", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "39e9e45359e20998eb79c1828751f94a818d25f8", - src_sha1 = "70f58ec93da543dda6a21614b768cb2e386fd512", + sha1 = "4d8e2732bcee15f1db93df266c3f5b70ce5cac21", + src_sha1 = "8647816d667ee526a8e3a456229ac5f9f96d2315", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "5353ca39fe2f148dab9ca1d637a43d0750456254", - src_sha1 = "8d2e0747f5d806f39a602f7f91610444d88c4e2c", + sha1 = "ecfc5aef97cc7676ea0de5c53c407b9f533f0ad5", + src_sha1 = "00df03977fb0b80395da655623abca9d7d7dcb66", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "17b3541f736df97465f87d9f5b5dfa4991b37bb3", - src_sha1 = "3aeaf221772ad0c9c04593688cb86c6eb74d48b9", + sha1 = "7693cec3b8779b74b35466dcaeeaac7409872954", + src_sha1 = "57a60d1d9f75320eef70a095dfae679d97ade1c2", ) diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java index 3924d68596..e6f1decbc1 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java @@ -120,6 +120,13 @@ class OCBPBEProtectionRemoverFactory } } } + + @Override + public byte[] recoverKeyData(int encAlgorithm, int aeadAlgorithm, + byte[] s2kKey, byte[] iv, int packetTag, int keyVersion, + byte[] keyData, byte[] pubkeyData) throws PGPException { + throw new UnsupportedOperationException(); + } }; } } \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index d16431df75..623e964217 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index ac9d7c4e95..66d68e06f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index f7fd352a32..16b9706b3e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index a03692ab28..9604132842 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index d90aa60409..78149754b4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 2f7eb7adfb..b5fcaf31dc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 4dd26b9961..b57ac90a93 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index e0a4bab260..dd7081e0ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 700b813313..e5cbf9b35a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index a03967df61..48ffc2f27f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 528f6bb74b..5c7e1a4596 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index dd960ee053..735d1cf5c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index dada6487ec..9357dee548 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 403ed29801..295b9c3c46 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index f812d63086..b9b690ccca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 6bcc689650..2407a8708f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index c99e59d7a9..78433361fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index fe7e9d292a..c913b9dcca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 630107daed..68b457c0f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -69,22 +69,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.78.1" + version = "1.79" } } diff --git a/pom.xml b/pom.xml index a35c81ebd2..e7f24fe083 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 1.7.36 3.6.3 2.11.0 - 1.78.1 + 1.79 4.8.5.0 3.5.1 3.3.2 -- 2.39.5