mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

GT-2685 minor text revisions

Browse Source
This commit is contained in:
ghidra1
2019-05-31 17:51:11 -04:00
parent 17bb619048
commit 5c1127b085
7 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java
View File

@@ -123,17 +123,6 @@ class ServerConnectTask extends Task {
return name;
}
// private static void setOutgoingIpAddress(InetAddress destAddr, int serverPort)
// throws IOException {
// // TODO: this may not be needed since we do not create remote objects on the client
// InetSocketAddress sockAddr = new InetSocketAddress(destAddr, serverPort);
// Socket s = new Socket();
// s.connect(sockAddr, 5000);
// String ip = s.getLocalAddress().getHostAddress();
// System.setProperty("java.rmi.server.hostname", ip);
// s.close();
// }
private static boolean isSSLHandshakeCancelled(SSLHandshakeException e) throws IOException {
if (e.getMessage().indexOf("bad_certificate") > 0) {
if (ApplicationKeyManagerFactory.getPreferredKeyStore() == null) {
@@ -158,8 +147,6 @@ class ServerConnectTask extends Task {
*/
public static GhidraServerHandle getGhidraServerHandle(ServerInfo server) throws IOException {
// setOutgoingIpAddress(InetAddress.getByName(server.getServerName()), server.getPortNumber());
GhidraServerHandle gsh = null;
try {
// Test SSL Handshake to ensure that user is able to decrypt keystore.

3
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraServerHandle.java
View File

@@ -47,6 +47,9 @@ public interface GhidraServerHandle extends Remote {
* 9: Added support for transient checkouts (7.2)
* 10: Added BlockStreamServer (7.4)
* 11: Revised password hash to SHA-256 (9.0)
* - version 9.1 switched to using SSL/TLS for RMI registry connection preventing
* older clients the ability to connect to the server. Remote interface remained
* unchanged allowing 9.1 clients to connect to 9.0 server.
*/
public static final int INTERFACE_VERSION = 11;