svn commit: r5154 - "Reorganize the crypto functions"


#1

Hey Werner,

Thanks for the reorganization! We could use the 1.5 Megs from the
embedded DB that's going to be implemented in this year's GSoC :slight_smile:

Concerning the change:

- <zipfileset src="\{lib\.noinst\}/zrtp4j\-1\.4\.3\.jar&quot; prefix=&quot;&quot;/&gt; \+ &lt;zipfileset src=&quot;{lib.noinst}/zrtp4j-1.4.4.jar" prefix=""/>

You might want to rename that to simply zrtp4j.jar. This would spare
you the need to modify the build.xml, the eclipse and the netbeans
project files every time you upgrade to a new version (and the risk of
having someone else upgrade it without doing all the related
modifications)

We recently did the same for all jain-sip jars. In order still be
able to to keep track of the lib version we now have an
"Original-Jar-Name:" parameter in the manifests of all the jain-sip
jars. Life is easier this way.

What do you think?

Cheers
Emil

路路路

---------- Forwarded message ----------

From: <wernerd@dev.java.net>

Date: Sun, Mar 22, 2009 at 3:34 PM
Subject: svn commit: r5154 - trunk: . ide/eclipse ide/nbproject lib
lib/installer-exclude
src/net/java/sip/communicator/impl/media/transform/zrtp
To: commits@sip-communicator.dev.java.net

Author: wernerd
Date: 2009-03-22 13:34:36+0000
New Revision: 5154

Added:
trunk/lib/installer-exclude/zrtp4j-1.4.4.jar (contents, props changed)
Removed:
trunk/lib/bcprovider.jar
trunk/lib/installer-exclude/zrtp4j-1.4.3.jar
Modified:
trunk/build.xml
trunk/ide/eclipse/.classpath
trunk/ide/nbproject/project.xml
trunk/lib/felix.client.run.properties
trunk/lib/felix.unit.test.properties
trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java

Log:
Reorganize the crypto functions. ZRTP4J library now contains al
required crypto methods and
classes. These classes are copied from BouncyCastle. The DH related
classes are modified to
use a crypto aware big integer implementation. Due to this
reorganization we can remove
the old BC library - this saves about 1.5MB.

Modified: trunk/build.xml
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/build.xml?view=diff&rev=5154&p1=trunk/build.xml&p2=trunk/build.xml&r1=5153&r2=5154

--- trunk/build.xml (original)
+++ trunk/build.xml 2009-03-22 13:34:36+0000
@@ -1935,15 +1935,16 @@
<jar compress="true" destfile="${bundles.dest}/zrtp4j.jar"
filesetmanifest="merge">

- <zipfileset src="\{lib\.noinst\}/zrtp4j\-1\.4\.3\.jar&quot; prefix=&quot;&quot;/&gt; \+ &lt;zipfileset src=&quot;{lib.noinst}/zrtp4j-1.4.4.jar" prefix=""/>
<manifest>
- <attribute name="Export-Package"
value="gnu.java.zrtp,gnu.java.zrtp.packets,gnu.java.zrtp.utils,gnu.java.zrtp.zidfile"/>
- <attribute name="Import-Package" value="
org.bouncycastle.crypto,org.bouncycastle.crypto.digests,org.bouncycastle.crypto.macs,
-
org.bouncycastle.crypto.params,org.bouncycastle.crypto.engines,org.bouncycastle.crypto.agreement,
-
org.bouncycastle.crypto.generators,org.bouncycastle.crypto.modes "/>
+ <attribute name="Export-Package"
value="gnu.java.zrtp,gnu.java.zrtp.packets,
+ gnu.java.zrtp.utils,gnu.java.zrtp.zidfile,
+
org.bouncycastle.crypto,org.bouncycastle.crypto.digests,org.bouncycastle.crypto.macs,
+
org.bouncycastle.crypto.params,org.bouncycastle.crypto.engines,
+ org.bouncycastle.crypto.modes"/>
<attribute name="Bundle-Name" value="ZRTP4J"/>
<attribute name="Bundle-Description" value="ZRTP for
Java library."/>
- <attribute name="Bundle-Version" value="1.4.3"/>
+ <attribute name="Bundle-Version" value="1.4.4"/>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>

