rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

found a bug in java6, fixed removing a https protocol from the list

Browse Source 
see http://stackoverflow.com/questions/15589880/how-to-make-java-6-which-fails-ssl-connection-with-ssl-peer-shut-down-incorrec
This commit is contained in:
Federico Fissore 2013-06-05 18:09:07 +02:00
parent 306e079ef0
commit 137da0326d
2 changed files with 144 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/cc/arduino/packages/uploaders/HttpUploader.java
View File

@ -1,41 +1,35 @@
package cc.arduino.packages.uploaders;
import static processing.app.I18n._;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.regex.Matcher;
import cc.arduino.packages.Uploader;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.protocol.Protocol;
import processing.app.Base;
import processing.app.Constants;
import processing.app.Preferences;
import processing.app.debug.EasySSLProtocolSocketFactory;
import processing.app.debug.RunnerException;
import processing.app.debug.TargetPlatform;
import processing.app.helpers.PreferencesMap;
import cc.arduino.packages.Uploader;
import java.io.*;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.regex.Matcher;
import static processing.app.I18n._;
public class HttpUploader extends Uploader {
private static final String PROTOCOL = "http://";
private static final String PROTOCOL = "https://";
/*
static {
Protocol.registerProtocol("https", new Protocol("https", new EasySSLProtocolSocketFactory(), 443));
}
*/
private final HttpClient client;
private final String ipAddress;

41
app/src/processing/app/debug/EasySSLProtocolSocketFactory.java
View File

@ -30,17 +30,6 @@
package processing.app.debug;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.UnknownHostException;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.HttpClientError;
import org.apache.commons.httpclient.params.HttpConnectionParams;
@ -48,6 +37,13 @@ import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
import java.io.IOException;
import java.net.*;
/**
* <p>
* EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s
@ -59,7 +55,7 @@ import org.apache.commons.logging.LogFactory;
* you are perfectly aware of security implications of accepting
* self-signed certificates
* </p>
*
* <p/>
* <p>
* Example of using custom protocol socket factory for a specific host:
* <pre>
@ -87,7 +83,7 @@ import org.apache.commons.logging.LogFactory;
* </p>
*
* @author <a href="mailto:oleg -at- ural.ru">Oleg Kalnichevski</a>
*
* <p/>
* <p>
* DISCLAIMER: HttpClient developers DO NOT actively support this component.
* The component is provided as a reference material, which may be inappropriate
@ -97,7 +93,9 @@ import org.apache.commons.logging.LogFactory;
public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory {
/** Log object for this class. */
/**
* Log object for this class.
*/
private static final Log LOG = LogFactory.getLog(EasySSLProtocolSocketFactory.class);
private SSLContext sslcontext = null;
@ -140,12 +138,13 @@ public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory
int clientPort)
throws IOException, UnknownHostException {
return getSSLContext().getSocketFactory().createSocket(
Socket socket = getSSLContext().getSocketFactory().createSocket(
host,
port,
clientHost,
clientPort
);
return socket;
}
/**
@ -162,9 +161,7 @@ public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory
* @param clientHost the local host name/IP to bind the socket to
* @param clientPort the port on the local machine
* @param params {@link HttpConnectionParams Http connection parameters}
*
* @return Socket a new socket
*
* @throws IOException if an I/O error occurs while creating the socket
* @throws UnknownHostException if the IP address of the host cannot be
* determined
@ -181,16 +178,20 @@ public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory
}
int timeout = params.getConnectionTimeout();
SocketFactory socketfactory = getSSLContext().getSocketFactory();
Socket socket;
if (timeout == 0) {
return socketfactory.createSocket(host, port, localAddress, localPort);
socket = socketfactory.createSocket(host, port, localAddress, localPort);
} else {
Socket socket = socketfactory.createSocket();
socket = socketfactory.createSocket();
SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
SocketAddress remoteaddr = new InetSocketAddress(host, port);
socket.bind(localaddr);
socket.connect(remoteaddr, timeout);
return socket;
}
SSLSocket sslSocket = (SSLSocket) socket;
String[] protocolsWithoutSSLv2Hello = {"SSLv3", "TLSv1"};
sslSocket.setEnabledProtocols(protocolsWithoutSSLv2Hello);
return socket;
}
/**