Skip to content

Commit c433e29

Browse files
committed
Apply standard code formatting
(to minimise differences between versions)
1 parent 18e4b48 commit c433e29

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,8 @@ private static void init() {
493493
new HashSet<>(Arrays.asList(Encryption.CAMELLIA128, Encryption.CAMELLIA256))));
494494
addListAlias(CAMELLIA128, filterByEncryption(allCiphers, Collections.singleton(Encryption.CAMELLIA128)));
495495
addListAlias(CAMELLIA256, filterByEncryption(allCiphers, Collections.singleton(Encryption.CAMELLIA256)));
496-
addListAlias(CBC, filterByEncryption(allCiphers,
497-
new HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES256, Encryption.CAMELLIA128,
498-
Encryption.CAMELLIA256))));
496+
addListAlias(CBC, filterByEncryption(allCiphers, new HashSet<>(
497+
Arrays.asList(Encryption.AES128, Encryption.AES256, Encryption.CAMELLIA128, Encryption.CAMELLIA256))));
499498
addListAlias(CHACHA20, filterByEncryption(allCiphers, Collections.singleton(Encryption.CHACHA20POLY1305)));
500499
addListAlias(TRIPLE_DES, filterByEncryption(allCiphers, Collections.singleton(Encryption.TRIPLE_DES)));
501500
addListAlias(DES, filterByEncryption(allCiphers, Collections.singleton(Encryption.DES)));
@@ -528,8 +527,7 @@ private static void init() {
528527
addListAlias(kSRP, filterByKeyExchange(allCiphers, Collections.singleton(KeyExchange.SRP)));
529528
addListAlias(SRP, filterByKeyExchange(allCiphers, Collections.singleton(KeyExchange.SRP)));
530529
initialized = true;
531-
addListAlias(DEFAULT, parse(
532-
"ALL:!eNULL:!aNULL:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES:!ARIA"));
530+
addListAlias(DEFAULT, parse("ALL:!eNULL:!aNULL:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES:!ARIA"));
533531
// COMPLEMENTOFDEFAULT is also not exactly as defined by the docs
534532
LinkedHashSet<Cipher> complementOfDefault =
535533
filterByKeyExchange(all, new HashSet<>(Arrays.asList(KeyExchange.EDH, KeyExchange.EECDH)));

0 commit comments

Comments
 (0)