aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-0188-121/+121
| | | | Change-Id: I2a1d7ab24d5ca718348f4ce3cda351553e48cd1f
* JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-0188-121/+121
| | | | | Change-Id: Id8d0970102f18e61a2fc7cf941267c9089d71c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'master' into stable-5.13Matthias Sohn2021-09-0147-55/+342
|\ | | | | | | | | | | | | | | | | | | | | | | * master: GitServlet: allow to override default error handlers Silence API error for new interface method ProtocolV2Hook#onObjectInfo transport: add object-info capability Ignore IllegalStateException if JVM is already shutting down Update orbit to R20210825222808 for 2021-09 RevWalk: getMergedInto's result is wrong on the second call Change-Id: I007882d0c663e406d8845cc807f3792ae7673230
| * Merge branch 'stable-5.12'Matthias Sohn2021-09-011-0/+22
| |\ | | | | | | | | | | | | | | | | | | * stable-5.12: GitServlet: allow to override default error handlers Change-Id: I4710cec30c58d7a6525a42dc5f1fdffc912ed073
| | * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-09-011-0/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: GitServlet: allow to override default error handlers Change-Id: I65c01857ab42ec3023da16e6816d58e1a36e40e4
| | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-09-011-0/+22
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: GitServlet: allow to override default error handlers Change-Id: If10a99bcdc91105059b15a1d137dd38af228c58d
| | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-09-011-0/+22
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: GitServlet: allow to override default error handlers Change-Id: I55273087f8a67762130728eaaf635519c25255b3
| | | | | * GitServlet: allow to override default error handlersAntonio Barone2021-09-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitServlet delegates repository access over HTTP to the GitFilter servlet. GitServlet, in turn, can be extended by jgit consumers to provide custom logic when handling such operations. This is the case, for example, with Gerrit Code Review, which provides custom behavior with a GitOverHttpServlet [1]. Among possible customizations, the ability of specifying a custom error handler for UploadPack and ReceivePack was already introduced in GitFilter by Idd3b87d6b and I9c708aa5a2, respectively. However the `setUploadPackErrorHandler` and `setReceivePackErrorHandler` methods were never added to the GitServlet. Expose the `setUploadPackErrorHandler` and `setReceivePackErrorHandler` methods to the GitServlet, so that consumers of the jgit library might specify custom error handlers. [1] https://gerrit.googlesource.com/gerrit/+/refs/heads/stable-3.2/java/com/google/gerrit/httpd/GitOverHttpServlet.java#95 Change-Id: I712d485ff68b662b48c71ef75650c5a155950d23
| * | | | | Silence API error for new interface method ProtocolV2Hook#onObjectInfoMatthias Sohn2021-09-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4d09db2b89f26bc6ceb4e84f10c7e66b0ff684f
| * | | | | transport: add object-info capabilityBruno Albuquerque2021-08-318-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is useful to obtain metadata associated with an object without the need to first download it locally. This is specially useful when using partial clones. This change implements the object-info capability that allows clients to query the remote server for object metadata (currently only size). This is a backport of the same capability that was recently added to the Git project a2ba162cda (object-info: support for retrieving object info, 2021-04-20). Signed-off-by: Bruno Albuquerque <bga@google.com> Change-Id: I4dc9828e1c247f08b0976b8810be92d124366165
| * | | | | Merge branch 'stable-5.12'Matthias Sohn2021-08-302-1/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: RevWalk: getMergedInto's result is wrong on the second call Change-Id: Iee51703b2b009df15c0d8ee19fd480058b665bce
| | * | | | RevWalk: getMergedInto's result is wrong on the second callkylezhao2021-08-132-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the future user can reset all UNINTERESTING commmits after this operation. Signed-off-by: kylezhao <kylezhao@tencent.com> Change-Id: I7549b9ff67bd31acd5dfc92331cb9a30b47b8278
| * | | | | Ignore IllegalStateException if JVM is already shutting downMatthias Sohn2021-08-292-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to register/unregister a shutdown hook when the JVM is already in shutdown throws an IllegalStateException. Ignore this exception since we can't do anything about it. Bug: 575367 Change-Id: Ic967c16c7f566c84778795315ab369e76668b364
| * | | | | Update orbit to R20210825222808 for 2021-09Matthias Sohn2021-08-2633-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a98f2134d19c3495d7d39cccfd7cf6f07640bd5
* | | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-08-2588-121/+121
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6db044fdd57b60adbc2dd078c4af8cb54bb331c3
* | | | | | JGit v5.13.0.202108250949-m3v5.13.0.202108250949-m3Matthias Sohn2021-08-2588-121/+121
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Icc079b28327f5a02256f9a06837c2be6352ea6e3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Update spotbugs-maven-plugin to 4.3.0Marco Miller2021-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafb680923cbc6c81067773159a9a0e2fcdc60169 Signed-off-by: Marco Miller <marco.miller@ericsson.com>
* | | | | Update ant to 1.10.11 also in pom.xmlMatthias Sohn2021-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed when the target platform was updated to use ant 1.10.11 in cf9baedb5d. Change-Id: I0d503fa4b27df73a7dad68f1b729346596d78332
* | | | | DFS block cache: add additional stats to DfsReaderIoStatsAlina Djamankulova2021-08-242-12/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New stats are populated in DfsPackFile to provide details about loading pack, bitmap and reverse indexes. Signed-off-by: Alina Djamankulova <adjama@google.com> Change-Id: Ib6e8384ecc31821261e5099d0768c0b1227e8364
* | | | | Update Orbit to S20210817231813Matthias Sohn2021-08-2318-105/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and org.apache.ant to 1.10.11.v20210720-1445 Change-Id: Ic9c2f42628e47fffc99a07d591bc465b4e24b86e
* | | | | [gpg] Better GPG home directory determinationThomas Wolf2021-08-183-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPG can use customized directories instead of the standard ~/.gnupg or %APPDATA%\gnupg directories: * Environment variable GNUPGHOME can define the location. * On Windows, a registry key may define the location (but this is deprecated). * Portable installations may use a directory defined via a file "gpgconf.ctl". * GPG programs may take a --homedir command-line argument, which overrides anything. Implement handling of environment variable GNUPGHOME. The other ways of GPG to get its home directory are outside the reach of JGit. Provide a system property "jgit.gpg.home" that the user can set in such cases. Do tilde replacement for the system property and for GNUPGHOME. Note that on VMS, the default directory would be ~/gnupg (without dot). This is not accounted for, but a user on VMS could now use either the system property or GNUPGHOME to direct JGit to the right directory. Bug: 575327 Change-Id: Id5ea04a85d58dba0c0df7a705777630d36042467 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | FS: cleanup use of final modifierMatthias Sohn2021-08-171-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the contributor guide [1]. [1] https://wiki.eclipse.org/EGit/Contributor_Guide#Use_of_the_.22final.22_modifier Change-Id: I4673442310a3a53d838407f7eb11964144bb04d0
* | | | | Ensure FS#searchPath only selects executable filesMatthias Sohn2021-08-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Posix non executable files on the path should be ignored, on Windows File#canExecute always returns true. While we are here also add missing braces. Bug: 575385 Change-Id: I80cd5057bdf9632a17f103db6f1356e975b6e150
* | | | | DFS block cache: Refactor to enable parallel index loadingAlina Djamankulova2021-08-123-40/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change bitmap index creation is not blocked on index and reverse index full initialization in DfsPackFile. Now bitmap index and index could be read from storage in parallel in separate threads. Update PackBitmapIndexV1 constructor to get packIndex and reverseIndex suppliers instead of actual objects. Inner class IdxPositionBitmap was added to initialize pack objects after bitmap index is fully read from storage. Update DfsPackFile and PackBitmapIndex accordingly. Signed-off-by: Alina Djamankulova <adjama@google.com> Change-Id: Iea59ab58501b2acbbf9263412982ec9c6898a7ee
* | | | | Merge branch 'stable-5.12'Thomas Wolf2021-07-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: [test] Create keystore with the keytool of the running JDK Fix garbage collection failing to delete pack file ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: I4b54f4850819736144edb784617ee902f491ffd6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | | Merge branch 'stable-5.11' into stable-5.12Thomas Wolf2021-07-292-2/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: Ie8db450a1fad05bddb812a55b2ceb03b2805403a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | | Merge branch 'stable-5.10' into stable-5.11Thomas Wolf2021-07-292-2/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: I55f4dd19e9fa3b789bd9a79d256fe9abb55ee7f4 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | * | Merge branch 'stable-5.9' into stable-5.10Thomas Wolf2021-07-292-2/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: Ic37426211905d987ddd11480a54d95b86143c94c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | * Merge branch 'stable-5.8' into stable-5.9Thomas Wolf2021-07-292-2/+5
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.8: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: If09cbb877c674f15261715cecef7a2393bf66fa3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | * Merge branch 'stable-5.7' into stable-5.8Thomas Wolf2021-07-292-2/+5
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: I32010c6bf45d5138e17143d6c284ac56434eade1 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | * Merge branch 'stable-5.6' into stable-5.7Thomas Wolf2021-07-292-2/+5
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.6: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: I1f6b4fc26f6ee6f22cc0aacd032c1e73ba246dbc Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | * Merge branch 'stable-5.5' into stable-5.6Thomas Wolf2021-07-291-1/+4
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.5: [test] Create keystore with the keytool of the running JDK Change-Id: Icb0bb6dc4ad05b1f3eb562547893f2e0aedf8775 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | | * Merge branch 'stable-5.4' into stable-5.5Thomas Wolf2021-07-291-1/+4
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.4: [test] Create keystore with the keytool of the running JDK Change-Id: I5ff3dc1c771aeb33af39eb68f166c7282b478cf8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | | | * Merge branch 'stable-5.3' into stable-5.4Thomas Wolf2021-07-291-1/+4
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.3: [test] Create keystore with the keytool of the running JDK Change-Id: If92372b7bfbfb9445fcb934c48dc1cd6610e061b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | | | | * Merge branch 'stable-5.2' into stable-5.3Thomas Wolf2021-07-291-1/+4
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: [test] Create keystore with the keytool of the running JDK Change-Id: I981de862c614986a7b443fed1cce7b895b758682 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | | | | | * Merge branch 'stable-5.1' into stable-5.2Thomas Wolf2021-07-291-1/+4
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: [test] Create keystore with the keytool of the running JDK Change-Id: Ic56f4f23c37432377be88e07d06c5ad75591d84f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | | | | | | * [test] Create keystore with the keytool of the running JDKThomas Wolf2021-07-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call keytool with the absolute path of "java.home". Otherwise a keytool for a different, maybe even newer Java version might be picked up, and then the keystore may not be readable by the JVM used to run the tests. (cherry picked from commit 2d73c702d3e9128b7dc03a01fe2cf18f119d3ffe) Change-Id: Iea77024947a34267f008847d81312fe0abadc615 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | | | * | | | | | ReachabilityCheckerTestCase: fix reachable from self test case Han-Wen Nienhuys2021-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f94a0a0ff401f1691b3757002756b4e83dd8640 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * | | | | | | | | | | | Merge "Merge branch 'stable-5.11' into stable-5.12" into stable-5.12Matthias Sohn2021-06-295-14/+113
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix garbage collection failing to delete pack fileandrewxian20002021-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loosen() method has opened pack file and the open pack file handle may prevent it from being deleted e.g. on Windows. Fix this by closing the pack file only after loosen() finished. Bug: 574178 Change-Id: Icd59931a218d84c9c97b450eea87b21ed01248ff Signed-off-by: andrew.xian2000@gmail.com Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | | | | [gpg] Update to Bouncy Castle 1.69Thomas Wolf2021-07-262-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump lower bound in MANIFEST.MF and adapt code. Change-Id: I3a3c7948e5fc29f5517fe84209fcea81834e8e5b
* | | | | | | | | | | | | | [test] Create keystore with the keytool of the running JDKThomas Wolf2021-07-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call keytool with the absolute path of "java.home". Otherwise a keytool for a different, maybe even newer Java version might be picked up, and then the keystore may not be readable by the JVM used to run the tests. Change-Id: Iea77024947a34267f008847d81312fe0abadc615 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | | | | | [sshd] Minor code clean-upThomas Wolf2021-07-211-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since upstream changed the method profile to throw Exception it's not necessary anymore to re-throw as IOException. Change-Id: I31afab4f6e1a2f0feef79e6abced20d0ca1c493b
* | | | | | | | | | | | | | Support commit.template config propertyJulian Ruppel2021-07-215-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds functionality to read the git commit.template property. The template content is read either via a default encoding or, if present, via encoding specified by i18n.commitEncoding property. Bug: 446355 Change-Id: I0c45db98e324ddff26a7e0262835f259d6528a86 Signed-off-by: Julian Ruppel <julian.ruppel@sap.com>
* | | | | | | | | | | | | | Relax version range for hamcrest and assertjMatthias Sohn2021-07-198-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently cannot use hamcrest 2.2 and assertj 3.20.2 (which requires hamcrest 2.2) in egit tests since other Eclipse dependencies (e.g. swtbot) require hamcrest 1.1. Hence relax version range for these components in jgit so that jgit tests also work when using the egit target platform. Change-Id: I521e2ec4491bd8d790609b8a66a8f14511a865a1
* | | | | | | | | | | | | | bazel: don't expose jsch and jzlib to org.eclipse.jgitMatthias Sohn2021-07-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These libraries are no longer used by org.eclipse.jgit since the code depending on them was moved to org.eclipse.jgit.ssh.jsch. Change-Id: Ic1c66e8ca06d904abf44d84154bbe9a770aa94d5
* | | | | | | | | | | | | | Update orbit to I20210713220109Matthias Sohn2021-07-1640-206/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update - org.apache.commons.compress to 1.20.0.v20210713-192 - org.bouncycastle.bcpg to 1.69.0.v20210713-1924 - org.bouncycastle.bcpkix to 1.69.0.v20210713-1924 - org.bouncycastle.bcprov to 1.69.0.v20210713-1924 - add org.bouncycastle.bcutil 1.69.0.v20210713-1924 In bazel build don't expose bouncycastle to org.eclipse.jgit since it's not used there anymore since code depending on bouncycastle was moved to org.eclipse.jgit.gpg.bc. CQ: 21771 CQ: 23471 CQ: 23472 CQ: 23473 CQ: 23474 Change-Id: Id3d94c00c39bbc57e3f49a61150841249dc3985c
* | | | | | | | | | | | | | Update orbit to I20210711110031Matthias Sohn2021-07-1650-147/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update - assertj to 3.20.2.v20210706-1104 - hamcrest to 2.2.0.v20210711-0821 - classes which were in org.hamcrest.core 1.3 and org.hamcrest.library 1.3 were all moved to org.hamcrest in 2.2 - the annotation org.hamcrest.Factory was removed and is no longer needed - junit 4.13 requires hamcrest-core and hamcrest-library 1.3 therefore keep them in the target platform CQ: 23501 Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95
* | | | | | | | | | | | | | [sshd] Ignore revoked keys in OpenSshServerKeyDatabase.lookup()Thomas Wolf2021-07-162-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes no sense to return revoked keys. Change-Id: I99eee1de3dba5c0c8d275b7c1a24053874b3cb03 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | | | | | | [sshd] Distinguish key type and signature algorithm for host keyThomas Wolf2021-07-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of the rsa-sha2-512 and rsa-sha2-256 signature types, the key type for RSA is no longer automatically the signature algorithm. We re-order the list for the host key proposal such that keys we already have are preferred; this minimizes warnings about new host keys. When doing so, put all of rsa-sha2-512, rsa-sha2-256, and ssh-rsa at the front, in that order, not just ssh-rsa. This ensures that we do prefer RSA keys if we already have an RSA host key, but at the same time we still prefer the stronger signature algorithms over the weaker and deprecated SHA1-based ssh-rsa signature. It also helps avoid a bug found in some Github versions where the Github SSH server uses a rsa-sha2-512 signature even though ssh-rsa was negotiated.[1] [1] https://www.eclipse.org/forums/index.php/t/1108282/ Bug: 574635 Change-Id: I0a49dcfa0c2c93f23118c983cd0bc9e5a467d886 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>