Skip to content

Commit 20b236f

Browse files
dghgitdghgit
committed
compatibility updates
1 parent d683199 commit 20b236f

File tree

31 files changed

+4568
-5662
lines changed

31 files changed

+4568
-5662
lines changed

‎build1-1

+581
Large diffs are not rendered by default.

‎build1-2

+528
Large diffs are not rendered by default.

‎build1-3

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh -
2+
#
3+
# build script for 1.3
4+
#
5+
# If it's given a buildname it creates a subdirectory and places a build in it,
6+
# otherwise it just creates the docs and class files.
7+
#
8+
9+
JDKPATH=/opt/jdk1.3.1 # JDK 1.3 location
10+
XALAN_HOME=../apache/xalan-j_2_7_0
11+
W3C_HOME=../w3c
12+
13+
JAVA_HOME=$JDKPATH
14+
export JAVA_HOME
15+
16+
PATH=$JDKPATH/bin:$PATH
17+
export PATH
18+
19+
CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$W3C_HOME/w3c.jar:$XALAN_HOME/serializer.jar:$XALAN_HOME/xalan.jar:$XALAN_HOME/xercesImpl.jar:$XALAN_HOME/xml-apis.jar:$XALAN_HOME/xsltc.jar:$CLASSPATH
20+
export CLASSPATH
21+
22+
if [ "$1" = "test" ]
23+
then
24+
ant -f ant/jdk13.xml test
25+
else
26+
if [ "$1" = "provider" ]
27+
then
28+
ant -f ant/jdk13.xml build-provider
29+
ant -f ant/jdk13.xml zip-src-provider
30+
else
31+
if ant -f ant/jdk13.xml build-jce
32+
then
33+
ant -f ant/jdk13.xml build
34+
ant -f ant/jdk13.xml zip-src
35+
fi
36+
fi
37+
fi

