Changeset 3203

Timestamp:

Sep 27, 2007, 2:43:33 PM (15 years ago)

Author:

charles

Message:

better support of the MSE protocol w.r.t. PadC and PadD

File:

• trunk/libtransmission/handshake.c (modified) (3 diffs)

trunk/libtransmission/handshake.c

@@ -17 +17 @@
 #include <string.h>
 #include <stdio.h>
-#include <arpa/inet.h>
 
 #include <sys/types.h> /* event.h needs this */
@@ -447 +446 @@
     }
       
-    /* ENCRYPT(VC, crypto_provide, len(PadC), PadC */
+    /* ENCRYPT(VC, crypto_provide, len(PadC), PadC
+     * PadC is reserved for future extensions to the handshake...
+     * standard practice at this time is for it to be zero-length */
     {
         uint8_t vc[VC_LENGTH] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-        uint8_t pad[512];
-        uint16_t i, len;
-        uint32_t crypto_provide;
 
         tr_cryptoEncryptInit( handshake->crypto );
-       
-        /* vc */ 
-        tr_cryptoEncrypt( handshake->crypto, VC_LENGTH, vc, vc );
-        evbuffer_add( outbuf, vc, VC_LENGTH );
-
-        /* crypto_provide */
-        crypto_provide = htonl( getCryptoProvide( handshake ) );
-        tr_cryptoEncrypt( handshake->crypto, sizeof(crypto_provide), &crypto_provide, &crypto_provide );
-        evbuffer_add( outbuf, &crypto_provide, sizeof(crypto_provide) );
-
-        /* len(padc) */
-        i = len = tr_rand( 512 );
-        i = htons( i );
-        tr_cryptoEncrypt( handshake->crypto, sizeof(i), &i, &i );
-        evbuffer_add( outbuf, &i, sizeof(i) );
-
-        /* padc */
-        for( i=0; i<len; ++i ) pad[i] = tr_rand( UCHAR_MAX );
-        tr_cryptoEncrypt( handshake->crypto, len, pad, pad );
-        evbuffer_add( outbuf, pad, len );
+        tr_peerIoSetEncryption( handshake->io, PEER_ENCRYPTION_RC4 );
+      
+        tr_peerIoWriteBytes( handshake->io, outbuf, vc, VC_LENGTH ); 
+        tr_peerIoWriteUint32( handshake->io, outbuf, getCryptoProvide( handshake ) );
+        tr_peerIoWriteUint16( handshake->io, outbuf, 0 );
     }
 
     /* ENCRYPT len(IA)), ENCRYPT(IA) */
     {
-        uint16_t i;
-        int msgSize;
-        uint8_t * msg = buildHandshakeMessage( handshake, HANDSHAKE_EXTPREF_LTEP_PREFER, &msgSize );
-
-        i = htons( msgSize );
-        tr_cryptoEncrypt( handshake->crypto, sizeof(uint16_t), &i, &i );
-        evbuffer_add( outbuf, &i, sizeof(uint16_t) );
-
-        tr_cryptoEncrypt( handshake->crypto, msgSize, msg, msg );
-        evbuffer_add( outbuf, msg, HANDSHAKE_SIZE );
+        int msglen;
+        uint8_t * msg = buildHandshakeMessage( handshake, HANDSHAKE_EXTPREF_LTEP_PREFER, &msglen );
+
+        tr_peerIoWriteUint16( handshake->io, outbuf, msglen );
+        tr_peerIoWriteBytes( handshake->io, outbuf, msg, msglen );
+
         handshake->haveSentBitTorrentHandshake = 1;
-
         tr_free( msg );
     }
@@ -941 +919 @@
 
 dbgmsg( handshake, "sending pad d" );
-    /* send pad d */
-    {
-        uint8_t pad[PadD_MAXLEN];
-        const int len = tr_rand( PadD_MAXLEN );
-        for( i=0; i<len; ++i )
-            pad[i] = tr_rand( UCHAR_MAX );
+    /* ENCRYPT(VC, crypto_provide, len(PadC), PadC
+     * PadD is reserved for future extensions to the handshake...
+     * standard practice at this time is for it to be zero-length */
+    {
+        const int len = 0;
         tr_peerIoWriteUint16( handshake->io, outbuf, len );
-        tr_peerIoWriteBytes( handshake->io, outbuf, pad, len );
     }