From 438aafb88e56ce650ae6893ca605dbc3871cb519 Mon Sep 17 00:00:00 2001
From: equinox <equinox@2edecd69-f0ce-4815-94af-351a89d40aaa>
Date: Fri, 16 Jan 2009 22:59:45 +0000
Subject: [PATCH] got rid of NOPACKED (struct alignment works now under
 Windows) crypto works now under windows using openssl crypto

git-svn-id: https://anytun.org/svn/anytun@699 2edecd69-f0ce-4815-94af-351a89d40aaa
---
 src/anytun.suo        | Bin 39936 -> 42496 bytes
 src/anytun.vcproj     |  23 +++++++++--------------
 src/cipher.cpp        |   6 +++---
 src/cipher.h          |   8 +++++++-
 src/datatypes.h       |   2 +-
 src/encryptedPacket.h |   6 ++++++
 src/keyDerivation.cpp |   2 +-
 src/keyDerivation.h   |  10 ++++++++--
 src/seqWindow.cpp     |   6 +++++-
 9 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/anytun.suo b/src/anytun.suo
index 90b43cf92bf479c718f41d381b2880b453129502..847888f41c09c0885e50619905f2284e60f5b4b2 100644
GIT binary patch
delta 6764
zcwVho32>Fw6~6c7y+=Y8lDsSs!XqJJ3jwl07Pjnp2_b<bgajgHMJOR8fRwQG1*Anm
zDdbY2bX01kb`Y`nEUm2_7PYO`s_0DH>5QE^9kuOr3gb{mD3X5X|IdB@Z>&Q*)0_En
z@BjUGJ?GqW&i{sf;uw0vaimx}&zG!mI7@{P>XaicA|H*Vz+xgUIg&RNpiu}^01JRS
zBO@b=P%i<>fMVv#xh70NyAoIk;BllHbq%l#s0HQ%bwE9^99RJqshE(7N83*gJ8NZx
zN_9?-y1uvTz04i2$q-tlC9u<ZMMg}MLfnVvnWzIk_b!)P(Ccv3vDBm9bB<Rx!kc86
zehO@hsF!X@TNoGQZbZH*7dVB)45u;ltT4-Op2>^7cIO`>#Bas(BY=Ape-EBFtIx(&
zMMUz+sHm&XbhitydmU<LbWKFm=yxBJs9fq+bakX0GwP*l9Eff;7*nHOc4oVx@$@Hk
zGp1@uqeu_`tYp?Bmwo5|aON$~=~d%uMbv9ay|=^C>W_>Z`1GwSPmxL>&yV7!zVlpK
zTGfRQ-rqC5b5ovioPa-ez!8~%Ru6VY)2>&4jk~EniQgypslkLAw{(Jxw*;3^?-ntj
z5-sT^4oSBU)DDljHU2gA^4M&3V?wj@*y(pGRC`gJYD@D5hLV08?P^A+W$N+<kLsJ%
z;-8MEuK-wBe3ffD=7v!m?P@nL2iRldb_%l$F_#JKW$plT(|`w=J1k6@3ehCGU`W4f
zpBLDf+2(W}>n=!Dr^=Gm^^N`U$9UvS;9ETMq}r8zDC|4@bSf||XG4g*5Ez{ImLqvO
zIv)r7n6L~x4_qanx(jB=JL-{wxp6<l>+{?tfcjG)@OD9joH7m_Z{q0|@Gs!Do`|+f
z>q&K_Wo@9XXnUyh(<jD$UoEfB3b@M-$<z-WW9dXY9ma;K6zqu}!%dO0J6aun@I@8X
zlB~KOTATFcz191<la;r!X&KqXE>R+Ka4joDzR1J>Y%yDu8tq)Pvhi0gvd}6q-j$%0
zg})M@3=SX*Bk8Y9<OVKQmPqw+OPqSMVH$Sf4ix)_95D{8kssD>Y{1Y);A+h^r)*Fq
zo(2B<#Wv%{(fLDAJGt#fJq8E`!ho?rI1m9u0#V#A8g&d13wVGyARb5n5`pnR3XlX$
z1d@SCfESo7h2NMY6%SK@G$0+ADlN^<;C2SrnW$$2bAY)(7LX0(0J*kt^U=-+3V=eO
z2v`6t<UWg0FOhzDFf>YlQlJbd2P%MNKo#Hvs(~6{DNxH3)N#EW^$MT?Xat&omHciM
z>K33CSPiUU{vOn8fqO~3?L;13;rF8!E@55-^3)l^x}tQg$m`8wE*{8ZtD46gDSAH7
zQE1~9GPi^|@`H1EYz1?%0=n=qS;r(53InwG3g*aj-3ufF?aa~S9m4bxoz{e+QJ5Q8
zC#-|ikK*Eh$;L|IaD{?RRE0I>`$}QdMWPKu`bCfE!*q@Cs%>yreQ+ne;(pN$zD;cA
z_gnGTi{}nJZH4oq*(wi}2FNA)bA%<h0^YwCk_VtLIZ;>wp}mqEX7ir)IY}Pm_q067
zGgJ7aGc^fIZsa$o0$($^#l|Av<PJx;hJO&%qc{>sE>AKnv^-jyrpp@K*uq9SX*Xoh
zf!aJ{>MQSV6T;H%6k)0<O<3Db7v|BY3QIkcd6oI9qsX(SK(A#Ssg@izWVsTO>=9e=
zzYA;jV?BDB1DSUsltkhL<zPCYi~9`8_lZGxl>3dn^@tq+`lymE9`Z?P|9#(tCz~DW
zOy`ua;6i#5_0!Ji36&V$g~6M#nL+z@g1u@RqjIfHb_jBG>)|zfvG`{3<>Mn;CjEys
z;nLT9`D}J^Q0W)uomp-ZqA=nEdH-O%&?P~tw{x=)50X`UMYGCVnu74rw3zJjr2DQR
z2W`g}rgVOO%G$<g)$>qOSa8ZfahucOqI9t;m}qQUTkn=+%8NDSO2N~mz|FN|<Z!B2
z<{~djRmHV=uFt?HshcTNWuD0;I9=pC>VhL3*zFlLm^xJ!276G3S)qHlPvGgcR6A4C
zWdV1|3!jBy84lwJ>SAZSI_wSY(&wg<3{VzBToo{b`B^qDlesKm-Q;ZMz9+PiZ-lvR
zgXX%Rt$uZNOFY|FY$#o+(svJTG%~3(IT2yBAl=>>>U`_UKttELh<SHa$rrUe_VX%<
z>Q8`5+SaTy^{Z@?ZL&?)`z0ph6`#+5$K$z(Uus^(R3^(k%AcF2`YIQy0bh#0Q539;
zyK?7>xAv*Wy3ZZ=UMu{cl2<B)NLF&-nRAS^CC6}drd{3rC_y>nc19SI$BWkwIzHm8
zHPrurFykH-?Xt<`YLBR0HWhu|1<XAm%veXIgt_kmrOZ_^M^|$xbK14jxaAZBsc1h=
zPIMJO3Hg1@Q9M}5gE!jx^$F9V_A@sL=;eM}g|(S&%ndR}7OC@UKdnzB1*iSOH1}_C
z$97>R-c*hXYhg;C5jw@A!U}LF0s8!ULRb;t6mzF-W6v=6Bi*k7|1JRCz|Wba$%eUo
zQCN4%XXDH}rM;onEE#Ew8mXG3o{UX~4-E|_r|@ycJ*&R;(LYJ|)n1;A?tTXEc#e(B
zW-eD)QSv|LKT1|DQAzy~>d1i8zMPAeD^N!VI@C~7v2>_KTUMx#2kKPu#7Y^eF4rWg
zp@tN7=RllF=?Il6>hghB)xY%^F8(I`br@0CjJFBsy@*UWQXe$SIOyfH$$nF=rMx3L
z$ztB6PAurXkLw!ds81#LTW0G=Nd`r3ZII;V>bT!3=IDok7Unwrw!xc)soaCYGJ-?Q
zX?@a!T|8JD5c$vJ%xMGa5vBoAxge}H-VkQW@g8%2TI7$yH0ckSq*U+6+`b_!16p9?
zOar1|X>z3J=Y+Z0S8Zc{AxvNVOXes~rcX~Quan8>j{7Y#*ik1uv}-f1O3jR?v?_Cf
zs%wmP?rZxXNqc?&OkPQ6;dC+*7kS!DVeN=Q5M}1GnWHiDc%k{sMF`VIs1!3t$#NNU
zItL_?QUX1Zd_kA67N+}1VaT3IllLJ<(Q6yr&;7N>q0MY#ZkMohPTq<{yW2M39`0{u
ztV_%sQKz;;wvIKUID0O+PiWD0cs#OP$)pnFqW^7E<P<}+zfYQ?hLB9;n=#+zbkS$Y
z(qLN9j2U~)v>->P1+F%b(MG;8KRAq{LVYmbn1>#JF?!_dQR5bYJL}+$3AftQ+!aZh
zQ@rm9O0M$skbWQIK9BPo@<u-prr4fgjzs;mFoVHa=8#YYgMqeil8~0hi$Y6dZfm@3
zr~F-Qte6IKS$4bLW60yWH&k8kiB?1F3o1%@3JQFqgBE?8=<l;y<|xK2V{S!osb9Be
zt3F?b%4xZz$_ESw==tJD!+dqE<)PvIK3Qu0thE1Osp3M$pKm`UkGA_L<(sF4>8{6u
z=cGz~v?lP%$%S(Ggg4+l_-9#k*RM?nABMOJ8|PCo8EF&rXA`|$WqZ3?b!1HR_t=>A
z+-swa>tk*}ShA;!PrCX#bE(4g5Tv(<ZT;wXL^Aio%u(E=%zz5J!ek==PqvY!n<5ub
z3uSs_i=k3{9T-M_JT35S(0|O}`DY628k4QjV4begKImGL|Ij{#e1*<@?Ea&G+uCcA
z+g-%%Vy=^fX)r>6&1(VZprO+pQdl!{_cBMD)mFEjIr1q3%xz(gJn44k^e={Vs6pm-
z8l2x;WDk>jxg%+26LSv;Ycr2C_oT2ErqqaT;#0zsAZ0Hk#ixZO!LvN?v%)&a`Enlc
zf{nbu+|PuyYf62hY#hCRiMf~6pl`A>#JBkqBS+DZfFdqwkc!q66`iBzF-J~YM}i_@
zovT<~tt*kqs$=yM^-^cFk(uNnGs#y;0~u<lf1T|&yz~%cK59|JTxl3w7|lbLpQGgV
zRcdHzll0)LBvBQ2%up9PV#8=IautT>HD;cx7NtL+S{mY1vA0fou}-4?q&40bs%ry@
zfuV*XS^fX`!G#VSbaV(Y8EQqVnOfy7ogrg_iPpKM6!lJfky?%VlCMtfUKufb;#acF
z`rZ4)a#t}XTWI;GZ$}v4p;`Jn)J+x=E7Yx&beXLKLj;AV5iZ8h{FFyLZ}!Rwh7U@&
zs`b?2&*SN!sYkW9X*Lw$4K(aZk#}*Rui^-C#&H&}o~B-CZC2f@oAelDh_NBC73H7a
zDkFmj|NH8c;k0rWMPK75SeU?gd|E>Z#_MkX4)sb+5v7;mw)9e6oVG@7Z@*wHXe!%_
a^p)C0syCO-rGE=Hu<-6i<)(DHM*JJTy`lvG

delta 1878
zcwV(tT}+!*7(VCg*N-v^6k4GCtad*^7?lCTi2RI}@l(nK%8(#`L5EHlDk%RrQyG~u
zH7R`%a6!Vrc!7)A_-^#V$k=X{%#CqjxLMR)7_THT+>FH5_iGE7MG}nhBu{$YpYOcy
z`<(YZb=?(Q-w19iSKY8R3ZmEN^I=XfXq8O`W6Y;0mW8Ao-``dq8S)7Qgp-6qf|XE2
zC?=dDC<nyT@3_;bKCQ^(&ifwmG*{t)Xb$&&d26Hp4p)(Z+2tW|h5I9(3w|iurD3(i
zLrILp%N2S&6ph#ntK}ivlH8-M;<zPd%A4W$cphh*GxikuA0jAmfA}gpdc*s>PtiL`
zew7gZg#LLYSNs`ShT8`+BqcCo7}7b^N|D;_P|_ddc8+69S1$Sa2;a7-BgvA4!6=8s
z!)P0^W6+V*fyYs0oZ)6>q3nw860q3e!f4FfSo_q7t(f<?fWcUY#6<Fq*{w3RO5#zZ
zirXzU&c&r%C6o?Z#yd*Y*o?0eo4;RPM{BMDO-D?!E8$0-I-8tcz|D3&-b|}^DoLCt
zq!T&`R54R@?JTg~3hFF`uAr_js7ogF2Xz-%pbr>q1F5prGAUy9{32YLmqMq4E;Dju
zR=bMN%Y)C}7m^ev70c%=aGeUKgL|~)q;MZT$vHk=YmirSw476G99ha;(})|rvl6Py
zGi2%1NBlXh>VOhAQSc|EteiKrA;B#(cPe{fN8Vlu$Y@+Z=VUUjHq@Z7Ta8!xjCgdy
z1XF1(e(TPO@i!gIV+vWr%*L`<DJy}iF<xFTP2ry2B&?Jg!~AElGelA^oHH-U)AkgB
zABW9dAbTAvBGx7hFz7Ag&bIgj$}f?SL^wz=DXmEG-f&*zaG?{{Du?{*gvgOK`5LU2
zI&PtZ;ye>(Sf<RLiY6X~@9a+XVTxIc_sgAd%%soP31}`k2De><j*(^F1Y7cp(9L#w
z&eo`p`aNxxPTZT-pxB*{cl8E-NI4bOIV);rvf&*ut6wL-a9o(HfcdH$j|SZGYEuta
z`-gU?<$7AG0*#%&)4yhNn3f;6gm8=`8+ojJa9+>39kxUpT2E+^vCzP)VbiB!X~BTb
zg=l}IL^OLEVKr596AF%|&7Td&wW4Gk`=Wsg&qc<#1+MZ26^$o+r8b=G)8Tqw3+DPO
zQA2PgSZOAL#OM~1RFnk@6U(>;KMhP#yypJYy$Sm|a64F?h*d5IKYP;A>Z#vJ=OWg}
z4gdNkWXFt||99@M$>w?869mFlRI?v$Jfn7q#X59Vh=J!|^kcpczF^I&ky8D=4tGh#
z(~Rla6)8dR57h^I4i%P)zr|g51g?)n;FrcaJS@=^21jx4ul{iqHGG(5(s*SrU8X!A
z6koxR-ryh0XKWgr8S6&tSR1NC4`V*mM7G%fk;Hux##7-Od&i&GE*zfA^m<G$@}k{W
adb(Pz{L2;WKGL6QIqJuX<=Y?T^S=NT5l$We

diff --git a/src/anytun.vcproj b/src/anytun.vcproj
index bc74de4..29e7b81 100644
--- a/src/anytun.vcproj
+++ b/src/anytun.vcproj
@@ -42,13 +42,13 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/I &quot;C:\Program Files\boost\boost_1_35_0\&quot;"
 				Optimization="0"
-				PreprocessorDefinitions="LOGSTDOUT;NOCRYPT;NODAEMON;NOEXEC;NOPACKED;NOSYSLOG;NOSIGNALCONTROLLER;WIN32_LEAN_AND_MEAN"
+				PreprocessorDefinitions="LOGSTDOUT;USE_SSL_CRYPTO;NODAEMON;NOEXEC;NOSYSLOG;NOSIGNALCONTROLLER;WIN32_LEAN_AND_MEAN"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				ForcedIncludeFiles=""
 			/>
@@ -63,8 +63,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libeay32MDd.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Program Files\boost\boost_1_35_0\lib"
+				AdditionalLibraryDirectories=""
+				IgnoreAllDefaultLibraries="false"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -114,11 +116,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NOCRYPT;NODAEMON;NOEXEC;NOPACKED;NOSYSLOG;NOSIGNALCONTROLLER;WIN32_LEAN_AND_MEAN"
+				PreprocessorDefinitions="USE_SSL_CRYPTO;NODAEMON;NOEXEC;NOSYSLOG;NOSIGNALCONTROLLER;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -132,8 +134,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libeay32MD.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Program Files\boost\boost_1_35_0\lib"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -334,14 +337,6 @@
 			<File
 				RelativePath=".\authAlgo.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NODAEMON;NOEXEC;NOCRYPT"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\authAlgoFactory.cpp"
diff --git a/src/cipher.cpp b/src/cipher.cpp
index 69686bb..3dc2314 100644
--- a/src/cipher.cpp
+++ b/src/cipher.cpp
@@ -131,8 +131,8 @@ void AesIcmCipher::calcCtr(KeyDerivation& kd, seq_nr_t seq_nr, sender_id_t sende
   kd.generate(dir_, LABEL_SATP_SALT, seq_nr, salt_);
 
 #ifdef ANYTUN_02_COMPAT
-  if(!salt_[int32_t(0)])
-    salt_[int32_t(0)] = 1;
+  if(!salt_[u_int32_t(0)])
+    salt_[u_int32_t(0)] = 1;
 #endif
 
   std::memcpy(ctr_.salt_.buf_, salt_.getBuf(), SALT_LENGTH);
@@ -185,7 +185,7 @@ void AesIcmCipher::calc(KeyDerivation& kd, u_int8_t* in, u_int32_t ilen, u_int8_
     cLog.msg(Log::PRIO_ERR) << "AesIcmCipher: Failed to set cipher CTR: size don't fits";
     return;
   }
-  u_int32_t num = 0;
+  unsigned int num = 0;
   std::memset(ecount_buf_, 0, AES_BLOCK_SIZE);
   AES_ctr128_encrypt(in, out, (ilen < olen) ? ilen : olen, &aes_key_, ctr_.buf_, ecount_buf_, &num);
 #endif
diff --git a/src/cipher.h b/src/cipher.h
index 1e3471b..b26416b 100644
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -105,13 +105,16 @@ private:
   Buffer key_;
   Buffer salt_;
 
+#ifdef _MSC_VER
+  #pragma pack(push, 1)
+#endif
   union ATTR_PACKED cipher_aesctr_ctr_union {
     u_int8_t buf_[CTR_LENGTH];
     struct ATTR_PACKED {
       u_int8_t buf_[SALT_LENGTH];
       u_int16_t zero_;
     } salt_;
-    struct ATTR_PACKED {
+	struct ATTR_PACKED {
       u_int8_t fill_[SALT_LENGTH - sizeof(mux_t) - sizeof(sender_id_t) - 2 - sizeof(seq_nr_t)];
       mux_t mux_;
       sender_id_t sender_id_;
@@ -120,6 +123,9 @@ private:
       u_int16_t zero_;
     } params_;
   } ctr_;
+#ifdef _MSC_VER
+  #pragma pack(pop)
+#endif
 };
 #endif
 
diff --git a/src/datatypes.h b/src/datatypes.h
index 2fe492c..7025528 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -52,7 +52,7 @@ typedef u_int16_t sender_id_t;
 typedef u_int16_t payload_type_t;
 typedef u_int16_t mux_t;
 
-#ifndef NOPACKED
+#ifndef _MSC_VER
 #define ATTR_PACKED __attribute__((__packed__))
 #else
 #define ATTR_PACKED
diff --git a/src/encryptedPacket.h b/src/encryptedPacket.h
index 4a9b21b..ac67950 100644
--- a/src/encryptedPacket.h
+++ b/src/encryptedPacket.h
@@ -130,12 +130,18 @@ private:
 
   void reinit();
 
+#ifdef _MSC_VER
+  #pragma pack(push, 1)
+#endif  
   struct ATTR_PACKED HeaderStruct
   {
     seq_nr_t seq_nr;
     sender_id_t sender_id;
     mux_t mux;
   };
+#ifdef _MSC_VER
+  #pragma pack(pop)
+#endif
 
   struct HeaderStruct* header_;
 	u_int8_t * payload_;
diff --git a/src/keyDerivation.cpp b/src/keyDerivation.cpp
index 5b4f7a6..dbe5dee 100644
--- a/src/keyDerivation.cpp
+++ b/src/keyDerivation.cpp
@@ -225,7 +225,7 @@ bool AesIcmKeyDerivation::generate(kd_dir_t dir, satp_prf_label_t label, seq_nr_
     cLog.msg(Log::PRIO_ERR) << "AesIcmCipher: Failed to set cipher CTR: size don't fits";
     return false;
   }
-  u_int32_t num = 0;
+  unsigned int num = 0;
   std::memset(ecount_buf_[dir], 0, AES_BLOCK_SIZE);
   std::memset(key.getBuf(), 0, key.getLength());
   AES_ctr128_encrypt(key.getBuf(), key.getBuf(), key.getLength(), &aes_key_[dir], ctr_[dir].buf_, ecount_buf_[dir], &num);
diff --git a/src/keyDerivation.h b/src/keyDerivation.h
index 5d433ca..926d35f 100644
--- a/src/keyDerivation.h
+++ b/src/keyDerivation.h
@@ -170,14 +170,17 @@ private:
 
   key_store_t key_store_[2][KD_LABEL_COUNT];
 
+#ifdef _MSC_VER
+  #pragma pack(push, 1)
+#endif  
   union ATTR_PACKED key_derivation_aesctr_ctr_union {
     u_int8_t buf_[CTR_LENGTH];
-    struct ATTR_PACKED {
+	struct ATTR_PACKED {
       u_int8_t buf_[SALT_LENGTH];
       u_int16_t zero_;
     } salt_;
 #ifndef ANYTUN_02_COMPAT
-    struct ATTR_PACKED {
+	struct ATTR_PACKED {
       u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - sizeof(seq_nr_t)];
       u_int8_t label_;
       seq_nr_t r_;
@@ -193,6 +196,9 @@ private:
     } params_;
 #endif
   } ctr_[2];
+#ifdef _MSC_VER  
+  #pragma pack(pop)
+#endif
 };
 
 #endif
diff --git a/src/seqWindow.cpp b/src/seqWindow.cpp
index 1ddd3ca..34ce02c 100644
--- a/src/seqWindow.cpp
+++ b/src/seqWindow.cpp
@@ -140,7 +140,11 @@ bool SeqWindow::checkAndAdd(sender_id_t sender, seq_nr_t seq_nr)
   
   int ret = s->second.window_[pos];
   s->second.window_[pos] = 1;
-  return ret;
+  
+  if(ret)
+    return true;
+  
+  return false;
 }
 
 void SeqWindow::clear(sender_id_t sender)
-- 
2.11.4.GIT