Merge branch 'ingo'

Conflicts:
	trunk/lib/installer-exclude/libjitsi.jar

.classpath

@@ -79,7 +79,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/>
 	<classpathentry kind="lib" path="lib/os-specific/linux/jdic_stub.jar"/>
 	<classpathentry kind="lib" path="lib/os-specific/mac/growl4j.jar"/>
 	<classpathentry kind="lib" path="lib/os-specific/mac/jdic_stub.jar"/>
@@ -87,5 +86,7 @@
 	<classpathentry kind="lib" path="lib/os-specific/solaris/jdic_stub.jar"/>
 	<classpathentry kind="lib" path="lib/os-specific/windows/jdic_stub.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar" sourcepath="/jmork"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk15on-148.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

build.xml

@@ -2292,6 +2292,11 @@ javax.swing.event, javax.swing.border"/>
                     org.bouncycastle.crypto.modes,
                     org.bouncycastle.crypto.params,
                     org.bouncycastle.crypto.prng,
+                    org.jitsi.bccontrib.digests,
+                    org.jitsi.bccontrib.engines,
+                    org.jitsi.bccontrib.macs,
+                    org.jitsi.bccontrib.params,
+                    org.jitsi.bccontrib.prng,
                     org.bouncycastle.math.ec,
                     org.bouncycastle.util.encoders,
                     org.bouncycastle.util"/>
@@ -2349,36 +2354,13 @@ javax.swing.event, javax.swing.border"/>
                 prefix="net/java/sip/communicator/impl/metahistory" />
         </jar>
     </target>
+
     <!--BUNDLE-BOUNCYCASTLE -->
     <target name="bundle-bouncycastle">
-        <jar compress="true" destfile="${bundles.dest}/bouncycastle.jar">
-            <zipfileset src="${lib.noinst}/lcrypto-jdk16-143.jar"/>
-            <manifest>
-                <attribute name="Export-Package" value="org.bouncycastle.asn1,
-                    org.bouncycastle.asn1.nist,
-                    org.bouncycastle.asn1.pkcs,
-                    org.bouncycastle.asn1.sec,
-                    org.bouncycastle.asn1.x509,
-                    org.bouncycastle.asn1.x9,
-                    org.bouncycastle.crypto,
-                    org.bouncycastle.crypto.agreement,
-                    org.bouncycastle.crypto.digests,
-                    org.bouncycastle.crypto.engines,
-                    org.bouncycastle.crypto.generators,
-                    org.bouncycastle.crypto.macs,
-                    org.bouncycastle.crypto.modes,
-                    org.bouncycastle.crypto.params,
-                    org.bouncycastle.crypto.prng,
-                    org.bouncycastle.crypto.signers,
-                    org.bouncycastle.math.ec,
-                    org.bouncycastle.util.encoders,
-                    org.bouncycastle.util"/>
-                <attribute name="Bundle-Name" value="BouncyCastle"/>
-                <attribute name="Bundle-Version" value="1.4.3.1"/>
-                <attribute name="System-Bundle" value="yes"/>
-            </manifest>
-        </jar>
+        <copy file="${lib.noinst}/bcprov-jdk15on-148.jar" tofile="${bundles.dest}/bouncycastle.jar"/>
+    	<copy file="${lib.noinst}/bccontrib-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/bccontrib.jar"/>
     </target>
+
     <!--BUNDLE-PLUGIN-OTR -->
     <target name="bundle-plugin-otr">
         <jar compress="false" destfile="${bundles.dest}/otr.jar" manifest="${src}/net/java/sip/communicator/plugin/otr/otr.manifest.mf">

lib/felix.client.run.properties

@@ -27,7 +27,10 @@ org.osgi.framework.system.packages.extra= \
  sun.security.pkcs11
 
 felix.auto.start.10= \
- reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar
+ reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
+ reference:file:sc-bundles/bouncycastle.jar \
+ reference:file:sc-bundles/bccontrib.jar
+ 
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/servicebinder.jar \
 # file:lib/bundle/tablelayout.jar
@@ -84,7 +87,6 @@ felix.auto.start.45= \
 
 felix.auto.start.49= \
  reference:file:sc-bundles/provisioning.jar \
- reference:file:sc-bundles/bouncycastle.jar \
  reference:file:sc-bundles/zrtp4j.jar \
  reference:file:sc-bundles/sdes4j.jar \
  reference:file:sc-bundles/protocol.jar \

src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java

@@ -29,6 +29,7 @@
 import org.bouncycastle.asn1.*;
 import org.bouncycastle.asn1.x509.*;
 import org.bouncycastle.asn1.x509.X509Extension;
+import org.bouncycastle.x509.extension.*;
 import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.jitsi.util.*;
@@ -826,25 +827,9 @@ private X509Certificate[] tryBuildChain(X509Certificate[] chain)
                     if (aiaBytes == null)
                         break;
 
-                    DEROctetString octs =
-                        (DEROctetString) ASN1Object.fromByteArray(aiaBytes);
-                    ASN1InputStream as = new ASN1InputStream(octs.getOctets());
-                    AuthorityInformationAccess aia;
-
-                    try
-                    {
-                        aia
-                            = AuthorityInformationAccess.getInstance(
-                                    as.readObject());
-                    }
-                    finally
-                    {
-                        /*
-                         * Practically, it is likely unnecessary. However, it
-                         * silences a compile-time warning.
-                         */
-                        as.close();
-                    }
+                    AuthorityInformationAccess aia
+                        = AuthorityInformationAccess.getInstance(
+                            X509ExtensionUtil.fromExtensionValue(aiaBytes));
 
                     // the AIA may contain different URLs and types, try all
                     // of them

src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf

@@ -22,4 +22,5 @@ Import-Package: org.osgi.framework,
  org.apache.http.conn.ssl,
  org.bouncycastle.asn1,
  org.bouncycastle.asn1.x509,
+ org.bouncycastle.x509.extension,
  sun.security.pkcs11

src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf

@@ -54,6 +54,11 @@ Import-Package: apple.awt,
  org.bouncycastle.crypto.macs,
  org.bouncycastle.crypto.params,
  org.bouncycastle.crypto.prng,
+ org.jitsi.bccontrib.digests,
+ org.jitsi.bccontrib.engines,
+ org.jitsi.bccontrib.macs,
+ org.jitsi.bccontrib.params,
+ org.jitsi.bccontrib.prng,
  org.ice4j.socket,
  org.json.simple,
  org.osgi.framework,