CVS: beepcore-java/tls/org/beepcore/beep/profile/tls/jsse TLSProfileJSSE.java,1.8.2.1,1.8.2.2
Huston Franklin <[email protected]> Mon, 01 Sep 2003 11:41:35 -0700
| Newsgroups | gmane.network.beep.beepcore.java.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse
In directory sc8-pr-cvs1:/tmp/cvs-serv6285/tls/org/beepcore/beep/profile/tls/jsse
Modified Files:
Tag: PIGGYBACKED
TLSProfileJSSE.java
Log Message:
cleanup
Index: TLSProfileJSSE.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** TLSProfileJSSE.java 13 Jul 2003 14:27:46 -0000 1.8.2.1
--- TLSProfileJSSE.java 1 Sep 2003 18:41:33 -0000 1.8.2.2
***************
*** 534,613 ****
{
channel.setRequestHandler(this, true);
- /*
- try {
- TCPSession oldSession = (TCPSession) channel.getSession();
-
- // if the data is <ready/> then respond with <proceed/>
- if (data != null) {
-
- // If data is a ready, prepare a message of proceed to
- // send to the begin call
- if (data.equals(READY1) || data.equals(READY2)) {
- data = PROCEED2;
- }
- }
-
- // Freeze this Peer
- // Send a profile back with data in the 3rd argument
- this.begin(channel, uri, data);
-
- // Negotiate TLS with the Socket
- Socket oldSocket = oldSession.getSocket();
- SSLSocket newSocket =
- (SSLSocket) socketFactory.createSocket(oldSocket,
- oldSocket.getInetAddress().getHostName(),
- oldSocket.getPort(),
- true);
- TLSHandshake l = new TLSHandshake();
-
- newSocket.addHandshakeCompletedListener(l);
- newSocket.setUseClientMode(false);
- newSocket.setNeedClientAuth(needClientAuth);
- newSocket.setEnabledCipherSuites(newSocket.getSupportedCipherSuites());
-
- l.session = channel.getSession();
-
- newSocket.startHandshake();
-
- synchronized (l) {
- if (!l.notifiedHandshake) {
- l.waitingForHandshake = true;
-
- l.wait();
-
- l.waitingForHandshake = false;
- }
- }
-
- // Consider the Profile Registry
- ProfileRegistry preg = oldSession.getProfileRegistry();
-
- preg.removeStartChannelListener(uri);
-
- if (abortSession) {
- this.abort(new BEEPError(451, ERR_TLS_NO_AUTHENTICATION),
- channel);
- } else {
- Hashtable hash = new Hashtable();
-
- hash.put(SessionTuningProperties.ENCRYPTION, "true");
-
- SessionTuningProperties tuning =
- new SessionTuningProperties(hash);
-
- // Cause the session to be recreated and reset
- this.complete(channel, generateCredential(), l.cred, tuning,
- preg, newSocket);
- }
- } catch (Exception x) {
-
- // @todo should be more detailed
- log.error(x.getMessage());
-
- throw new StartChannelException(450, x.getMessage());
- }
-
- throw new TuningResetException(uri);
- */
}
--- 534,537 ----
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf