diff --git a/.classpath b/.classpath
index 8ffbfb4..581bbfd 100644
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/build.xml b/build.xml
index 27984ce..2a82435 100644
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/lib/bcprov-jdk15on-1.64.jar b/lib/bcprov-jdk15on-1.64.jar
new file mode 100644
index 0000000..0cb3c8b
Binary files /dev/null and b/lib/bcprov-jdk15on-1.64.jar differ
diff --git a/lib/bcprov-jdk15on-148.jar b/lib/bcprov-jdk15on-148.jar
deleted file mode 100644
index 3fcb136..0000000
Binary files a/lib/bcprov-jdk15on-148.jar and /dev/null differ
diff --git a/scripts/basicZrtp.sh b/scripts/basicZrtp.sh
index 300bcac..615e4a3 100755
--- a/scripts/basicZrtp.sh
+++ b/scripts/basicZrtp.sh
@@ -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
diff --git a/scripts/enroll.sh b/scripts/enroll.sh
index e5d0d62..8818e63 100755
--- a/scripts/enroll.sh
+++ b/scripts/enroll.sh
@@ -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
diff --git a/scripts/enrolled.sh b/scripts/enrolled.sh
index cfbcea8..9191b15 100755
--- a/scripts/enrolled.sh
+++ b/scripts/enrolled.sh
@@ -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
diff --git a/scripts/multiZrtp.sh b/scripts/multiZrtp.sh
index 8ea80d6..70a38ca 100755
--- a/scripts/multiZrtp.sh
+++ b/scripts/multiZrtp.sh
@@ -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
diff --git a/scripts/notEnrolled.sh b/scripts/notEnrolled.sh
index 9d25e95..76286d8 100755
--- a/scripts/notEnrolled.sh
+++ b/scripts/notEnrolled.sh
@@ -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
diff --git a/scripts/recvRun.sh b/scripts/recvRun.sh
index 696c710..babce49 100755
--- a/scripts/recvRun.sh
+++ b/scripts/recvRun.sh
@@ -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
diff --git a/scripts/rr.sh b/scripts/rr.sh
index 1c9879d..115e99d 100755
--- a/scripts/rr.sh
+++ b/scripts/rr.sh
@@ -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
diff --git a/scripts/srtp.sh b/scripts/srtp.sh
index 0c1171a..5679155 100755
--- a/scripts/srtp.sh
+++ b/scripts/srtp.sh
@@ -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
diff --git a/scripts/transmRun.sh b/scripts/transmRun.sh
index fedcd09..9c918f5 100755
--- a/scripts/transmRun.sh
+++ b/scripts/transmRun.sh
@@ -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
diff --git a/scripts/tt.sh b/scripts/tt.sh
index 7a012f7..b4140a7 100755
--- a/scripts/tt.sh
+++ b/scripts/tt.sh
@@ -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
diff --git a/src/org/bouncycastle/cryptozrtp/params/ECDomainParameters.java b/src/org/bouncycastle/cryptozrtp/params/ECDomainParameters.java
index 4017223..abf7638 100755
--- a/src/org/bouncycastle/cryptozrtp/params/ECDomainParameters.java
+++ b/src/org/bouncycastle/cryptozrtp/params/ECDomainParameters.java
@@ -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());