@@ -384,22 +384,22 @@ public class CipherStrings {
384
384
public final static String TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA = "AECDH-AES128-SHA" ;
385
385
public final static String TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA = "AECDH-AES256-SHA" ;
386
386
387
- final static class Def implements Comparable <Def >, Cloneable {
388
-
389
- public final int valid ;
390
- public final String name ;
391
- public final long id ;
392
- public final long algorithms ;
393
- public final long algo_strength ;
394
- public final long algorithm2 ;
395
- public final int strength_bits ;
396
- public final int alg_bits ;
397
- public final long mask ;
398
- public final long mask_strength ;
387
+ static final class Def implements Comparable <Def >, Cloneable {
388
+
389
+ final int valid ;
390
+ final String name ;
391
+ final long id ;
392
+ final long algorithms ;
393
+ final long algo_strength ;
394
+ final long algorithm2 ;
395
+ final int strength_bits ;
396
+ final int alg_bits ;
397
+ final long mask ;
398
+ final long mask_strength ;
399
399
400
400
private volatile String cipherSuite ;
401
401
402
- public Def (int valid , String name , long id , long algorithms , long algo_strength , long algorithm2 , int strength_bits , int alg_bits , long mask , long mask_strength ) {
402
+ Def (int valid , String name , long id , long algorithms , long algo_strength , long algorithm2 , int strength_bits , int alg_bits , long mask , long mask_strength ) {
403
403
this .valid = valid ;
404
404
this .name = name ;
405
405
this .id = id ;
@@ -580,7 +580,7 @@ private static Collection<Def> matchingPattern(
580
580
private final static Map <String , String > SuiteToOSSL ;
581
581
582
582
static {
583
- Definitions = new HashMap <String , Def >(48 );
583
+ Definitions = new HashMap <String , Def >( 48 , 1 );
584
584
Definitions .put (SSL_TXT_ALL ,new Def (0 ,SSL_TXT_ALL , 0 ,SSL_ALL & ~SSL_eNULL & ~SSL_kECDH & ~SSL_kECDHE , SSL_ALL ,0 ,0 ,0 ,SSL_ALL ,SSL_ALL ));
585
585
Definitions .put (SSL_TXT_CMPALL ,new Def (0 ,SSL_TXT_CMPALL ,0 ,SSL_eNULL ,0 ,0 ,0 ,0 ,SSL_ENC_MASK ,0 ));
586
586
Definitions .put (SSL_TXT_CMPDEF ,new Def (0 ,SSL_TXT_CMPDEF ,0 ,SSL_ADH , 0 ,0 ,0 ,0 ,SSL_AUTH_MASK ,0 ));
@@ -627,7 +627,7 @@ private static Collection<Def> matchingPattern(
627
627
Definitions .put (SSL_TXT_MEDIUM ,new Def (0 ,SSL_TXT_MEDIUM ,0 , 0 ,SSL_MEDIUM , 0 ,0 ,0 ,0 ,SSL_STRONG_MASK ));
628
628
Definitions .put (SSL_TXT_HIGH ,new Def (0 ,SSL_TXT_HIGH , 0 , 0 , SSL_HIGH , 0 ,0 ,0 ,0 ,SSL_STRONG_MASK ));
629
629
630
- Ciphers = new ArrayList <Def >( 100 );
630
+ Ciphers = new ArrayList <Def >( 96 );
631
631
/* Cipher 01 */
632
632
Ciphers .add (new Def (
633
633
1 ,
@@ -1808,10 +1808,10 @@ private static Collection<Def> matchingPattern(
1808
1808
SSL_ALL_STRENGTHS
1809
1809
));
1810
1810
1811
- CipherNames = new HashMap <String , Def >(Ciphers .size ());
1811
+ CipherNames = new HashMap <String , Def >(Ciphers .size () + 1 , 1 );
1812
1812
for ( Def def : Ciphers ) CipherNames .put (def .name , def );
1813
1813
1814
- SuiteToOSSL = new HashMap <String , String >(80 );
1814
+ SuiteToOSSL = new HashMap <String , String >( 72 , 1 );
1815
1815
SuiteToOSSL .put ("SSL_RSA_WITH_NULL_MD5" ,"NULL-MD5" );
1816
1816
SuiteToOSSL .put ("SSL_RSA_WITH_NULL_SHA" ,"NULL-SHA" );
1817
1817
SuiteToOSSL .put ("SSL_RSA_EXPORT_WITH_RC4_40_MD5" ,"EXP-RC4-MD5" );
0 commit comments