fix most of reality bugs, works fine for now but needs more testing

radkesvat · May 10, 2024 · 63d930f · 63d930f
1 parent be49573
commit 63d930f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tunnels/client/reality/reality_client.c b/tunnels/client/reality/reality_client.c
@@ -124,7 +124,7 @@ static void upStream(tunnel_t *self, context_t *c)
         shift_buffer_t *buf = c->payload;
         c->payload   = NULL;
 
-        const int chunk_size = ((1 << 16) - (kSignLen + (kEncryptionBlockSize) + kIVlen));
+        const int chunk_size = ((1 << 16) - (kSignLen + (2*kEncryptionBlockSize) + kIVlen));
 
         if (bufLen(buf) < chunk_size)
         {

diff --git a/tunnels/server/reality/reality_server.c b/tunnels/server/reality/reality_server.c
@@ -271,7 +271,7 @@ static void downStream(tunnel_t *self, context_t *c)
         case kConAuthorized:;
             shift_buffer_t *buf        = c->payload;
             c->payload = NULL;
-            const int       chunk_size = ((1 << 16) - (kSignLen + (kEncryptionBlockSize) + kIVlen));
+            const int       chunk_size = ((1 << 16) - (kSignLen + (2*kEncryptionBlockSize) + kIVlen));
 
             if (bufLen(buf) < chunk_size)
             {

diff --git a/tunnels/shared/reality/reality_helpers.h b/tunnels/shared/reality/reality_helpers.h
@@ -119,14 +119,14 @@ static shift_buffer_t *genericEncrypt(shift_buffer_t *in, EVP_CIPHER_CTX *encryp
     int             input_length = (int) bufLen(in);
 
     uint8_t iv[kIVlen];
-    for (int i; i < kIVlen / sizeof(uint32_t); i++)
+    for (int i = 0; i < kIVlen / sizeof(uint32_t); i++)
     {
         ((uint32_t *) iv)[i] = fastRand();
     }
 
     EVP_EncryptInit_ex(encryption_context, EVP_aes_128_cbc(), NULL, (const uint8_t *) password, (const uint8_t *) iv);
 
-    reserveBufSpace(out, input_length + (input_length % kEncryptionBlockSize));
+    reserveBufSpace(out, input_length + kEncryptionBlockSize +(input_length % kEncryptionBlockSize));
     int out_len = 0;
 
     /*