Modified: trunk/ide/eclipse/.classpath
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/ide/eclipse/.classpath?view=diff&rev=5154&p1=trunk/ide/eclipse/.classpath&p2=trunk/ide/eclipse/.classpath&r1=5153&r2=5154

--- trunk/ide/eclipse/.classpath (original)
+++ trunk/ide/eclipse/.classpath 2009-03-22 13:34:36+0000
@@ -46,7 +46,7 @@
<classpathentry kind="lib"
path="lib/installer-exclude/swing-worker-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/transparency.jar"/>
<classpathentry kind="lib"
path="lib/installer-exclude/ymsg_network_v0_63.jar"/>
- <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-1.4.3.jar"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-1.4.4.jar"/>
<classpathentry kind="lib"
path="lib/os-specific/linux/installer-exclude/jmf.jar"/>
<classpathentry kind="lib" path="lib/os-specific/linux/jdic_stub.jar"/>
<classpathentry kind="lib"
path="lib/os-specific/mac/installer-exclude/jmf.jar"/>

Modified: trunk/ide/nbproject/project.xml
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/ide/nbproject/project.xml?view=diff&rev=5154&p1=trunk/ide/nbproject/project.xml&p2=trunk/ide/nbproject/project.xml&r1=5153&r2=5154

--- trunk/ide/nbproject/project.xml (original)
+++ trunk/ide/nbproject/project.xml 2009-03-22 13:34:36+0000
@@ -122,7 +122,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src</package-root>
- <classpath
mode="compile">lib/bcprovider.jar:lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b2.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/ymsg_network_v0_63.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/pircbot.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/solaris/installer-exclude/jmf.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/izpack-shortcut-link.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/KeybindingUtil.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/zrtp4j-1.4.3.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar</classpath>
+ <classpath
mode="compile">lib/bcprovider.jar:lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b2.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/ymsg_network_v0_63.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/pircbot.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/solaris/installer-exclude/jmf.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/izpack-shortcut-link.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/KeybindingUtil.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/zrtp4j-1.4.4.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar</classpath>
<built-to>classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>

Removed: trunk/lib/bcprovider.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/bcprovider.jar?view=auto&rev=5153

Modified: trunk/lib/felix.client.run.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/felix.client.run.properties?view=diff&rev=5154&p1=trunk/lib/felix.client.run.properties&p2=trunk/lib/felix.client.run.properties&r1=5153&r2=5154

--- trunk/lib/felix.client.run.properties (original)
+++ trunk/lib/felix.client.run.properties 2009-03-22 13:34:36+0000
@@ -47,14 +47,6 @@
quicktime.std.image; \
org.xml.sax.helpers; \
net.java.sip.communicator.util.launchutils; \
- org.bouncycastle.crypto; \
- org.bouncycastle.crypto.digests; \
- org.bouncycastle.crypto.macs; \
- org.bouncycastle.crypto.params; \
- org.bouncycastle.crypto.agreement; \
- org.bouncycastle.crypto.generators; \
- org.bouncycastle.crypto.modes; \
- org.bouncycastle.crypto.engines; \
javax.crypto; \
javax.crypto.spec; \
javax.crypto.interfaces;

Modified: trunk/lib/felix.unit.test.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/felix.unit.test.properties?view=diff&rev=5154&p1=trunk/lib/felix.unit.test.properties&p2=trunk/lib/felix.unit.test.properties&r1=5153&r2=5154

--- trunk/lib/felix.unit.test.properties (original)
+++ trunk/lib/felix.unit.test.properties 2009-03-22 13:34:36+0000
@@ -37,14 +37,6 @@
javax.naming.directory; \
javax.net; \
javax.net.ssl; \
- org.bouncycastle.crypto; \
- org.bouncycastle.crypto.digests; \
- org.bouncycastle.crypto.macs; \
- org.bouncycastle.crypto.params; \
- org.bouncycastle.crypto.agreement; \
- org.bouncycastle.crypto.generators; \
- org.bouncycastle.crypto.modes; \
- org.bouncycastle.crypto.engines; \
gnu.java.zrtp; \
gnu.java.zrtp.packets; \
gnu.java.zrtp.utils; \
@@ -54,6 +46,15 @@
com.apple.cocoa.application; \
net.java.sip.communicator.service.audionotifier; \

