newsbot
05.04.2010, 14:22
<pre>+ src/.gitignore
m src/shared/Auth/AuthCrypt.cpp
m src/shared/Auth/Hmac.cpp
m src/shared/Auth/Hmac.h
m src/shared/Auth/Makefile.am
m win/VC100/shared.vcxproj
m win/VC80/shared.vcproj
m win/VC90/shared.vcproj
Renamed HMACSHA1 to something that will not conflict with feature HMACSHA256 and HMACSHA512.
Conflicts:
src/shared/Auth/AuthCrypt.cpp
src/shared/Auth/HMACSHA1.cpp</pre>
Дальше... (http://github.com/mangos/mangos/commit/65f54901942dcb4937c380b344d7b35cea387f2b)
m src/shared/Auth/AuthCrypt.cpp
m src/shared/Auth/Hmac.cpp
m src/shared/Auth/Hmac.h
m src/shared/Auth/Makefile.am
m win/VC100/shared.vcxproj
m win/VC80/shared.vcproj
m win/VC90/shared.vcproj
Renamed HMACSHA1 to something that will not conflict with feature HMACSHA256 and HMACSHA512.
Conflicts:
src/shared/Auth/AuthCrypt.cpp
src/shared/Auth/HMACSHA1.cpp</pre>
Дальше... (http://github.com/mangos/mangos/commit/65f54901942dcb4937c380b344d7b35cea387f2b)