‎core/src/main/java/org/bouncycastle/crypto/digests/SHA512tDigest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class SHA512tDigest
1111
extends LongDigest
1212
{
13-
private final int digestLength;
13+
private int digestLength; // non-final due to old flow analyser.
1414

1515
private long H1t, H2t, H3t, H4t, H5t, H6t, H7t, H8t;
1616

‎core/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCoreEngine.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,9 @@ protected SecureRandom initSecureRandom(boolean needed, SecureRandom provided)
299299
/**
300300
* CS exception for wrong cipher-texts
301301
*/
302-
public class CramerShoupCiphertextException
302+
public static class CramerShoupCiphertextException
303303
extends Exception
304304
{
305-
306305
private static final long serialVersionUID = -6360977166495345076L;
307306

308307
public CramerShoupCiphertextException(String msg)

‎core/src/main/java/org/bouncycastle/crypto/generators/CramerShoupParametersGenerator.java

+104-93
Original file line numberDiff line numberDiff line change
@@ -8,105 +8,116 @@
88
import org.bouncycastle.crypto.params.DHParameters;
99
import org.bouncycastle.util.BigIntegers;
1010

11-
public class CramerShoupParametersGenerator {
12-
13-
private int size;
14-
private int certainty;
15-
private SecureRandom random;
16-
17-
/**
18-
* Initialise the parameters generator.
19-
*
20-
* @param size
21-
* bit length for the prime p
22-
* @param certainty
23-
* a measure of the uncertainty that the caller is willing to tolerate:
24-
* the probability that the generated modulus is prime exceeds (1 - 1/2^certainty).
25-
* The execution time of this method is proportional to the value of this parameter.
26-
* @param random
27-
* a source of randomness
28-
*/
29-
public void init(int size, int certainty, SecureRandom random) {
30-
this.size = size;
31-
this.certainty = certainty;
32-
this.random = random;
33-
}
34-
35-
/**
36-
* which generates the p and g values from the given parameters, returning
37-
* the CramerShoupParameters object.
38-
* <p>
39-
* Note: can take a while...
40-
*/
41-
public CramerShoupParameters generateParameters() {
42-
//
43-
// find a safe prime p where p = 2*q + 1, where p and q are prime.
44-
//
45-
BigInteger[] safePrimes = ParametersHelper.generateSafePrimes(size, certainty, random);
11+
public class CramerShoupParametersGenerator
12+
{
13+
private static final BigInteger ONE = BigInteger.valueOf(1);
14+
15+
private int size;
16+
private int certainty;
17+
private SecureRandom random;
18+
19+
/**
20+
* Initialise the parameters generator.
21+
*
22+
* @param size bit length for the prime p
23+
* @param certainty a measure of the uncertainty that the caller is willing to tolerate:
24+
* the probability that the generated modulus is prime exceeds (1 - 1/2^certainty).
25+
* The execution time of this method is proportional to the value of this parameter.
26+
* @param random a source of randomness
27+
*/
28+
public void init(int size, int certainty, SecureRandom random)
29+
{
30+
this.size = size;
31+
this.certainty = certainty;
32+
this.random = random;
33+
}
34+
35+
/**
36+
* which generates the p and g values from the given parameters, returning
37+
* the CramerShoupParameters object.
38+
* <p/>
39+
* Note: can take a while...
40+
*/
41+
public CramerShoupParameters generateParameters()
42+
{
43+
//
44+
// find a safe prime p where p = 2*q + 1, where p and q are prime.
45+
//
46+
BigInteger[] safePrimes = ParametersHelper.generateSafePrimes(size, certainty, random);
4647

4748
// BigInteger p = safePrimes[0];
48-
BigInteger q = safePrimes[1];
49-
BigInteger g1 = ParametersHelper.selectGenerator(q, random);
50-
BigInteger g2 = ParametersHelper.selectGenerator(q, random);
51-
while(g1.equals(g2)){
52-
g2 = ParametersHelper.selectGenerator(q, random);
53-
}
54-
55-
return new CramerShoupParameters(q, g1, g2, new SHA256Digest());
56-
}
57-
58-
public CramerShoupParameters generateParameters(DHParameters dhParams){
59-
BigInteger p = dhParams.getP();
60-
BigInteger g1 = dhParams.getG();
61-
62-
// now we just need a second generator
63-
BigInteger g2 = ParametersHelper.selectGenerator(p, random);
64-
while(g1.equals(g2)){
65-
g2 = ParametersHelper.selectGenerator(p, random);
66-
}
67-
68-
return new CramerShoupParameters(p, g1, g2, new SHA256Digest());
69-
}
70-
71-
private static class ParametersHelper {
72-
73-
private static final BigInteger TWO = BigInteger.valueOf(2);
74-
75-
/*
76-
* Finds a pair of prime BigInteger's {p, q: p = 2q + 1}
77-
*
78-
* (see: Handbook of Applied Cryptography 4.86)
79-
*/
80-
static BigInteger[] generateSafePrimes(int size, int certainty, SecureRandom random) {
81-
BigInteger p, q;
82-
int qLength = size - 1;
83-
84-
for (;;) {
85-
q = new BigInteger(qLength, 2, random);
86-
p = q.shiftLeft(1).add(BigInteger.ONE);
87-
if (p.isProbablePrime(certainty) && (certainty <= 2 || q.isProbablePrime(certainty))) {
88-
break;
89-
}
90-
}
91-
92-
return new BigInteger[] { p, q };
93-
}
94-
95-
static BigInteger selectGenerator(BigInteger p, SecureRandom random) {
96-
BigInteger pMinusTwo = p.subtract(TWO);
97-
BigInteger g;
49+
BigInteger q = safePrimes[1];
50+
BigInteger g1 = ParametersHelper.selectGenerator(q, random);
51+
BigInteger g2 = ParametersHelper.selectGenerator(q, random);
52+
while (g1.equals(g2))
53+
{
54+
g2 = ParametersHelper.selectGenerator(q, random);
55+
}
56+
57+
return new CramerShoupParameters(q, g1, g2, new SHA256Digest());
58+
}
59+
60+
public CramerShoupParameters generateParameters(DHParameters dhParams)
61+
{
62+
BigInteger p = dhParams.getP();
63+
BigInteger g1 = dhParams.getG();
64+
65+
// now we just need a second generator
66+
BigInteger g2 = ParametersHelper.selectGenerator(p, random);
67+
while (g1.equals(g2))
68+
{
69+
g2 = ParametersHelper.selectGenerator(p, random);
70+
}
71+
72+
return new CramerShoupParameters(p, g1, g2, new SHA256Digest());
73+
}
74+
75+
private static class ParametersHelper
76+
{
77+
78+
private static final BigInteger TWO = BigInteger.valueOf(2);
79+
80+
/*
81+
* Finds a pair of prime BigInteger's {p, q: p = 2q + 1}
82+
*
83+
* (see: Handbook of Applied Cryptography 4.86)
84+
*/
85+
static BigInteger[] generateSafePrimes(int size, int certainty, SecureRandom random)
86+
{
87+
BigInteger p, q;
88+
int qLength = size - 1;
89+
90+
for (; ; )
91+
{
92+
q = new BigInteger(qLength, 2, random);
93+
p = q.shiftLeft(1).add(ONE);
94+
if (p.isProbablePrime(certainty) && (certainty <= 2 || q.isProbablePrime(certainty)))
95+
{
96+
break;
97+
}
98+
}
99+
100+
return new BigInteger[]{p, q};
101+
}
102+
103+
static BigInteger selectGenerator(BigInteger p, SecureRandom random)
104+
{
105+
BigInteger pMinusTwo = p.subtract(TWO);
106+
BigInteger g;
98107

99108
/*
100-
* RFC 2631 2.2.1.2 (and see: Handbook of Applied Cryptography 4.81)
109+
* RFC 2631 2.2.1.2 (and see: Handbook of Applied Cryptography 4.81)
101110
*/
102-
do {
103-
BigInteger h = BigIntegers.createRandomInRange(TWO, pMinusTwo, random);
111+
do
112+
{
113+
BigInteger h = BigIntegers.createRandomInRange(TWO, pMinusTwo, random);
104114

105-
g = h.modPow(TWO, p);
106-
} while (g.equals(BigInteger.ONE));
115+
g = h.modPow(TWO, p);
116+
}
117+
while (g.equals(ONE));
107118

108-
return g;
109-
}
110-
}
119+
return g;
120+
}
121+
}
111122

112123
}

‎core/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class CipherInputStream
2525
{
2626
private static final int INPUT_BUF_SIZE = 2048;
2727

28-
private final SkippingCipher skippingCipher;
29-
private final byte[] inBuf;
28+
private SkippingCipher skippingCipher;
29+
private byte[] inBuf;
3030

3131
private BufferedBlockCipher bufferedBlockCipher;
3232
private StreamCipher streamCipher;

‎core/src/main/java/org/bouncycastle/crypto/params/ECNamedDomainParameters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class ECNamedDomainParameters
1010
extends ECDomainParameters
1111
{
12-
private final ASN1ObjectIdentifier name;
12+
private ASN1ObjectIdentifier name;
1313

1414
public ECNamedDomainParameters(ASN1ObjectIdentifier name, ECCurve curve, ECPoint G, BigInteger n)
1515
{

‎core/src/main/java/org/bouncycastle/crypto/params/KDFCounterParameters.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public final class KDFCounterParameters
3434
implements DerivationParameters
3535
{
3636

37-
private final byte[] ki;
38-
private final byte[] fixedInputDataCounterPrefix;
39-
private final byte[] fixedInputDataCounterSuffix;
40-
private final int r;
37+
private byte[] ki;
38+
private byte[] fixedInputDataCounterPrefix;
39+
private byte[] fixedInputDataCounterSuffix;
40+
private int r;
4141

4242
/**
4343
* Base constructor - suffix fixed input data only.

‎core/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private static BigInteger truncate(BigInteger x, int bitLength)
163163
{
164164
if (x.bitLength() > bitLength)
165165
{
166-
x = x.mod(BigInteger.ONE.shiftLeft(bitLength));
166+
x = x.mod(ONE.shiftLeft(bitLength));
167167
}
168168
return x;
169169
}

‎core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private static BigInteger[] extEuclidBezout(BigInteger[] ab)
213213
BigInteger s0 = ECConstants.ONE, s1 = ECConstants.ZERO;
214214
BigInteger t0 = ECConstants.ZERO, t1 = ECConstants.ONE;
215215

216-
while (r1.compareTo(BigInteger.ONE) > 0)
216+
while (r1.compareTo(ECConstants.ONE) > 0)
217217
{
218218
BigInteger[] qr = r0.divideAndRemainder(r1);
219219
BigInteger q = qr[0], r2 = qr[1];

‎core/src/main/jdk1.1/java/security/cert/X509CertSelector.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.bouncycastle.asn1.ASN1OctetString;
2727
import org.bouncycastle.asn1.ASN1Sequence;
2828
import org.bouncycastle.asn1.ASN1TaggedObject;
29+
import org.bouncycastle.asn1.ASN1GeneralizedTime;
2930
import org.bouncycastle.asn1.DERGeneralizedTime;
3031
import org.bouncycastle.asn1.DEROutputStream;
3132
import org.bouncycastle.asn1.util.ASN1Dump;
@@ -2148,7 +2149,7 @@ public boolean match(Certificate cert)
21482149
// TODO fix this, Sequence contains tagged objects
21492150
ASN1Sequence derObject = (ASN1Sequence)derInputStream
21502151
.readObject();
2151-
DERGeneralizedTime derDate = DERGeneralizedTime
2152+
ASN1GeneralizedTime derDate = DERGeneralizedTime
21522153
.getInstance(derObject.getObjectAt(0));
21532154
SimpleDateFormat dateF = new SimpleDateFormat(
21542155
"yyyyMMddHHmmssZ");

‎core/src/main/jdk1.1/java/util/Collections.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
public class Collections
66
{
7-
public static List EMPTY_LIST = new ArrayList();
7+
public static final List EMPTY_LIST = unmodifiableList(new ArrayList());
8+
public static final Set EMPTY_SET = unmodifiableSet(new HashSet());
89

910
private Collections()
1011
{

0 commit comments

Comments
 (0)