← 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/security/VariableX509TrustManager.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/security/VariableX509TrustManager.java
55
55
import sun.security.validator.ValidatorException;
56
56
 
57
57
import com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager;
 
58
import net.sourceforge.jnlp.runtime.JNLPRuntime;
58
59
 
59
60
import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
60
61
 
384
385
    private boolean askUser(final X509Certificate[] chain, final String authType,
385
386
                            final boolean isTrusted, final boolean hostMatched,
386
387
                            final String hostName) {
 
388
        if (JNLPRuntime.isTrustAll()){
 
389
            return true;
 
390
        }
387
391
        final VariableX509TrustManager trustManager = this;
388
392
        return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
389
393
            @Override