Skip to content

Commit a91ceab

Browse files
committed
Use one true method modifier order
1 parent 85e2cdd commit a91ceab

File tree

31 files changed

+44
-49
lines changed

31 files changed

+44
-49
lines changed

core/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410NamedParameters.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class GOST3410NamedParameters
1515
static final Hashtable params = new Hashtable();
1616
static final Hashtable names = new Hashtable();
1717

18-
static private GOST3410ParamSetParameters cryptoProA = new GOST3410ParamSetParameters(
18+
private static final GOST3410ParamSetParameters cryptoProA = new GOST3410ParamSetParameters(
1919
1024,
2020
new BigInteger("127021248288932417465907042777176443525787653508916535812817507265705031260985098497423188333483401180925999995120988934130659205614996724254121049274349357074920312769561451689224110579311248812610229678534638401693520013288995000362260684222750813532307004517341633685004541062586971416883686778842537820383"),
2121
new BigInteger("68363196144955700784444165611827252895102170888761442055095051287550314083023"),
@@ -32,7 +32,7 @@ public class GOST3410NamedParameters
3232

3333
);
3434

35-
static private GOST3410ParamSetParameters cryptoProB = new GOST3410ParamSetParameters(
35+
private static final GOST3410ParamSetParameters cryptoProB = new GOST3410ParamSetParameters(
3636
1024,
3737
new BigInteger("139454871199115825601409655107690713107041707059928031797758001454375765357722984094124368522288239833039114681648076688236921220737322672160740747771700911134550432053804647694904686120113087816240740184800477047157336662926249423571248823968542221753660143391485680840520336859458494803187341288580489525163"),
3838
new BigInteger("79885141663410976897627118935756323747307951916507639758300472692338873533959"),
@@ -53,7 +53,7 @@ public class GOST3410NamedParameters
5353
//}
5454
);
5555

56-
static private GOST3410ParamSetParameters cryptoProXchA = new GOST3410ParamSetParameters(
56+
private static final GOST3410ParamSetParameters cryptoProXchA = new GOST3410ParamSetParameters(
5757
1024,
5858
new BigInteger("142011741597563481196368286022318089743276138395243738762872573441927459393512718973631166078467600360848946623567625795282774719212241929071046134208380636394084512691828894000571524625445295769349356752728956831541775441763139384457191755096847107846595662547942312293338483924514339614727760681880609734239"),
5959
new BigInteger("91771529896554605945588149018382750217296858393520724172743325725474374979801"),

core/src/main/java/org/bouncycastle/crypto/params/DESParameters.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public DESParameters(
1919
/*
2020
* DES Key length in bytes.
2121
*/
22-
static public final int DES_KEY_LENGTH = 8;
22+
public static final int DES_KEY_LENGTH = 8;
2323

2424
/*
2525
* Table of weak and semi-weak keys taken from Schneier pp281
2626
*/
27-
static private final int N_DES_WEAK_KEYS = 16;
27+
private static final int N_DES_WEAK_KEYS = 16;
2828

29-
static private byte[] DES_weak_keys =
29+
private static byte[] DES_weak_keys =
3030
{
3131
/* weak keys */
3232
(byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01, (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01,

core/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class DESedeParameters
66
/*
77
* DES-EDE Key length in bytes.
88
*/
9-
static public final int DES_EDE_KEY_LENGTH = 24;
9+
public static final int DES_EDE_KEY_LENGTH = 24;
1010

1111
public DESedeParameters(
1212
byte[] key)

core/src/main/java/org/bouncycastle/pqc/crypto/cmce/CMCEEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ private static int ctz(long in)
10491049
}
10501050

10511051
/* Used in mov columns*/
1052-
static private long same_mask64(short x, short y)
1052+
private static long same_mask64(short x, short y)
10531053
{
10541054
long mask;
10551055

core/src/main/jdk1.1/java/security/SecurityUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Provider getProvider()
3333
*
3434
* @return null if no algorithm found, an Implementation if it is.
3535
*/
36-
static private Implementation getImplementation(
36+
private static Implementation getImplementation(
3737
String baseName,
3838
String algorithm,
3939
Provider prov)

mls/src/main/java/org/bouncycastle/mls/TranscriptHash.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public TranscriptHash(MlsCipherSuite suite, byte[] confirmed, byte[] interim)
4242
this.interim = interim;
4343
}
4444

45-
static public TranscriptHash fromConfirmationTag(MlsCipherSuite suite, byte[] confirmed, byte[] confirmationTag)
45+
public static TranscriptHash fromConfirmationTag(MlsCipherSuite suite, byte[] confirmed, byte[] confirmationTag)
4646
throws IOException
4747
{
4848
TranscriptHash out = new TranscriptHash(suite, confirmed.clone(), new byte[0]);

mls/src/main/java/org/bouncycastle/mls/codec/Capabilities.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
public class Capabilities
1111
implements MLSInputStream.Readable, MLSOutputStream.Writable
1212
{
13-
static private final Short[] DEFAULT_SUPPORTED_VERSIONS = {ProtocolVersion.mls10.value};
14-
static private final short[] DEFAULT_SUPPORTED_CIPHERSUITES = MlsCipherSuite.ALL_SUPPORTED_SUITES;
15-
static private final Short[] DEFAULT_SUPPORTED_CREDENTIALS = {CredentialType.basic.value, CredentialType.x509.value};
13+
private static final Short[] DEFAULT_SUPPORTED_VERSIONS = {ProtocolVersion.mls10.value};
14+
private static final short[] DEFAULT_SUPPORTED_CIPHERSUITES = MlsCipherSuite.ALL_SUPPORTED_SUITES;
15+
private static final Short[] DEFAULT_SUPPORTED_CREDENTIALS = {CredentialType.basic.value, CredentialType.x509.value};
1616
List<Short> versions;
1717
List<Short> cipherSuites;
1818
List<Short> extensions;

mls/src/main/java/org/bouncycastle/mls/codec/Credential.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public byte[] getIdentity()
2222
return identity;
2323
}
2424

25-
static public Credential forBasic(byte[] identity)
25+
public static Credential forBasic(byte[] identity)
2626
{
2727
return new Credential(CredentialType.basic, identity, new ArrayList<Certificate>());
2828
}

mls/src/main/java/org/bouncycastle/mls/codec/Extension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Extension(int extensionType, byte[] extension_data)
3232
this.extension_data = extension_data;
3333
}
3434

35-
static public Extension externalSender(List<ExternalSender> list)
35+
public static Extension externalSender(List<ExternalSender> list)
3636
throws IOException
3737
{
3838
MLSOutputStream stream = new MLSOutputStream();

mls/src/main/java/org/bouncycastle/mls/codec/MLSMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public MLSMessage(WireFormat wireFormat)
2323
this.wireFormat = wireFormat;
2424
}
2525

26-
static public MLSMessage externalProposal(MlsCipherSuite suite, byte[] groupID, long epoch, Proposal proposal, int signerIndex, byte[] sigSk)
26+
public static MLSMessage externalProposal(MlsCipherSuite suite, byte[] groupID, long epoch, Proposal proposal, int signerIndex, byte[] sigSk)
2727
throws Exception
2828
{
2929
switch (proposal.getProposalType())
@@ -59,7 +59,7 @@ static public MLSMessage externalProposal(MlsCipherSuite suite, byte[] groupID,
5959
return message;
6060
}
6161

62-
static public MLSMessage keyPackage(KeyPackage keyPackage)
62+
public static MLSMessage keyPackage(KeyPackage keyPackage)
6363
{
6464
MLSMessage message = new MLSMessage(WireFormat.mls_key_package);
6565
message.version = ProtocolVersion.mls10;

0 commit comments

Comments
 (0)