+# org.bouncycastle.crypto; \
+# org.bouncycastle.crypto.digests; \
+# org.bouncycastle.crypto.macs; \
+# org.bouncycastle.crypto.params; \
+# org.bouncycastle.crypto.agreement; \
+# org.bouncycastle.crypto.generators; \
+# org.bouncycastle.crypto.modes; \
+# org.bouncycastle.crypto.engines; \
+
#
# In case you want testing to run using oscar's graphical ui then uncomment
#

Removed: trunk/lib/installer-exclude/zrtp4j-1.4.3.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/installer-exclude/zrtp4j-1.4.3.jar?view=auto&rev=5153

Added: trunk/lib/installer-exclude/zrtp4j-1.4.4.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/installer-exclude/zrtp4j-1.4.4.jar?view=auto&rev=5154

Binary file. No diff available.

Modified: trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java?view=diff&rev=5154&p1=trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java&p2=trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java&r1=5153&r2=5154

--- trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
(original)
+++ trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
2009-03-22 13:34:36+0000
@@ -601,7 +601,7 @@
return null;
}
byte[] extHeader = zPkt.getMessagePart();
- zrtpEngine.processZrtpMessage(extHeader);
+ zrtpEngine.processZrtpMessage(extHeader, zPkt.getSSRC());
}
return null;
}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net


#2

Emil Ivov schrieb:

Hey Werner,

Thanks for the reorganization! We could use the 1.5 Megs from the
embedded DB that's going to be implemented in this year's GSoC :slight_smile:

Wow - we will have a full relational DB in SC? Can we perfom a
real "business Intelligence" run over all the calls I have placed in the
last years or so :wink:

Concerning the change:

- <zipfileset src="${lib.noinst}/zrtp4j-1.4.3.jar" prefix=""/>
+ <zipfileset src="${lib.noinst}/zrtp4j-1.4.4.jar" prefix=""/>

You might want to rename that to simply zrtp4j.jar. This would spare
you the need to modify the build.xml, the eclipse and the netbeans
project files every time you upgrade to a new version (and the risk of
having someone else upgrade it without doing all the related
modifications)

We recently did the same for all jain-sip jars. In order still be
able to to keep track of the lib version we now have an
"Original-Jar-Name:" parameter in the manifests of all the jain-sip
jars. Life is easier this way.

What do you think?

Good idea - I'll check this an do the necessary updates the next time.

Can you plase have an eye on the next cruise control run if all goes well
after the update? Thanks.

Cheers
Emil

Regards,
Werner

路路路

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#3

Emil Ivov schrieb:

Hey Werner,

Thanks for the reorganization! We could use the 1.5 Megs from the
embedded DB that's going to be implemented in this year's GSoC :slight_smile:

Concerning the change:

- <zipfileset src="${lib.noinst}/zrtp4j-1.4.3.jar" prefix=""/>
+ <zipfileset src="${lib.noinst}/zrtp4j-1.4.4.jar" prefix=""/>

Ahh - I forgot to mention that this update also covers the enhancements
required by the latest ZRTP draft (draft 15).

Regards,
Werner

路路路

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#4

Emil,

cruise control just reprted an error. What is package 24 in the
tests? I removed the bouncycastle imports from the test properties
similar as I did in the runtime properties.

The media bundle explicitly imports BC and ZRTP and ZRTP exports
both. Do the test runs need them anywhere else?

Regards,
Werner

Werner Dittmann schrieb:

路路路

Can you plase have an eye on the next cruise control run if all goes well
after the update? Thanks.

Cheers
Emil

Regards,
Werner

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#5

Hey Werner,

Emil,

cruise control just reprted an error.

Yup, was just looking at it.

What is package 24 in the tests?

That's the media bundle

I removed the bouncycastle imports from the test properties
similar as I did in the runtime properties.

The media bundle explicitly imports BC and ZRTP and ZRTP exports
both. Do the test runs need them anywhere else?

Here's the exception message we get:

Unresolved constraint in bundle 24: package; (&(package=org.bouncycastle.crypto.digests)(version>=0.0.0))

Just had a look at the bundle-zrtp4j target and my attention was drawn
to the format of the Export-Package manifest param. The Java manifest
parser is pretty fussy about whitespaces, so I believe that's what's
causing the problem.

