Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bouncycastle from 1.48 to 1.64 #3

Closed
wants to merge 1 commit into from
Closed

Update bouncycastle from 1.48 to 1.64 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="lib/jmf.jar"/>
<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15on-148.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15on-1.64.jar"/>
<classpathentry kind="lib" path="lib/bccontrib-1.0-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="classes"/>
Expand Down
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<property name="zrtp4j-src-zip.name" value="${product.shortname}-src-${product.version}.zip" />

<property name="jmf" value="jmf.jar" />
<property name="bc" value="bcprov-jdk15on-148.jar" />
<property name="bc" value="bcprov-jdk15on-1.64.jar" />
<property name="bccontrib" value="bccontrib-1.0-SNAPSHOT.jar" />
<property name="junit" value="junit-3.8.1.jar" />

Expand Down
Binary file added lib/bcprov-jdk15on-1.64.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/bcprov-jdk15on-148.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions scripts/basicZrtp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Runs the basic ZRTP receiver and transmitter applications to check basis
# functionality
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverZRTP &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverZRTP &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterZRTP
4 changes: 2 additions & 2 deletions scripts/enroll.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# It computes the PBX secret and stores it for the partner ZID record and also sets
# the enrollment flags in the confirm packets.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiPBXEnroll &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiPBXEnroll &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBXEnroll
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBXEnroll
4 changes: 2 additions & 2 deletions scripts/enrolled.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# an enrolled receiver. Instead of using the other party's sas hash value the transmitter
# constructs a sas hash value to enable an easy check if it work out.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiPBXEnroll &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiPBXEnroll &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBXEnrolled
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBXEnrolled
4 changes: 2 additions & 2 deletions scripts/multiZrtp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Runs the multi session ZRTP receiver and transmitter applications to check the
# multisession functionality
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiZRTP
4 changes: 2 additions & 2 deletions scripts/notEnrolled.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# which acts as an not enrolled receiver. The SASRelay packet thus contains the SAS
# type only, the SAS hash value is filled with zero bytes.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBX
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiPBX
2 changes: 1 addition & 1 deletion scripts/recvRun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# Just runs the multi session ZRTP receiver application.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverMultiZRTP
2 changes: 1 addition & 1 deletion scripts/rr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# Just runs the single session ZRTP receiver application.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverZRTP
4 changes: 2 additions & 2 deletions scripts/srtp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverSRTP &
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.ReceiverSRTP &
sleep 2
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterSRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterSRTP
2 changes: 1 addition & 1 deletion scripts/transmRun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# Just runs the multi session ZRTP transmitter application.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterMultiZRTP
2 changes: 1 addition & 1 deletion scripts/tt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# Just runs the single session ZRTP transmitter application.
#
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-148.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterZRTP
java -cp "../lib/jmf.jar:../lib/bcprov-jdk15on-1.64.jar:../lib/bccontrib-1.0-SNAPSHOT.jar:../classes" demo.TransmitterZRTP
2 changes: 1 addition & 1 deletion src/org/bouncycastle/cryptozrtp/params/ECDomainParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public ECDomainParameters(
BigIntegerCrypto b = new BigIntegerCrypto(curveIn.getB().toBigInteger().toByteArray());
this.curve = new ECCurve.Fp(q, a, b);

byte[] encoded = GIn.getEncoded();
byte[] encoded = GIn.getEncoded(false);
this.G = this.curve.decodePoint(encoded);
this.n = new BigIntegerCrypto(nIn.toByteArray());
this.h = new BigIntegerCrypto(hIn.toByteArray());
Expand Down