From e7f46b99e2dafde0058126095b14cc758b32ae28 Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Mon, 2 Dec 2013 20:50:04 +0100
Subject: [PATCH] changed default behavior to not use SecureClassLoader, as it
 was causing issues since the latest security update

---
 libs/lzma.jar                                 | Bin 5857 -> 5848 bytes
 .../org/lwjgl/util/applet/AppletLoader.java   |  24 +++++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/libs/lzma.jar b/libs/lzma.jar
index 276c475691fe9cec2760a0fc1f0c1d48a1c90d5f..d383dc002adf294c72f875a6b22f553b00f04ec1 100644
GIT binary patch
delta 294
zcmaE;dqa0ax=8(+MNQ5<`FHEe85kHg0<j1X`?`iW>U#RQ>H9kRdAhj<hv@mb<@Rjk
zI%FW?`rYB5VzJ_)>}{7q9Ru#fpAls`ueN8p(!af>9I?CRRlnPLVNU#oXYvAPQ~BPN
zSVR>w8wM5libWJpca@%G|6D`me&6~D<=6guH!G*bn<t!A2oX}!Y?59hnf>(7l5Ku_
zAGtsKwD81-*tZWedmYPKAF^+j7L8)8um`(~g8|dEDnR#wfC3Q50v(Ud?Ob441_nk3
k35Jsg-Pccke~xiNVpJb89pKH%1~P{Y2=_1oX;Bal0K?X0wg3PC

delta 303
zcmcbi`%rg7x=8)zsRhob#T@er7#J8P1F;B$41=$0h@-BjpPRm~qo1dnYjB93uUlvc
zCj)cf-u566F0J5ZU}Sm0%)r2s0@UN$vyqF*P=NKf!#~BX8y4m6IvnO0@W%WZXX96)
zvf_^V`tqZNZ}*rNKi*iAFgGqhyR_$FjZNiu2JRvr(^&P2?^jM*8O3@BUHjkm{zCr7
ztD7VuT5j>}*?pzwNSg%TJ>IpRmBsPP);cwN{4Er^P#1gHcr%-56l0DYvk1^~4hBpw
pNC3qd7#M+gNn<Qf5q1x;LOg`#nE-EAHjr*MAlv{nLRu8W0|1&$U?Bhi

diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java
index 0ec72560..047d3edb 100644
--- a/src/java/org/lwjgl/util/applet/AppletLoader.java
+++ b/src/java/org/lwjgl/util/applet/AppletLoader.java
@@ -56,7 +56,6 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.JarURLConnection;
 import java.net.SocketPermission;
@@ -70,7 +69,6 @@ import java.security.CodeSource;
 import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.security.PrivilegedExceptionAction;
-import java.security.SecureClassLoader;
 import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -1189,24 +1187,16 @@ public class AppletLoader extends Applet implements Runnable, AppletStub {
 				PermissionCollection perms = null;
 
 				try {
-					
-					// if mac, apply workaround for the multiple security dialog issue
-					if (isMacOS) {
-						// if certificates match the AppletLoader certificates then don't use SecureClassLoader to get further permissions
-						if (certificatesMatch(certs, codesource.getCertificates())) {
-							perms = new Permissions();
-							perms.add(new AllPermission());
-							return perms;
-						}
-					}
+                    // no permissions
+                    perms = new Permissions();
 
-					// getPermissions from original classloader is important as it checks for signed jars and shows any security dialogs needed
-					Method method = SecureClassLoader.class.getDeclaredMethod("getPermissions", new Class[] { CodeSource.class });
-					method.setAccessible(true);
-					perms = (PermissionCollection)method.invoke(getClass().getClassLoader(), new Object[] {codesource});
+                    // if certificates match the AppletLoader certificates then we should be all set
+                    if (certificatesMatch(certs, codesource.getCertificates())) {
+                        perms.add(new AllPermission());
+                        return perms;
+                    }
 
 					String host = getCodeBase().getHost();
-
 			        if (host != null && (host.length() > 0)) {
 			        	// add permission for downloaded jars to access host they were from
 			        	perms.add(new SocketPermission(host, "connect,accept"));