I need to run now but will try to investigate more later in case you
haven't resolved it by then.

Cheers
Emil

路路路

On Sun, Mar 22, 2009 at 4:09 PM, Werner Dittmann <Werner.Dittmann@t-online.de> wrote:

Regards,
Werner

Werner Dittmann schrieb:

Can you plase have an eye on the next cruise control run if all goes well
after the update? Thanks.

Cheers
Emil

Regards,
Werner

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#6

Hi guys,

If lib/bcprovider.jar which has been deleted is no longer needed, we
have to remove it from the Eclipse .classpath, the NetBeans
project.xml and the resources\install files which reference it
including run.exe. Otherwise, it prevents working with Eclipse right
now.

Regards,
Lubo

路路路

From: <wernerd@dev.java.net>
Date: Sun, Mar 22, 2009 at 3:34 PM
Subject: svn commit: r5154 - trunk: . ide/eclipse ide/nbproject lib
lib/installer-exclude
src/net/java/sip/communicator/impl/media/transform/zrtp
To: commits@sip-communicator.dev.java.net

Author: wernerd
Date: 2009-03-22 13:34:36+0000
New Revision: 5154

Added:
trunk/lib/installer-exclude/zrtp4j-1.4.4.jar (contents, props changed)
Removed:
trunk/lib/bcprovider.jar
trunk/lib/installer-exclude/zrtp4j-1.4.3.jar
Modified:
trunk/build.xml
trunk/ide/eclipse/.classpath
trunk/ide/nbproject/project.xml
trunk/lib/felix.client.run.properties
trunk/lib/felix.unit.test.properties
trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java

Log:
Reorganize the crypto functions. ZRTP4J library now contains al
required crypto methods and
classes. These classes are copied from BouncyCastle. The DH related
classes are modified to
use a crypto aware big integer implementation. Due to this
reorganization we can remove
the old BC library - this saves about 1.5MB.

Modified: trunk/build.xml
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/build.xml?view=diff&rev=5154&p1=trunk/build.xml&p2=trunk/build.xml&r1=5153&r2=5154

--- trunk/build.xml (original)
+++ trunk/build.xml 2009-03-22 13:34:36+0000
@@ -1935,15 +1935,16 @@
<jar compress="true" destfile="${bundles.dest}/zrtp4j.jar"
filesetmanifest="merge">

- <zipfileset src="\{lib\.noinst\}/zrtp4j\-1\.4\.3\.jar&quot; prefix=&quot;&quot;/&gt; \+ &lt;zipfileset src=&quot;{lib.noinst}/zrtp4j-1.4.4.jar" prefix=""/>
<manifest>
- <attribute name="Export-Package"
value="gnu.java.zrtp,gnu.java.zrtp.packets,gnu.java.zrtp.utils,gnu.java.zrtp.zidfile"/>
- <attribute name="Import-Package" value="
org.bouncycastle.crypto,org.bouncycastle.crypto.digests,org.bouncycastle.crypto.macs,
-
org.bouncycastle.crypto.params,org.bouncycastle.crypto.engines,org.bouncycastle.crypto.agreement,
-
org.bouncycastle.crypto.generators,org.bouncycastle.crypto.modes "/>
+ <attribute name="Export-Package"
value="gnu.java.zrtp,gnu.java.zrtp.packets,
+ gnu.java.zrtp.utils,gnu.java.zrtp.zidfile,
+
org.bouncycastle.crypto,org.bouncycastle.crypto.digests,org.bouncycastle.crypto.macs,
+
org.bouncycastle.crypto.params,org.bouncycastle.crypto.engines,
+ org.bouncycastle.crypto.modes"/>
<attribute name="Bundle-Name" value="ZRTP4J"/>
<attribute name="Bundle-Description" value="ZRTP for
Java library."/>
- <attribute name="Bundle-Version" value="1.4.3"/>
+ <attribute name="Bundle-Version" value="1.4.4"/>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>

Modified: trunk/ide/eclipse/.classpath
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/ide/eclipse/.classpath?view=diff&rev=5154&p1=trunk/ide/eclipse/.classpath&p2=trunk/ide/eclipse/.classpath&r1=5153&r2=5154

