← Back to branch summary

~ubuntu-branches/ubuntu/raring/icedtea-web/raring

« back to all changes in this revision

Viewing changes to netx/net/sourceforge/jnlp/tools/JarSigner.java

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-02-04 18:19:46 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20120204181946-jngobgzz4mlen9yl
Tags: 1.2~pre1-0ubuntu1
* Update to hg 20120203, taken from the icedtea-web-1.2 release branch.
* Build separate plugin packages for OpenJDK 6 and OpenJDK 7, needed
  to provide the path to the runtime and the mime description in the plugin.
* Use icedtea-<jre version>-plugin as the name for both plugin packages.
* Remove icedtea-web-1.1.4-npapi-fix.patch, fixed upstream.
* Pass -n to gzip when compressing manpages to be Multi-Arch: same safe.
* Build multiarch packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
netx/net/sourceforge/jnlp/tools/JarSigner.java
194
194
                // some sort of resource download/cache error. Nothing to add
195
195
                // in that case ... but don't fail here
196
196
                if (jarFile == null) {
197
 
                    return;
 
197
                    continue;
198
198
                }
199
199
 
200
200
                String localFile = jarFile.getAbsolutePath();
373
373
                alreadyTrustPublisher = CertificateUtils.inKeyStores(publisher, certKeyStores);
374
374
                X509Certificate root = (X509Certificate) getRoot();
375
375
                KeyStore[] caKeyStores = KeyStores.getCAKeyStores();
376
 
                rootInCacerts = CertificateUtils.inKeyStores(root, caKeyStores);
 
376
                // Check entire cert path for a trusted CA
 
377
                for (Certificate c : certPath.getCertificates()) {
 
378
                        if ((rootInCacerts = CertificateUtils.inKeyStores(
 
379
                            (X509Certificate) c, caKeyStores))) {
 
380
                        break;
 
381
                    }
 
382
                }
377
383
            } catch (Exception e) {
378
384
                // TODO: Warn user about not being able to
379
385
                // look through their cacerts/trusted.certs