compatibility changes

dghgit · dghgit · commit e2b9c514b984 · 2015-12-29T08:48:36.000+11:00
diff --git a/bc-build.properties b/bc-build.properties
@@ -1,7 +1,7 @@
 
 release.suffix: 154
 release.name: 1.54
-release.version: 1.54.0
+release.version: 1.54
 release.debug: false
 
 mail.jar.home: /opt/javamail/mail.jar
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsProtocol.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsProtocol.java
@@ -757,7 +757,7 @@ public int readInput(byte[] buffer, int offset, int length)
         catch (IOException e)
         {
             // readApplicationData() only throws if there is no data available, so this should never happen
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.toString()); // early JDK fix.
         }
     }
 
diff --git a/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java b/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java
@@ -14,6 +14,7 @@
 import org.bouncycastle.math.ec.ECAlgorithms;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECFieldElement;
+import org.bouncycastle.util.Integers;
 
 public class TraceOptimizer
 {
@@ -73,7 +74,7 @@ public static void implPrintNonZeroTraceBits(X9ECParameters x9)
                 int tr = calculateTrace(fe);
                 if (tr != 0)
                 {
-                    nonZeroTraceBits.add(i);
+                    nonZeroTraceBits.add(Integers.valueOf(i));
                     System.out.print(" " + i);
                 }
             }
diff --git a/pkix/src/main/java/org/bouncycastle/cms/PKCS7TypedStream.java b/pkix/src/main/java/org/bouncycastle/cms/PKCS7TypedStream.java
@@ -34,7 +34,7 @@ public InputStream getContentStream()
         }
         catch (IOException e)
         {
-            throw new IllegalStateException("unable to convert content to stream: " + e.getMessage(), e);
+            throw new CMSRuntimeException("unable to convert content to stream: " + e.getMessage(), e);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ public int readInput(byte[] buffer, int offset, int length)`
`757`	`757`	`catch (IOException e)`
`758`	`758`	`{`
`759`	`759`	`// readApplicationData() only throws if there is no data available, so this should never happen`
`760`		`- throw new RuntimeException(e);`
	`760`	`+ throw new RuntimeException(e.toString()); // early JDK fix.`
`761`	`761`	`}`
`762`	`762`	`}`
`763`	`763`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import org.bouncycastle.math.ec.ECAlgorithms;`
`15`	`15`	`import org.bouncycastle.math.ec.ECCurve;`
`16`	`16`	`import org.bouncycastle.math.ec.ECFieldElement;`
	`17`	`+import org.bouncycastle.util.Integers;`
`17`	`18`
`18`	`19`	`public class TraceOptimizer`
`19`	`20`	`{`
`@@ -73,7 +74,7 @@ public static void implPrintNonZeroTraceBits(X9ECParameters x9)`
`73`	`74`	`int tr = calculateTrace(fe);`
`74`	`75`	`if (tr != 0)`
`75`	`76`	`{`
`76`		`- nonZeroTraceBits.add(i);`
	`77`	`+ nonZeroTraceBits.add(Integers.valueOf(i));`
`77`	`78`	`System.out.print(" " + i);`
`78`	`79`	`}`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public InputStream getContentStream()`
`34`	`34`	`}`
`35`	`35`	`catch (IOException e)`
`36`	`36`	`{`
`37`		`- throw new IllegalStateException("unable to convert content to stream: " + e.getMessage(), e);`
	`37`	`+ throw new CMSRuntimeException("unable to convert content to stream: " + e.getMessage(), e);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`