--- trunk/ide/eclipse/.classpath (original)
+++ trunk/ide/eclipse/.classpath 2009-03-22 13:34:36+0000
@@ -46,7 +46,7 @@
<classpathentry kind="lib"
path="lib/installer-exclude/swing-worker-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/transparency.jar"/>
<classpathentry kind="lib"
path="lib/installer-exclude/ymsg_network_v0_63.jar"/>
- <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-1.4.3.jar"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-1.4.4.jar"/>
<classpathentry kind="lib"
path="lib/os-specific/linux/installer-exclude/jmf.jar"/>
<classpathentry kind="lib" path="lib/os-specific/linux/jdic_stub.jar"/>
<classpathentry kind="lib"
path="lib/os-specific/mac/installer-exclude/jmf.jar"/>

Modified: trunk/ide/nbproject/project.xml
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/ide/nbproject/project.xml?view=diff&rev=5154&p1=trunk/ide/nbproject/project.xml&p2=trunk/ide/nbproject/project.xml&r1=5153&r2=5154

--- trunk/ide/nbproject/project.xml (original)
+++ trunk/ide/nbproject/project.xml 2009-03-22 13:34:36+0000
@@ -122,7 +122,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src</package-root>
- <classpath
mode="compile">lib/bcprovider.jar:lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b2.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/ymsg_network_v0_63.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/pircbot.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/solaris/installer-exclude/jmf.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/izpack-shortcut-link.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/KeybindingUtil.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/zrtp4j-1.4.3.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar</classpath>
+ <classpath
mode="compile">lib/bcprovider.jar:lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b2.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/ymsg_network_v0_63.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/pircbot.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/solaris/installer-exclude/jmf.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/izpack-shortcut-link.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/KeybindingUtil.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/zrtp4j-1.4.4.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar</classpath>
<built-to>classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>

Removed: trunk/lib/bcprovider.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/bcprovider.jar?view=auto&rev=5153

Modified: trunk/lib/felix.client.run.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/felix.client.run.properties?view=diff&rev=5154&p1=trunk/lib/felix.client.run.properties&p2=trunk/lib/felix.client.run.properties&r1=5153&r2=5154

--- trunk/lib/felix.client.run.properties (original)
+++ trunk/lib/felix.client.run.properties 2009-03-22 13:34:36+0000
@@ -47,14 +47,6 @@
quicktime.std.image; \
org.xml.sax.helpers; \
net.java.sip.communicator.util.launchutils; \
- org.bouncycastle.crypto; \
- org.bouncycastle.crypto.digests; \
- org.bouncycastle.crypto.macs; \
- org.bouncycastle.crypto.params; \
- org.bouncycastle.crypto.agreement; \
- org.bouncycastle.crypto.generators; \
- org.bouncycastle.crypto.modes; \
- org.bouncycastle.crypto.engines; \
javax.crypto; \
javax.crypto.spec; \
javax.crypto.interfaces;

Modified: trunk/lib/felix.unit.test.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/felix.unit.test.properties?view=diff&rev=5154&p1=trunk/lib/felix.unit.test.properties&p2=trunk/lib/felix.unit.test.properties&r1=5153&r2=5154

--- trunk/lib/felix.unit.test.properties (original)
+++ trunk/lib/felix.unit.test.properties 2009-03-22 13:34:36+0000
@@ -37,14 +37,6 @@
javax.naming.directory; \
javax.net; \
javax.net.ssl; \
- org.bouncycastle.crypto; \
- org.bouncycastle.crypto.digests; \
- org.bouncycastle.crypto.macs; \
- org.bouncycastle.crypto.params; \
- org.bouncycastle.crypto.agreement; \
- org.bouncycastle.crypto.generators; \
- org.bouncycastle.crypto.modes; \
- org.bouncycastle.crypto.engines; \
gnu.java.zrtp; \
gnu.java.zrtp.packets; \
gnu.java.zrtp.utils; \
@@ -54,6 +46,15 @@
com.apple.cocoa.application; \
net.java.sip.communicator.service.audionotifier; \

+# org.bouncycastle.crypto; \
+# org.bouncycastle.crypto.digests; \
+# org.bouncycastle.crypto.macs; \
+# org.bouncycastle.crypto.params; \
+# org.bouncycastle.crypto.agreement; \
+# org.bouncycastle.crypto.generators; \
+# org.bouncycastle.crypto.modes; \
+# org.bouncycastle.crypto.engines; \
+
#
# In case you want testing to run using oscar's graphical ui then uncomment
#

