Mercurial > 510Connectbot

comparison src/org/tn5250j/framework/transport/SSL/SSLImplementation.java @ 91:33eb63352be5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove 5250 configuration
author Carl Byington <carl@five-ten-sg.com>
date Mon, 16 Jun 2014 16:17:48 -0700
parents 213153ca62a2
children 77ac18bc1b2f
comparison
equal deleted inserted replaced
90:3f587bd647a5 91:33eb63352be5
40 40
41 import com.five_ten_sg.connectbot.R; 41 import com.five_ten_sg.connectbot.R;
42 import com.five_ten_sg.connectbot.service.TerminalBridge; 42 import com.five_ten_sg.connectbot.service.TerminalBridge;
43 import com.five_ten_sg.connectbot.service.TerminalManager; 43 import com.five_ten_sg.connectbot.service.TerminalManager;
44 44
45 import org.tn5250j.GlobalConfigure;
46 import org.tn5250j.framework.transport.SSLInterface; 45 import org.tn5250j.framework.transport.SSLInterface;
47 import android.util.Log; 46 import android.util.Log;
48 47
49 48
50 /** 49 /**
79 this.bridge = bridge; 78 this.bridge = bridge;
80 this.manager = manager; 79 this.manager = manager;
81 80
82 } 81 }
83 82
84 public void init(String sslType) { 83 public void init(String sslType, String homeDirectory) {
85 try { 84 try {
86 Log.d(TAG,"Initializing User KeyStore"); 85 Log.d(TAG,"Initializing User KeyStore");
87 userKsPath = GlobalConfigure.instance().settingsDirectory() + "keystore"; 86 userKsPath = homeDirectory + File.separator + "keystore";
88 File userKsFile = new File(userKsPath); 87 File userKsFile = new File(userKsPath);
89 userks = KeyStore.getInstance(KeyStore.getDefaultType()); 88 userks = KeyStore.getInstance(KeyStore.getDefaultType());
90 userks.load(userKsFile.exists() ? new FileInputStream(userKsFile) 89 userks.load(userKsFile.exists() ? new FileInputStream(userKsFile)
91 : null, userksPassword); 90 : null, userksPassword);
92 Log.d(TAG,"Initializing User Key Manager Factory"); 91 Log.d(TAG,"Initializing User Key Manager Factory");