diff options
| author | Björn Hagemeister | 2014-06-30 18:00:46 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-06-30 18:00:46 +0200 |
| commit | 9710bd551c38aed7b729a8d39cef9c5dc534d20c (patch) | |
| tree | 66ae2f0051023b92703439f92e4e2d300e07e3c2 /src/main/java/org/openslx/filetransfer/Uploader.java | |
| parent | Added filetransfer classes. Downloader.java, Uploader.java, Listener.java and... (diff) | |
| download | master-sync-shared-9710bd551c38aed7b729a8d39cef9c5dc534d20c.tar.gz master-sync-shared-9710bd551c38aed7b729a8d39cef9c5dc534d20c.tar.xz master-sync-shared-9710bd551c38aed7b729a8d39cef9c5dc534d20c.zip | |
Also pass to uploader context as argument. Added ClassTest file, which is same like Main for testing.
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Uploader.java')
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/Uploader.java | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java index 103e1bb..d87cfbb 100644 --- a/src/main/java/org/openslx/filetransfer/Uploader.java +++ b/src/main/java/org/openslx/filetransfer/Uploader.java @@ -29,11 +29,6 @@ public class Uploader { private String TOKEN = null; private String RANGE = null; - private static String pathToTrustStore = - "/home/bjoern/javadev/DataTransfer/mySrvKeyStore.jks"; - - - /***********************************************************************//** * Constructor for satellite uploader. * Tries to connect to specific ip and port and sending type of action. @@ -46,20 +41,7 @@ public class Uploader { * @throws KeyManagementException * @throws UnknownHostException */ - public Uploader(String ip, int port) throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException, KeyManagementException { - char[] passphrase = "test123".toCharArray(); - - KeyStore keystore = KeyStore.getInstance("JKS"); - keystore.load(new FileInputStream(pathToTrustStore), passphrase); - - TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - tmf.init(keystore); - - SSLContext context = SSLContext.getInstance("SSLv3"); - TrustManager[] trustManagers = tmf.getTrustManagers(); - - context.init(null, trustManagers, null); - + public Uploader(String ip, int port, SSLContext context) throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException, KeyManagementException { sslSocketFactory = context.getSocketFactory(); satelliteSocket = (SSLSocket) sslSocketFactory.createSocket(ip, port); |