- Timestamp:
- 2016-11-26T00:18:56+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
r11100 r11312 6 6 import java.io.IOException; 7 7 import java.io.InputStream; 8 import java.io.OutputStream; 8 9 import java.math.BigInteger; 9 10 import java.net.ServerSocket; … … 237 238 238 239 ks.setKeyEntry(ENTRY_ALIAS, pair.getPrivate(), entryPassword, new Certificate[]{cert}); 239 ks.store(Files.newOutputStream(path, StandardOpenOption.CREATE), storePassword); 240 try (OutputStream out = Files.newOutputStream(path, StandardOpenOption.CREATE)) { 241 ks.store(out, storePassword); 242 } 240 243 } 241 244 return path; … … 381 384 RemoteControl.getInet6Address() : RemoteControl.getInet4Address()); 382 385 383 if (Main.isTraceEnabled()) { 384 if (server instanceof SSLServerSocket) { 385 SSLServerSocket sslServer = (SSLServerSocket) server; 386 Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites())); 387 Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols())); 388 Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation()); 389 Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth()); 390 Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth()); 391 Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode()); 392 } 386 if (Main.isTraceEnabled() && server instanceof SSLServerSocket) { 387 SSLServerSocket sslServer = (SSLServerSocket) server; 388 Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites())); 389 Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols())); 390 Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation()); 391 Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth()); 392 Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth()); 393 Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode()); 393 394 } 394 395 }
Note:
See TracChangeset
for help on using the changeset viewer.