Merge branch 'master' into next

* master:
  ResolveMerger: Fix the issue with binary modify-modify conflicts
  Explain why RacyGitTests may be flaky in some environments
  PackBitmapIndexBuilder.StoredEntry: add getter for objectId
  PackBitmapIndex: clarify naming of getObject inputs
  Revert "[releng] Bump Bouncy Castle to 1.78"
  [releng] Bump Bouncy Castle to 1.78
  MergeAlgorithm: Fix diff3 conflict hunk computation
  [gpg] Remove obsolete import-package
  [gpg] Correct finding public keys from pubring.gpg
  [gpg] Fix reading ed25519 GPG keys
  PackBitmapIndexBuilder: make StoredEntry constructor public
  PackBitmapIndexBuilder: allow repeated call of getCompressedBitmaps()
  DfsPackFile: Make the loader classes used to construct bitmaps public.
  DfsPackFile: make public the constructor with bitmap loader
  PackWriter: writeBitmapIndex takes bitmap index writer
  Add more tests on rewriting parents in a RevWalk
  PackBitmapIndex: convert from class to interface
  Cache refreshed loose ref dirs in SnapshottingRefDirectory
  DfsGarbageCollectorTest: add test for bitmap index creation
  PackBitmapIndex: hide packChecksum behind getter
  TreeRevFilter: correct changedPathFilter usage for multi-paths inclusion
  PathFilterGroup: implement getPathsBestEffort()
  CleanupService: preload JgitText if not running in OSGi
  DfsPackFile: get commitGraph.readChangePaths from repo config
  CommitGraphLoader: receive readChangedPaths as parameter
  Add pull request template discouraging usage of pull requests
  Update CONTRIBUTING.md to point to GitHub issues
  FS_POSIX.runInShell(): on MacOS use a login shell
  [ssh] Implement the "Ciphers" SSH config
  ShutdownHook: run on bundle deactivation if in OSGi
  [diffmergetool] Fix running command on Cygwin
  [releng] Bump japicmp base version to 6.9.0.202403050737-r
  DfsBlockCache: move cache table specific implementations to a new class
  Prepare 6.10.0-SNAPSHOT builds
  Prepare 6.9.1-SNAPSHOT builds
  JGit v6.9.0.202403050737-r
  JGit v6.9.0.202403050045-r
  Prepare 6.9.0-SNAPSHOT builds
  Introduce core.trustLooseRefStat config
  JGit v6.9.0.202402281855-rc1
  Update SECURITY.md
  DfsObjDatabase: Let object database instantiate DfsPackFiles
  DfsPackFile: Abstract the bitmap loading to support other backends
  Remove unused API problem filters
  Support public key in IdentityFile
  Revert "StartGenerator: Fix parent rewrite with non-default RevFilter"
  Prepare 6.9.0-SNAPSHOT builds
  JGit v6.9.0.202402211805-m3
  DfsReader#getObjectSize: use size index if possible

Change-Id: Ibdde5be8c5c2b3938aeaa4f278020cadcaad36a3

1 files changed, 33 insertions, 0 deletions

diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
index a8fcca7b8e..873945780f 100644
--- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
+++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
@@ -861,4 +861,37 @@ public class ApacheSshTest extends SshTestBase {
 		verifyAuthLog(e.getMessage(), "log in");
 	}
 
+	@Test
+	public void testCipherModificationSingle() throws Exception {
+		cloneWith(
+				"ssh://" + TEST_USER + "@localhost:" + testPort
+						+ "/doesntmatter",
+				defaultCloneDir, null,
+				"IdentityFile " + privateKey1.getAbsolutePath(),
+				"Ciphers aes192-ctr");
+	}
+
+	@Test
+	public void testCipherModificationAdd() throws Exception {
+		cloneWith(
+				"ssh://" + TEST_USER + "@localhost:" + testPort
+						+ "/doesntmatter",
+				defaultCloneDir, null,
+				"IdentityFile " + privateKey1.getAbsolutePath(),
+				"Ciphers +3des-cbc");
+	}
+
+	@Test
+	public void testCipherModificationUnknown() throws Exception {
+		TransportException e = assertThrows(TransportException.class,
+				() -> cloneWith(
+						"ssh://" + TEST_USER + "@localhost:" + testPort
+								+ "/doesntmatter",
+						defaultCloneDir, null,
+						"IdentityFile " + privateKey1.getAbsolutePath(),
+						// The server is not configured to use this deprecated
+						// algorithm
+						"Ciphers 3des-cbc"));
+		assertTrue(e.getLocalizedMessage().contains("3des-cbc"));
+	}
 }