From d0f84d571ce44602a5cc72b65682659975cf3f0a Mon Sep 17 00:00:00 2001
From: Iwan Timmer <irtimmer@gmail.com>
Date: Mon, 16 Jun 2014 14:49:50 +0200
Subject: [PATCH] Changes needed for crypto for Limelight Pi

---
 build.xml                                              | 6 ++++--
 libs/common                                            | 2 +-
 src/com/limelight/binding/crypto/PcCryptoProvider.java | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index ec6db86..007d833 100644
--- a/build.xml
+++ b/build.xml
@@ -58,18 +58,19 @@
   
   <target name="compile-java" depends="init">
     <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/src">
+    <javac includeantruntime="false" destdir="${classes.dir}/src" debug="true">
       <src path="${src.dir}"/>
 	  <classpath path="${classes.dir}/common"/>
       <classpath>
         <fileset dir="${common.libs.dir}" includes="*.jar"/>
+		<fileset dir="${libs.dir}" includes="*.jar"/>
       </classpath>
     </javac>
   </target>
   
   <target name="compile-common" depends="init">
     <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/common">
+    <javac includeantruntime="false" destdir="${classes.dir}/common" debug="true">
       <src path="${common.src.dir}"/>
       <classpath>
         <fileset dir="${common.libs.dir}" includes="*.jar"/>
@@ -92,6 +93,7 @@
 
       <lib>
         <fileset dir="${common.libs.dir}" includes="*.jar"/>
+		<fileset dir="${libs.dir}" includes="*.jar"/>
       </lib>
 
       <binlib>
diff --git a/libs/common b/libs/common
index 9868596..100e6f0 160000
--- a/libs/common
+++ b/libs/common
@@ -1 +1 @@
-Subproject commit 986859604033e889436ef59ee01dde9ee8c2f1ea
+Subproject commit 100e6f05baca4fc19ffc74df95b8cceea0562dad
diff --git a/src/com/limelight/binding/crypto/PcCryptoProvider.java b/src/com/limelight/binding/crypto/PcCryptoProvider.java
index 7ee8402..96850c7 100644
--- a/src/com/limelight/binding/crypto/PcCryptoProvider.java
+++ b/src/com/limelight/binding/crypto/PcCryptoProvider.java
@@ -32,13 +32,12 @@ import org.bouncycastle.x509.X509V3CertificateGenerator;
 
 import com.limelight.LimeLog;
 import com.limelight.nvstream.http.LimelightCryptoProvider;
-import com.limelight.settings.SettingsManager;
 
 @SuppressWarnings("deprecation")
 public class PcCryptoProvider implements LimelightCryptoProvider {
 
-	private File certFile = new File(SettingsManager.SETTINGS_DIR + File.separator + "client.crt");
-	private File keyFile = new File(SettingsManager.SETTINGS_DIR + File.separator + "client.key");
+	private File certFile = new File("client.crt");
+	private File keyFile = new File("client.key");
 	
 	private X509Certificate cert;
 	private RSAPrivateKey key;