fix building with MSVC

zhou0 · Apr 21, 2017 · d8adb5e · d8adb5e
1 parent 5eeb507
commit d8adb5e
Show file tree

Hide file tree

Showing 5 changed files with 4,310 additions and 12 deletions.
diff --git a/OpenSSL_1_1_0/makefile b/OpenSSL_1_1_0/makefile
diff --git a/src/cipher-openssl.c b/src/cipher-openssl.c
@@ -105,13 +105,13 @@ void cipher_encrypt(conn* c, size_t * encryptl,
                     const char * plain, size_t plainl)
 #endif
 {
+	    uint8_t * dst;
+		    int outl;
     ASSERT( plain == c->t.buf);
     //    pr_info("%s %lu", __FUNCTION__, plainl);
     //    cipher_t * cipher = shadow->cipher;
 //    unsigned char * encrypt = 0;
 
-    uint8_t * dst;
-    int outl;
     // if (!cipher.encrypt.init) {
     if (c->request_length)
     {

diff --git a/src/cipher-wolfssl.c b/src/cipher-wolfssl.c
@@ -395,12 +395,9 @@ void cipher_decrypt(conn *c, ULONG * plainl, const char * encrypt, size_t encryp
 void cipher_decrypt(conn *c, size_t * plainl, const char * encrypt, size_t encryptl)
 #endif
 {
+	    uint8_t * src;
     ASSERT(encrypt == c->t.buf);
     //pr_info("%s %u %lu", __FUNCTION__, __LINE__,encryptl);
-
-
-    uint8_t * src;
-
     //if (!cipher.decrypt.init) {
     //if (!c->init) {
 

diff --git a/src/cipher.c b/src/cipher.c
@@ -79,21 +79,19 @@ void cipher_encrypt(conn* c, size_t * encryptl,
                     const unsigned char * plain, size_t plainl)
 #endif
 {
-
+uint8_t *dst;
     ASSERT( plain == c->t.buf);
     //    pr_info("%s %lu", __FUNCTION__, plainl);
     //    cipher_t * cipher = shadow->cipher;
     //unsigned char * encrypt = 0;
 
 //    uint8_t * plainptr;
-    uint8_t *dst;
     //    int l;
     // if (!cipher.encrypt.init) {
     if (c->request_length)
     {
-
-        //            int ivl;
         size_t prepend;
+		char * true_key = malloc(MD5_DIGEST_LENGTH);
 //#if defined (_MSC_VER)
 //        uint8_t * src, * ptr;
 //#else
@@ -120,7 +118,6 @@ void cipher_encrypt(conn* c, size_t * encryptl,
         memcpy(cipher.encrypt.iv + sizeof (d1), &d2, sizeof (d2));
 #endif
 #endif
-        char *true_key = malloc(MD5_DIGEST_LENGTH);
         create_key(cipher.encrypt.iv, cipher.ivl,true_key);
         arcfour_setkey(&cipher.encrypt.ctx, true_key, cipher.keyl);
         free(true_key);

diff --git a/src/client.h b/src/client.h
@@ -1,4 +1,4 @@
-/* 
+/* 
  *  * File:   client.h
  *   * Author: lzhou
  *    *