Merge branch '3.2.x'

Closes gh-40831
This commit is contained in:
Andy Wilkinson 2024-05-20 10:15:18 +01:00
commit e752295dca

View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -82,10 +82,10 @@ record CertificateMatchingTestSource(CertificateMatchingTestSource.Algorithm alg
keyPairs.put(algorithm, algorithm.generateKeyPair());
}
List<CertificateMatchingTestSource> parameters = new ArrayList<>();
keyPairs.forEach((algorith, matchingKeyPair) -> {
keyPairs.forEach((algorithm, matchingKeyPair) -> {
List<KeyPair> nonMatchingKeyPairs = new ArrayList<>(keyPairs.values());
nonMatchingKeyPairs.remove(matchingKeyPair);
parameters.add(new CertificateMatchingTestSource(algorith, matchingKeyPair, nonMatchingKeyPairs));
parameters.add(new CertificateMatchingTestSource(algorithm, matchingKeyPair, nonMatchingKeyPairs));
});
return List.copyOf(parameters);
}