Removed: trunk/lib/installer-exclude/zrtp4j-1.4.3.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/installer-exclude/zrtp4j-1.4.3.jar?view=auto&rev=5153

Added: trunk/lib/installer-exclude/zrtp4j-1.4.4.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/installer-exclude/zrtp4j-1.4.4.jar?view=auto&rev=5154

Binary file. No diff available.

Modified: trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java?view=diff&rev=5154&p1=trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java&p2=trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java&r1=5153&r2=5154

--- trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
(original)
+++ trunk/src/net/java/sip/communicator/impl/media/transform/zrtp/ZRTPTransformEngine.java
2009-03-22 13:34:36+0000
@@ -601,7 +601,7 @@
return null;
}
byte[] extHeader = zPkt.getMessagePart();
- zrtpEngine.processZrtpMessage(extHeader);
+ zrtpEngine.processZrtpMessage(extHeader, zPkt.getSSRC());
}
return null;
}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#7

Emil,

the build is ok now - test run.

What baffles me is the difference between the runtime properties and
the test properties. The runtime does not require the explicit import
of *.zrtp.** and BC classes, the test properties require it.

Regards,
Werner

Emil Ivov schrieb:

路路路

Hey Werner,

On Sun, Mar 22, 2009 at 4:09 PM, Werner Dittmann > <Werner.Dittmann@t-online.de> wrote:

Emil,

cruise control just reprted an error.

Yup, was just looking at it.

What is package 24 in the tests?

That's the media bundle

I removed the bouncycastle imports from the test properties
similar as I did in the runtime properties.

The media bundle explicitly imports BC and ZRTP and ZRTP exports
both. Do the test runs need them anywhere else?

Here's the exception message we get:

Unresolved constraint in bundle 24: package; (&(package=org.bouncycastle.crypto.digests)(version>=0.0.0))

Just had a look at the bundle-zrtp4j target and my attention was drawn
to the format of the Export-Package manifest param. The Java manifest
parser is pretty fussy about whitespaces, so I believe that's what's
causing the problem.

I need to run now but will try to investigate more later in case you
haven't resolved it by then.

Cheers
Emil

Regards,
Werner

Werner Dittmann schrieb:

Can you plase have an eye on the next cruise control run if all goes well
after the update? Thanks.

Cheers
Emil

Regards,
Werner

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#8

Hi Lubo,

thanks for fxing the problem.

Regards,
Werner

Lubomir Marinov schrieb:

路路路

Hi guys,

If lib/bcprovider.jar which has been deleted is no longer needed, we
have to remove it from the Eclipse .classpath, the NetBeans
project.xml and the resources\install files which reference it
including run.exe. Otherwise, it prevents working with Eclipse right
now.

Regards,
Lubo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#9

Hey Werner,

Werner Dittmann wrote:

Emil,

the build is ok now - test run.

Excellent. Thanks for taking care of it.

What baffles me is the difference between the runtime properties and
the test properties. The runtime does not require the explicit import
of *.zrtp.** and BC classes, the test properties require it.

There seems to be a slight inconsistency in the way we are providing
access to the bouncycastle and zrtp packages in both environments. From
what I can see when we run the client (felix.client.run.properties) we
also load the zrtp bundle which exports both of them.

When running the tests however we don't load the zrtp bundle and hence
the need to declare the packages as system. I guess your intention was
to use the zrtp bundle in both cases, right?

Incidentally, both the test and the run evnironments seem to declare the
bouncycastle packages as system while they are also provided by the zrtp
bundle. We should probably get rid of the declaration in the system
packages list to avoid potential conflicts in case the packages would
also be on the classpath.

Am I making sense?

Cheers
Emil

路路路

Regards,
Werner

Emil Ivov schrieb:

Hey Werner,

On Sun, Mar 22, 2009 at 4:09 PM, Werner Dittmann >> <Werner.Dittmann@t-online.de> wrote:

Emil,

cruise control just reprted an error.

Yup, was just looking at it.

What is package 24 in the tests?

That's the media bundle

I removed the bouncycastle imports from the test properties
similar as I did in the runtime properties.

The media bundle explicitly imports BC and ZRTP and ZRTP exports
both. Do the test runs need them anywhere else?

Here's the exception message we get:

Unresolved constraint in bundle 24: package; (&(package=org.bouncycastle.crypto.digests)(version>=0.0.0))

Just had a look at the bundle-zrtp4j target and my attention was drawn
to the format of the Export-Package manifest param. The Java manifest
parser is pretty fussy about whitespaces, so I believe that's what's
causing the problem.

I need to run now but will try to investigate more later in case you
haven't resolved it by then.

Cheers
Emil

Regards,
Werner

Werner Dittmann schrieb:

Can you plase have an eye on the next cruise control run if all goes well
after the update? Thanks.

Cheers
Emil

Regards,
Werner

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#10

Emil,

Emil Ivov schrieb:

Hey Werner,

Werner Dittmann wrote:

Emil,

the build is ok now - test run.

Excellent. Thanks for taking care of it.

What baffles me is the difference between the runtime properties and
the test properties. The runtime does not require the explicit import
of *.zrtp.** and BC classes, the test properties require it.

There seems to be a slight inconsistency in the way we are providing
access to the bouncycastle and zrtp packages in both environments. From
what I can see when we run the client (felix.client.run.properties) we
also load the zrtp bundle which exports both of them.

Yes, the ZRTP bundle now exports ZRTP as well as BC. Previously we had the
BC stuff in a separate library that was not part of a bundle, hence we needed
to declare them as "system" (at least this is my understanding of the Felix
way of doing it).

When running the tests however we don't load the zrtp bundle and hence
the need to declare the packages as system. I guess your intention was
to use the zrtp bundle in both cases, right?

Right. As you may have seen the run properties don't declare the BC nor
the ZRTP packages as "system" packages anymore because zrtp-bundle is
started/loaded as "felix.auto.start.49" just before the media stuff (52).

Incidentally, both the test and the run evnironments seem to declare the
bouncycastle packages as system while they are also provided by the zrtp
bundle. We should probably get rid of the declaration in the system
packages list to avoid potential conflicts in case the packages would
also be on the classpath.

In the last update I already removed the BC packages from the system import
in the run properties because they are now part of the ZRTP bundle.

Am I making sense?

As usual :wink: . IMHO we shall load the zrtp bundle during the test properties
in a similar way as in the run properties.

Cheers
Emil

Regards,
Werner

路路路

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#11

Werner Dittmann wrote:

Emil,

Emil Ivov schrieb:

Hey Werner,

Werner Dittmann wrote:

Emil,

the build is ok now - test run.

Excellent. Thanks for taking care of it.

What baffles me is the difference between the runtime properties and
the test properties. The runtime does not require the explicit import
of *.zrtp.** and BC classes, the test properties require it.

There seems to be a slight inconsistency in the way we are providing
access to the bouncycastle and zrtp packages in both environments. From
what I can see when we run the client (felix.client.run.properties) we
also load the zrtp bundle which exports both of them.

Yes, the ZRTP bundle now exports ZRTP as well as BC. Previously we had the
BC stuff in a separate library that was not part of a bundle, hence we needed
to declare them as "system" (at least this is my understanding of the Felix
way of doing it).

That was the case indeed.

When running the tests however we don't load the zrtp bundle and hence
the need to declare the packages as system. I guess your intention was
to use the zrtp bundle in both cases, right?

Right. As you may have seen the run properties don't declare the BC nor
the ZRTP packages as "system" packages anymore because zrtp-bundle is
started/loaded as "felix.auto.start.49" just before the media stuff (52).

Yes. This is the part that's different from felix.unit.test.properties.

Incidentally, both the test and the run evnironments seem to declare the
bouncycastle packages as system while they are also provided by the zrtp
bundle. We should probably get rid of the declaration in the system
packages list to avoid potential conflicts in case the packages would
also be on the classpath.

In the last update I already removed the BC packages from the system import
in the run properties because they are now part of the ZRTP bundle.

Yes indeed. I was referring to the fact that they are still system in
felix.unit.test.properties.

Am I making sense?

As usual :wink: . IMHO we shall load the zrtp bundle during the test properties
in a similar way as in the run properties.

My thoughts exactly.

Cheers
Emil

路路路

Cheers
Emil

Regards,
Werner

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net