From 21239c9962a1fe544df9481befb3207959fb64cc Mon Sep 17 00:00:00 2001 From: "Martin Felis (berta)" Date: Wed, 16 Mar 2011 17:03:41 +0100 Subject: [PATCH] highscores can now be submitted to and retrieved from a server --- asteroids/Controller.cc | 2 - asteroids/Model.cc | 293 ++++++- asteroids/Model.h | 23 +- asteroids/View.cc | 25 +- asteroids/main.cc | 4 + engine/CMakeLists.txt | 5 + engine/Engine.cc | 16 +- engine/IMGUIControls.cc | 145 ++++ engine/IMGUIControls.h | 2 + engine/Utils.cc | 17 + engine/Utils.h | 1 + engine/Variables.cc | 20 +- engine/VariablesCommands.cc | 1 + engine/VariablesGlobal.h | 25 + engine/libraries/CMakeLists.txt | 1 + engine/libraries/sha2/CMakeLists.txt | 6 + engine/libraries/sha2/README | 272 +++++++ engine/libraries/sha2/sha2.c | 1065 ++++++++++++++++++++++++++ engine/libraries/sha2/sha2.h | 197 +++++ engine/tests/CMakeLists.txt | 1 + server/data/global_highscore.db | Bin 0 -> 2048 bytes server/highscore.php | 204 +++++ 22 files changed, 2264 insertions(+), 61 deletions(-) create mode 100644 engine/libraries/sha2/CMakeLists.txt create mode 100644 engine/libraries/sha2/README create mode 100644 engine/libraries/sha2/sha2.c create mode 100644 engine/libraries/sha2/sha2.h create mode 100644 server/data/global_highscore.db create mode 100644 server/highscore.php diff --git a/asteroids/Controller.cc b/asteroids/Controller.cc index 14099a3..b9f02cd 100644 --- a/asteroids/Controller.cc +++ b/asteroids/Controller.cc @@ -9,8 +9,6 @@ namespace asteroids { int Controller::OnInit (int argc, char *argv[]) { Engine::ControllerBase::OnInit (argc, argv); - mBindings[SDLK_q] = "quit"; - mBindings[SDLK_UP] = "+forward"; mBindings[SDLK_LEFT] = "+turnleft"; mBindings[SDLK_RIGHT] = "+turnright"; diff --git a/asteroids/Model.cc b/asteroids/Model.cc index 60db153..c364d8b 100644 --- a/asteroids/Model.cc +++ b/asteroids/Model.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include "Model.h" #include "Physics.h" @@ -17,6 +18,10 @@ namespace asteroids { static Model* ModelInstance = NULL; +Engine::Variable Model::HighscoreServerName ("highscore_server_name", "asteroids.fysx.org"); +Engine::Variable Model::HighscoreServerPath ("highscore_server_path", "/highscore/highscore.php?format=raw"); +Engine::Variable Model::UseServerHighscore ("use_server_highscore", "false"); + /* * Inherited Module functions */ @@ -40,20 +45,20 @@ int Model::OnInit (int argc, char* argv[]) { // First we reset the highscore list mHighscoreList.clear(); // then we try to load values from the file - LoadHighscoreList(); +// LoadHighscoreList(); // if we have less than the usual number of entries we add default values if (mHighscoreList.size() < 10) { - AddHighscoreEntry ("Imperator", 1000000); - AddHighscoreEntry ("Darth Vader", 800000); - AddHighscoreEntry ("Luke Skywalker", 600000); - AddHighscoreEntry ("Han Solo", 400000); - AddHighscoreEntry ("Princess Leia", 200000); - AddHighscoreEntry ("C3PO", 100000); - AddHighscoreEntry ("R2-D2", 50000); - AddHighscoreEntry ("Chewy", 10000); - AddHighscoreEntry ("Mr. Ewok", 5000); - AddHighscoreEntry ("Jabba the Hutt", 1000); + AddLocalHighscoreEntry ("Imperator", 1000000); + AddLocalHighscoreEntry ("Darth Vader", 800000); + AddLocalHighscoreEntry ("Luke Skywalker", 600000); + AddLocalHighscoreEntry ("Han Solo", 400000); + AddLocalHighscoreEntry ("Princess Leia", 200000); + AddLocalHighscoreEntry ("C3PO", 100000); + AddLocalHighscoreEntry ("R2-D2", 50000); + AddLocalHighscoreEntry ("Chewy", 10000); + AddLocalHighscoreEntry ("Mr. Ewok", 5000); + AddLocalHighscoreEntry ("Jabba the Hutt", 1000); } // Reset the newest highscore entry index which may be used for highlighting @@ -69,12 +74,28 @@ int Model::OnInit (int argc, char* argv[]) { mLevelAuthor = ""; mLevelTitle = ""; + // initialize SDL_net to be able to retrieve highscore from the internet + if (SDLNet_Init() == -1) { + Engine::LogError("SDLNet_Init: %s\n", SDLNet_GetError()); + } + + SubmitGlobalHigscoreEntry ("asteroids_full", 321321321); + Engine::RegisterListener (this, EventAccelerateStart); Engine::RegisterListener (this, EventAccelerateStop); return result; } +void Model::OnDestroy() { + Engine::ModelBase::OnDestroy(); + mAsteroids.clear(); + mLevelList.clear(); + SaveLocalHighscoreList(); + + SDLNet_Quit(); +} + bool Model::OnReceiveEvent (const Engine::EventBasePtr &event) { switch (event->mEventType) { case EventAccelerateStart: @@ -151,27 +172,13 @@ unsigned int Model::InitLevelList () { return mLevelList.size(); } -void Model::LoadHighscoreList () { - Engine::LogDebug ("Loading highscore file"); - boost::filesystem::path highscore_file(Engine::GetUserDirFullPath("/highscore.dat")); +void Model::ParseHighscoreStream (std::istream &highscore_stream) { + std::string line; - // if the file does not exist, we create it and write standard values into - // it. - if (!boost::filesystem::exists(highscore_file)) - return; - - if (!boost::filesystem::is_regular_file(highscore_file)) { - Engine::LogError ("Could not load highscore file: %s is not a regular file!", highscore_file.filename().c_str()); - } - - std::ifstream score_stream (highscore_file.filename().c_str()); - while (!score_stream.eof()) { + while (getline(highscore_stream, line)) { std::string name; unsigned int points; - std::string line; - getline (score_stream, line); - std::string::size_type delimiter = line.find ('\t'); if (delimiter == std::string::npos) break; @@ -182,11 +189,48 @@ void Model::LoadHighscoreList () { points_stream >> points; Engine::LogDebug ("Read Highscore Entry Name: %s Points: %d", name.c_str(), points); - AddHighscoreEntry (name, points); + AddLocalHighscoreEntry (name, points); } } -void Model::SaveHighscoreList () { +void Model::LoadHighscoreList () { + mHighscoreList.clear(); + + if (Model::UseServerHighscore.GetBoolValue()) { + Engine::LogMessage ("Retrieving Highscore from server"); + std::stringstream global_highscore_stream; + + if (PullGlobalHighscore(global_highscore_stream)) { + ParseHighscoreStream(global_highscore_stream); + return; + } + } + + LoadLocalHighscoreList(); +} + +void Model::LoadLocalHighscoreList () { + Engine::LogDebug ("Loading local highscore file"); + boost::filesystem::path highscore_file(Engine::GetUserDirFullPath("/highscore.dat")); + + // if the file does not exist, we create it and write standard values into + // it. + if (!boost::filesystem::exists(highscore_file)) + return; + + if (!boost::filesystem::is_regular_file(highscore_file)) { + Engine::LogError ("Could not load highscore file: %s is not a regular file!", highscore_file.filename().c_str()); + } + + std::ifstream score_stream (highscore_file.filename().c_str()); + + ParseHighscoreStream (score_stream); + + score_stream.close(); +} + +void Model::SaveLocalHighscoreList () { + Engine::LogDebug ("Saving local highscore file"); std::ofstream highscore_file (Engine::GetUserDirFullPath("/highscore.dat").c_str()); std::list::iterator iter = mHighscoreList.begin(); @@ -207,7 +251,7 @@ bool highscore_cmp (Model::HighscoreEntry a, Model::HighscoreEntry b) { * * \TODO Re-think usage of mNewestHighscoreEntryIndex variable in this function */ -unsigned int Model::AddHighscoreEntry(const std::string &name, const unsigned int points) { +unsigned int Model::AddLocalHighscoreEntry(const std::string &name, const unsigned int points) { HighscoreEntry entry; entry.name = name; entry.points = points; @@ -239,13 +283,192 @@ unsigned int Model::AddHighscoreEntry(const std::string &name, const unsigned in // if we have all 10 entries then we can save // the highscore - SaveHighscoreList(); + SaveLocalHighscoreList(); mNewestHighscoreEntryIndex = 99999; return 99999; } +bool Model::PullGlobalHighscore(std::stringstream &highscore_stream) { + highscore_stream.str(""); + + IPaddress server_address; + + if (SDLNet_ResolveHost (&server_address, Model::HighscoreServerName.GetStringValue().c_str(), 80) == -1) { + Engine::LogWarning ("SDL_net resolve host: %s", SDLNet_GetError()); + return false; + } + + char ip_address_char[4]; + memcpy (&ip_address_char[0], &server_address.host, sizeof(char) * 4); + + int ip_address[4]; + ip_address[0] = static_cast(ip_address_char[0]); + ip_address[1] = static_cast(ip_address_char[1]); + ip_address[2] = static_cast(ip_address_char[2]); + ip_address[3] = static_cast(ip_address_char[3]); + + Engine::LogMessage ("Pulling global highscore from server %s (%d.%d.%d.%d)", + Model::HighscoreServerName.GetStringValue().c_str(), + ip_address[0], + ip_address[1], + ip_address[2], + ip_address[3] + ); + + TCPsocket server_socket = SDLNet_TCP_Open (&server_address); + if (!server_socket) { + Engine::LogError ("SDL_net tcp open: %s", SDLNet_GetError()); + return false; + } + + std::string http_query_string; + http_query_string = std::string ("GET ") + Model::HighscoreServerPath.GetStringValue() + std::string(" HTTP/1.1\r\nHost: asteroids.fysx.org\r\nConnection: close\r\n\r\n"); + + int bytes_sent; + bytes_sent = SDLNet_TCP_Send (server_socket, http_query_string.c_str(), http_query_string.size()); + + if (bytes_sent != http_query_string.size()) { + Engine::LogError ("SDL_net tcp send: %s", SDLNet_GetError()); + return false; + } + + char receive_buffer[255]; + std::string http_result; + + bool receiving = true; + while (receiving) { + // reset the buffer + bzero (&receive_buffer[0], 255); + + // read the data + int received_bytes = SDLNet_TCP_Recv (server_socket, receive_buffer, 255); + + if (received_bytes <= 0) { + receiving = false; + } + + http_result.append (receive_buffer, received_bytes); + } + + // we have to strip the whitespaces twice to cut out the content + http_result = strip_whitespaces (http_result); + http_result = http_result.substr (http_result.find ("\n\r"), http_result.size()); + http_result = strip_whitespaces (http_result); + + Engine::LogDebug ("Received Highscore: %s", http_result.c_str()); + + SDLNet_TCP_Close (server_socket); + + highscore_stream.str(http_result); + + return true; +} + +bool Model::SubmitGlobalHigscoreEntry (const std::string &name, const unsigned int points) { + IPaddress server_address; + + if (SDLNet_ResolveHost (&server_address, Model::HighscoreServerName.GetStringValue().c_str(), 80) == -1) { + Engine::LogWarning ("SDL_net resolve host: %s", SDLNet_GetError()); + return false; + } + + char ip_address_char[4]; + memcpy (&ip_address_char[0], &server_address.host, sizeof(char) * 4); + + int ip_address[4]; + ip_address[0] = static_cast(ip_address_char[0]); + ip_address[1] = static_cast(ip_address_char[1]); + ip_address[2] = static_cast(ip_address_char[2]); + ip_address[3] = static_cast(ip_address_char[3]); + + Engine::LogDebug ("Submitting highscore player_name='%s' score_value='%d' to server %s (%d.%d.%d.%d)", + name.c_str(), + points, + Model::HighscoreServerName.GetStringValue().c_str(), + ip_address[0], + ip_address[1], + ip_address[2], + ip_address[3] + ); + + TCPsocket server_socket = SDLNet_TCP_Open (&server_address); + if (!server_socket) { + Engine::LogError ("SDL_net tcp open: %s", SDLNet_GetError()); + return false; + } + + std::stringstream points_stringstream; + points_stringstream << points; + + std::stringstream hash_input; + hash_input << name << ":" << points << ":" << sha256_hash ("asteroids rule"); + + std::string key = sha256_hash (hash_input.str()); + + std::string http_query_string; + http_query_string = std::string ("GET ") + + Model::HighscoreServerPath.GetStringValue() + + std::string("&player_name=") + name + + std::string("&score_value=") + points_stringstream.str() + + std::string("&key=") + key + + std::string(" HTTP/1.1\r\nHost: asteroids.fysx.org\r\nConnection: close\r\n\r\n"); + + int bytes_sent; + bytes_sent = SDLNet_TCP_Send (server_socket, http_query_string.c_str(), http_query_string.size()); + + if (bytes_sent != http_query_string.size()) { + Engine::LogError ("SDL_net tcp send: %s", SDLNet_GetError()); + return false; + } + + char receive_buffer[255]; + std::string http_result; + + bool receiving = true; + while (receiving) { + // reset the buffer + bzero (&receive_buffer[0], 255); + + // read the data + int received_bytes = SDLNet_TCP_Recv (server_socket, receive_buffer, 255); + + if (received_bytes <= 0) { + receiving = false; + } + + http_result.append (receive_buffer, received_bytes); + } + + // we have to strip the whitespaces twice to cut out the content + http_result = strip_whitespaces (http_result); + http_result = http_result.substr (http_result.find ("\n\r"), http_result.size()); + http_result = strip_whitespaces (http_result); + + SDLNet_TCP_Close (server_socket); + + if (http_result == "OK") { + Engine::LogDebug ("Submission successful: %s", http_result.c_str()); + LoadHighscoreList(); + return true; + } else { + Engine::LogMessage ("Submission unsuccessful: %s", http_result.c_str()); + } + + return false; +} + +void Model::SubmitHighscoreEntry (const std::string &name, const unsigned int points) { + if (Model::UseServerHighscore.GetBoolValue()) { + Engine::LogMessage ("Sending highscore entry to the server"); + + SubmitGlobalHigscoreEntry (name, points); + } else { + AddLocalHighscoreEntry (name, points); + } +} + int Model::DoLoadLevel (const char* filename) { Engine::LogMessage ("Loading level from %s", filename); std::fstream level_file (filename, std::ios::in); @@ -403,11 +626,11 @@ void Model::SetGameState (const unsigned int &state) { } bool Model::OnGameOver() { - Engine::LogMessage ("Points = %d lowest = %d", mPoints, mHighscoreList.back().points ); + Engine::LogDebug ("Points = %d lowest = %d", mPoints, mHighscoreList.back().points ); + SubmitHighscoreEntry (mPlayerName, mPoints); if (mPoints > mHighscoreList.back().points) { Engine::LogMessage ("New Highscore!"); - AddHighscoreEntry (mPlayerName, mPoints); } return false; @@ -425,7 +648,7 @@ void Model::OnNewGame() { } void Model::OnShipExplode () { - Engine::PlaySound(Engine::GetResourceFullPath("/data/sounds/rock_destroyed.wav")); + Engine::PlaySound(Engine::GetResourceFullPath("/data/sounds/ship_destroyed.wav")); mPlayerLives --; diff --git a/asteroids/Model.h b/asteroids/Model.h index d8dccaf..b536f71 100644 --- a/asteroids/Model.h +++ b/asteroids/Model.h @@ -63,22 +63,22 @@ class Model : public Engine::ModelBase { unsigned int points; }; + void ParseHighscoreStream (std::istream &highscore_stream); void LoadHighscoreList (); - void SaveHighscoreList (); - unsigned int AddHighscoreEntry(const std::string &name, const unsigned int points); - bool HighscoreCmp (HighscoreEntry a, HighscoreEntry b); + bool PullGlobalHighscore (std::stringstream &highscore_stream); + bool SubmitGlobalHigscoreEntry (const std::string &name, const unsigned int points); + void SubmitHighscoreEntry (const std::string &name, const unsigned int points); + unsigned int AddLocalHighscoreEntry(const std::string &name, const unsigned int points); + void LoadLocalHighscoreList (); + void SaveLocalHighscoreList (); + std::list mHighscoreList; unsigned int mNewestHighscoreEntryIndex; protected: /** \brief Initializes the system */ virtual int OnInit (int argc, char* argv[]); - virtual void OnDestroy() { - Engine::ModelBase::OnDestroy(); - mAsteroids.clear(); - mLevelList.clear(); - SaveHighscoreList(); - }; + virtual void OnDestroy(); virtual void OnRegisterCommands (); virtual void OnCreateEntity (const int type, const unsigned int id); @@ -100,6 +100,11 @@ class Model : public Engine::ModelBase { std::string mLevelAuthor; std::string mLevelTitle; + static Engine::Variable HighscoreServerName; + static Engine::Variable HighscoreServerPath; + static Engine::Variable UseServerHighscore; + static Engine::Variable UseServerHighscoreAsked; + virtual bool OnReceiveEvent (const Engine::EventBasePtr &event); friend class View; diff --git a/asteroids/View.cc b/asteroids/View.cc index ef355ae..8fddba9 100644 --- a/asteroids/View.cc +++ b/asteroids/View.cc @@ -710,8 +710,8 @@ void View::DrawUiHighscore() { while (highscore_iter != GetModel()->mHighscoreList.end()) { // Check whether we have to highlight an entry (such as when entering // the name) - if (GetModel()->mNewestHighscoreEntryIndex < GetModel()->mHighscoreList.size() - && GetModel()->mNewestHighscoreEntryIndex == i) { + if (GetModel()->GetPlayerName() == highscore_iter->name + && GetModel()->GetPoints() == highscore_iter->points) { // we highlight the newest entry SelectFont("console.ttf color=#e8d500 size=23"); } else { @@ -726,7 +726,8 @@ void View::DrawUiHighscore() { highscore_iter++; } - if (Engine::GUI::Button (1, "Back to Menu", screen_right * 0.5 - 250 * 0.5, y + 16, button_width, button_height)) { + if (Engine::GUI::Button (1, "Back to Menu", screen_right * 0.5 - 250 * 0.5, y + 16, button_width, button_height) + || Engine::GUI::CheckKeyPressed(SDLK_ESCAPE) ) { PopViewState(); } } @@ -752,7 +753,8 @@ void View::DrawUiOptions() { } - if (Engine::GUI::Button (5, "Back", screen_right * 0.5 - 100, 380, button_width, button_height)) { + if (Engine::GUI::Button (5, "Back", screen_right * 0.5 - 100, 380, button_width, button_height) + || Engine::GUI::CheckKeyPressed(SDLK_ESCAPE) ) { PopViewState(); } } @@ -773,7 +775,7 @@ _Music\r\ DJad - Space Exploration\r\ \r\ _Sounds\r\ - Marcus Zetterquist\r\ + Martin Felis\r\ \r\ _Libraries\r\ libSDL\r\ @@ -782,11 +784,15 @@ _Libraries\r\ freetype2\r\ boost\r\ libpng\r\ + \r\ + Aaron D. Gifford's sha2 code\r\ \r\ _Tools\r\ GIMP\r\ Blender\r\ CMake\r\ + sfxr-sdl\r\ + Audacity\r\ \r\ _Special Thanks\r\ to my wonderful wife Katrina\r\ @@ -795,7 +801,6 @@ _Special Thanks\r\ \r\ \r\ \r\ - \r\ _http://www.fysx.org\r\ \r\ \r\ @@ -804,6 +809,7 @@ _http://www.fysx.org\r\ \r\ \r\ \r\ + \r\ :created with vim.\r\ ::wq\r\ \r\ @@ -876,7 +882,9 @@ void View::DrawUiEnterPlayername() { SelectFont("console.ttf size=23"); Engine::GUI::Label (1, "Enter your name: ", screen_right * 0.5 - 220, 250); - if (Engine::GUI::LineEdit (2, screen_right * 0.5 + 20, 238, player_name, 16)) { + std::string valid_chars ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890-_!."); + + if (Engine::GUI::LineEditMasked (2, screen_right * 0.5 + 20, 238, player_name, 16, valid_chars)) { GetModel()->SetPlayerName(player_name); } @@ -887,7 +895,8 @@ void View::DrawUiEnterPlayername() { GetModel()->SetGameState(GameStateRunning); } - if (Engine::GUI::Button (5, "Back", 20, 500, 180, 40)) { + if (Engine::GUI::Button (5, "Back", 20, 500, 180, 40) + || Engine::GUI::CheckKeyPressed(SDLK_ESCAPE) ) { PopViewState(); } } diff --git a/asteroids/main.cc b/asteroids/main.cc index eaf5ebd..b46f6ed 100644 --- a/asteroids/main.cc +++ b/asteroids/main.cc @@ -8,6 +8,7 @@ #include "Model.h" #include "Physics.h" #include "EntityFactory.h" +#include "Game.h" #include @@ -164,12 +165,15 @@ int main (int argc, char* argv[]) { Engine::PlayMusic (Engine::GetResourceFullPath("/data/sounds/intro_music.ogg")); + asteroids::GetModel()->LoadHighscoreList(); + engine.MainLoop (); // save the configuration std::ofstream config_file (engine.GetUserDirFullPath("/config.rc").c_str()); config_file << "set effects_volume " << Engine::GetEffectsVolume() << std::endl; config_file << "set music_volume " << Engine::GetMusicVolume() << std::endl; + config_file << "set use_server_highscore " << Engine::GetVariableString("use_server_highscore") << std::endl; config_file.close(); SDL_WM_SetIcon(NULL,NULL); diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index daf86d0..69c1628 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -4,6 +4,7 @@ LIST( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake ) FIND_PACKAGE (SDL REQUIRED) FIND_PACKAGE (SDL_mixer REQUIRED) +FIND_PACKAGE (SDL_net REQUIRED) FIND_PACKAGE (OpenGL REQUIRED) FIND_PACKAGE (PNG REQUIRED) FIND_PACKAGE (FreeType2 REQUIRED) @@ -43,10 +44,12 @@ SET ( ENGINE_SRCS INCLUDE_DIRECTORIES ( ${Boost_INCLUDE_DIRS} ${SDLMIXER_INCLUDE_DIRS} + ${SDLNET_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR} libraries/mathlib/ libraries/coll2d/include libraries/oglft/liboglft + libraries/sha2/ ${FREETYPE2_INCLUDE_DIR} ) @@ -55,12 +58,14 @@ ADD_LIBRARY ( Engine STATIC ${ENGINE_SRCS} ) TARGET_LINK_LIBRARIES ( Engine ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} + ${SDLNET_LIBRARY} ${OPENGL_LIBRARIES} ${PNG_LIBRARIES} ${Boost_LIBRARIES} mathlib oglft coll2d + sha2 ) ADD_SUBDIRECTORY ( tests ) diff --git a/engine/Engine.cc b/engine/Engine.cc index 681ab40..8579850 100644 --- a/engine/Engine.cc +++ b/engine/Engine.cc @@ -37,6 +37,8 @@ int Engine::OnInit (int argc, char* argv[]) { EngineInstance = this; mStatus = EngineStatusUndefined; + /* Phase 0: Logging, Events, Variables, Commands, SDL */ + /* Initialization of the base modules */ if (mLogging == NULL) mLogging = new Logging (); @@ -77,6 +79,13 @@ int Engine::OnInit (int argc, char* argv[]) { } SDL_WM_SetCaption("Engine Initializing","Engine Initializing"); + /* Now register the commands */ + mLogging->RegisterCommands (); + mVariables->RegisterCommands (); + mCommands->RegisterCommands (); + + /* Phase 1: Sounds, Model, EntityFactory, Physics, View, Camera, Controller*/ + /* Sound */ mSoundManager = new SoundBase(); mSoundManager->Init (argc, argv); @@ -96,7 +105,6 @@ int Engine::OnInit (int argc, char* argv[]) { mModel->mEntityFactory = mEntityFactory; - /* Physics */ if (mPhysics == NULL) { mPhysics = new PhysicsBase (); @@ -142,11 +150,7 @@ int Engine::OnInit (int argc, char* argv[]) { mController->Init (argc, argv); - /* Now register the commands */ - mLogging->RegisterCommands (); - mVariables->RegisterCommands (); - mCommands->RegisterCommands (); - + mModel->mPhysics->RegisterCommands (); mModel->RegisterCommands (); diff --git a/engine/IMGUIControls.cc b/engine/IMGUIControls.cc index c552c0d..e62f3cc 100644 --- a/engine/IMGUIControls.cc +++ b/engine/IMGUIControls.cc @@ -546,6 +546,151 @@ bool LineEdit (int id, int x, int y, std::string &text_value, const int &maxleng return false; } +bool LineEditMasked (int id, int x, int y, std::string &text_value, const int &maxlength, const std::string &valid_chars) { + controller = EngineGetController(); + assert (controller); + + int textpos_x = x + 8; + int textpos_y = y + 5; + + y -= 16; + int w = maxlength * 16; + int h = 30; + +// LogMessage ("id = %d hotitem = %d activeitem = %d kbditem = %d key = %s", id, controller->uistate.hotitem, controller->uistate.activeitem, controller->uistate.kbditem, convert_keycode (controller->uistate.last_keysym)); + + // Check for hotness + if (regionhit (x, y, w, h)) { + controller->uistate.hotitem = id; + if (controller->uistate.activeitem == 0 + && controller->GetButtonState(MouseButtonLeft)) { + controller->uistate.activeitem = id; + } + } + + if (controller->uistate.kbditem == 0) { + controller->uistate.hotitem = id; + controller->uistate.kbditem = id; + controller->uistate.last_unicode = 0; + return false; + } + + // If we have keyboard focus, we highlight the widget + if ( controller->uistate.kbditem == id) { + if (controller->uistate.activeitem == id) { + glColor3f (0.8, 0.8, 0.8); + DrawBlock (x, y, w, h); + } else { + glColor3f (0.7, 0.7, 0.7); + DrawBlock (x, y, w, h); + } + } else { + glColor3f (0.4, 0.4, 0.4); + DrawBlock (x, y, w, h); + } + + // Rendering of the current value + float width, height; + view = EngineGetView (); + assert (view); + + glColor3f (1., 1., 1.); + + std::string text_output = text_value; + + if (controller->uistate.kbditem == id && SDL_GetTicks() >> 9 & 1) + text_output += "_"; + + SelectFont("console.ttf size=23"); + view->DrawGLStringMeasure(text_value.c_str(), &width, &height); + view->DrawGLString(textpos_x, textpos_y, text_output.c_str()); + + // Keyboard Logic + if (controller->uistate.kbditem == id) { + switch (controller->uistate.last_keysym) { + case SDLK_DOWN: + controller->uistate.kbditem = 0; + controller->uistate.hotitem = 0; + controller->uistate.last_keysym = SDLK_CLEAR; + break; + case SDLK_UP: + controller->uistate.kbditem = controller->uistate.lastwidget; + controller->uistate.hotitem = controller->uistate.lastwidget; + controller->uistate.last_keysym = SDLK_CLEAR; + break; + case SDLK_CLEAR: + controller->uistate.last_keysym = SDLK_CLEAR; + controller->uistate.last_unicode = 0; + return false; + break; + case SDLK_ESCAPE: + controller->uistate.last_keysym = SDLK_CLEAR; + controller->uistate.last_unicode = 0; + controller->uistate.hotitem = 0; + controller->uistate.kbditem = 0; + return false; + break; + case SDLK_TAB: + controller->uistate.last_keysym = SDLK_CLEAR; + controller->uistate.last_unicode = 0; + controller->uistate.hotitem = 0; + controller->uistate.kbditem = 0; + return false; + break; + case SDLK_RETURN: + controller->uistate.last_keysym = SDLK_CLEAR; + controller->uistate.last_unicode = 0; + controller->uistate.hotitem = 0; + controller->uistate.kbditem = 0; + return true; + break; + case SDLK_BACKSPACE: + if (text_value.size() > 0) { + text_value = text_value.substr(0, text_value.size() - 1); + controller->uistate.last_keysym = SDLK_CLEAR; + controller->uistate.last_unicode = 0; + return true; + } + break; + default: + // The raw input processing + if (maxlength > 0 && text_value.size() < maxlength) { + if (controller->uistate.last_unicode) { + if ((controller->uistate.last_unicode & 0xFF80) == 0) { + char c = controller->uistate.last_unicode & 0x7F; + + // we do not want to add special characters such as backspaces + // etc. + if (c >= 0x20 && valid_chars.find(c) != std::string::npos ) { + text_value += c; + } + controller->uistate.last_unicode = 0; + return true; + } else { + LogWarning ("Input key not supported!"); + return false; + } + } + } + break; + } + } + + controller->uistate.lastwidget = id; + + // Mouse Logic + if (controller->GetButtonState(MouseButtonLeft) == false + && controller->uistate.hotitem == id + && controller->uistate.activeitem == id) { + controller->uistate.kbditem = id; + controller->uistate.last_unicode = 0; + } + + return false; +} + + + float VerticalSlider (int id, int x, int y, int w, int h, float min_value, float max_value, float &value) { const int knob_width = 16; const int knob_height = h * 2; diff --git a/engine/IMGUIControls.h b/engine/IMGUIControls.h index c27b523..7ff2fb0 100644 --- a/engine/IMGUIControls.h +++ b/engine/IMGUIControls.h @@ -38,6 +38,8 @@ bool CheckButton (int id, const char* caption, bool state, int x, int y, int w, bool LineEdit (int id, int x, int y, std::string &text_value, const int &maxlength); +bool LineEditMasked (int id, int x, int y, std::string &text_value, const int &maxlength, const std::string &valid_chars); + float VerticalSlider (int id, int x, int y, int w, int h, float min_value, float max_value, float &value); /** \brief Checks whether a given key is currently pressed diff --git a/engine/Utils.cc b/engine/Utils.cc index 3b922ae..4f8bf09 100644 --- a/engine/Utils.cc +++ b/engine/Utils.cc @@ -7,7 +7,12 @@ #include #include +#include + std::string strip_whitespaces (const std::string input_str) { + if (input_str.size() == 0) + return input_str; + std::string result = input_str.substr(input_str.find_first_not_of (" \t\n\r"), input_str.size()); return result.substr (0, result.find_last_not_of(" \t\n\r") + 1); } @@ -36,3 +41,15 @@ bool create_dir (const std::string &dir_str) { return false; } + +std::string sha256_hash (std::string input) { + char result_buf[64]; + + SHA256_CTX ctx256; + + SHA256_Init(&ctx256); + SHA256_Update(&ctx256, (unsigned char*) input.c_str(), input.size()); + SHA256_End (&ctx256, result_buf); + + return std::string (result_buf, 64); +} diff --git a/engine/Utils.h b/engine/Utils.h index a986bca..365ff1d 100644 --- a/engine/Utils.h +++ b/engine/Utils.h @@ -5,5 +5,6 @@ std::string strip_whitespaces (const std::string input_str); bool create_dir (const std::string &dir_str); +std::string sha256_hash (std::string input); #endif /* _UTILS_H */ diff --git a/engine/Variables.cc b/engine/Variables.cc index 6017385..15f790a 100644 --- a/engine/Variables.cc +++ b/engine/Variables.cc @@ -63,6 +63,7 @@ Variable::Variable (const std::string &name, const std::string &value) { mName = name; mStringValue = value; mFloatValue = atof (value.c_str()); + mBoolValue = ParseBoolValue (value); if (VariablesInstance == NULL) { delayed_variables.push_back (this); @@ -81,7 +82,7 @@ Variable::Variable (const std::string &name, const std::string &value) { } void Variable::RegisterVariable (const std::string &name) { - if (! VariablesInstance ) { +if (! VariablesInstance ) { LogError ("Unable to register Variable '%s': Variables System not initialized!", name.c_str()); return; } @@ -89,6 +90,23 @@ void Variable::RegisterVariable (const std::string &name) { VariablesInstance->RegisterVariable (name, this); } +bool Variable::ParseBoolValue (std::string value) { + float float_value = atof (value.c_str()); + + if (float_value != 0.) + return true; + + // transform to upper case + unsigned int i; + for (i = 0; i < value.size(); i++) + value[i] = tolower (value[i]); +// std::transform (value.begin(), value.end(), value.begin(), ::tolower); + + if (value == "true" + || value == "yes") + return true; +} + /* * Global functions */ diff --git a/engine/VariablesCommands.cc b/engine/VariablesCommands.cc index ab03103..3425899 100644 --- a/engine/VariablesCommands.cc +++ b/engine/VariablesCommands.cc @@ -26,6 +26,7 @@ bool Cmd_Set (const std::vector args) { if (test) { test->SetStringValue (args[1]); test->SetFloatValue (atof (args[1].c_str())); + test->SetBoolValueFromString (args[1]); return true; } diff --git a/engine/VariablesGlobal.h b/engine/VariablesGlobal.h index 1739cb5..0efc970 100644 --- a/engine/VariablesGlobal.h +++ b/engine/VariablesGlobal.h @@ -29,12 +29,22 @@ class Variable { float& GetFloatValue () { return mFloatValue; } + /** \brief Returns the float value of the Variable */ + bool& GetBoolValue () { + return mBoolValue; + } void SetStringValue (const std::string &value) { mStringValue = value; } void SetFloatValue (float value) { mFloatValue = value; } + void SetBoolValue (bool value) { + mBoolValue = value; + } + void SetBoolValueFromString (std::string str_value) { + mBoolValue = ParseBoolValue (str_value); + } private: /** \brief The default constructor must not be used. @@ -48,9 +58,21 @@ class Variable { /** \brief Registeres this Variable with the Variables System */ void RegisterVariable (const std::string &name); + /** \brief Parses the input value and checks whether it resembles true or not + * + * Valid true expressions are: + * - any float values that are unequal to zero + * - true (case insensitive) + * - yes (case insensitive) + * + * \returns true if value contains a value that qualifies as a valid "true" expression + */ + bool ParseBoolValue (std::string value); + std::string mName; std::string mStringValue; float mFloatValue; + bool mBoolValue; friend class Variables; }; @@ -63,6 +85,9 @@ bool SetVariableValue (const std::string &name, const std::string &value); std::string& GetVariableString (const std::string &name, std::string def = ""); /** \brief Returns the float value of the Variable with the given name */ float& GetVariableFloat (const std::string &name, float def = 0.); +/** \brief Returns the boolean value of the Variable with the given name */ +bool& GetVariableBool (const std::string &name, bool def = false); + } #endif // _VARIABLESGLOBAL_H diff --git a/engine/libraries/CMakeLists.txt b/engine/libraries/CMakeLists.txt index d613c45..4a16cef 100644 --- a/engine/libraries/CMakeLists.txt +++ b/engine/libraries/CMakeLists.txt @@ -1,3 +1,4 @@ ADD_SUBDIRECTORY ( mathlib ) ADD_SUBDIRECTORY ( coll2d ) ADD_SUBDIRECTORY ( oglft ) +ADD_SUBDIRECTORY ( sha2 ) diff --git a/engine/libraries/sha2/CMakeLists.txt b/engine/libraries/sha2/CMakeLists.txt new file mode 100644 index 0000000..4fc7416 --- /dev/null +++ b/engine/libraries/sha2/CMakeLists.txt @@ -0,0 +1,6 @@ +PROJECT (SHA2 CXX) + +SET ( SRCS + sha2.c + ) +ADD_LIBRARY ( sha2 STATIC sha2.c) diff --git a/engine/libraries/sha2/README b/engine/libraries/sha2/README new file mode 100644 index 0000000..95e57f3 --- /dev/null +++ b/engine/libraries/sha2/README @@ -0,0 +1,272 @@ +VERSION: + +This is version 1.0 RELEASE + +While this is my "release" version, due to lack of additional +official test vectors against which to verify this implementation's +correctness, beware that there may be implementation bugs. Also, +it has not yet been tested on very many other architectures, +big-endian machines in particular. + + +LICENSE: + +This implementation is released freely under an open-source BSD +license which appears at the top of each source code file. + + +WHAT IT IS: + +The files sha2.h and sha2.c implement the SHA-256, SHA-384, and SHA-512 +hash algorithms as described in the PDF document found at the following +web address: + + http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf + +The interface is similar to the interface to SHA-1 found in the OpenSSL +library. + +The file sha2prog.c is a simple program that accepts input from either +STDIN or reads one or more files specified on the command line, and then +generates the specified hash (either SHA-256, SHA-384, SHA-512, or any +combination thereof, including all three at once). + + +LIMITATIONS: + +This implementation has several limitations: + + * Input data is only accepted in octet-length increments. No sub-byte + data is handled. The NIST document describes how to handle sub-byte + input data, but for ease of implementation this version will only + accept message data in multiples of bytes. + * This implementation utilizes 64-bit integer data types. If your + system and compiler does not have a 64-bit integer data type, this + implementation will not work. + * Because of the use of 64-bit operations, many 32-bit architectures + that do have 64-bit data types but do operations most efficiently + on 32-bit words, this implementation may be slower than an + implementation designed to use only 32-bit words (emulating the + 64-bit operations). + * On platforms with 128-bit integer data types, the SHA-384 and SHA-512 + bit counters used by this implementation might be better off using + the 128-bit type instead of simulating it with two 64-bit integers. + * This implementation was written in C in hopes of portability and for + the fun of it during my spare time. It is probably not the most + efficient or fastest C implementation. I welcome suggestions, + however, that suggest ways to speed things up without breaking + portability. I also welcome suggestions to improve portability. + * As mentioned above, this code has NOT been thoroughly tested. + This is perhaps the most severe limitation. + + +BEFORE YOU COMPILE (OPTIONS): + +Each of the options described below may either be defined in the sha2.h +header file (or in the sha2.c file in some cases), or on the command +line at compile time if your compiler supports such things. For +example: + + #define SHA2_USE_INTTYPES_H + #define SHA2_UNROLL_TRANSFORM + +Or: + + cc -c -DSHA2_UNROLL_TRANSFORM sha2.c + cc -c -DBYTE_ORDER=4321 -DBIG_ENDIAN=4321 sha2.c + +Here are the available options. Read on below for a description of +each one: + + SHA2_USE_INTTYPES_H + SHA2_USE_MEMSET_MEMCPY/SHA2_USE_BZERO_BCOPY + SHA2_UNROLL_TRANSFORM + BYTE_ORDER (LITTLE_ENDIAN/BIG_ENDIAN) + +* SHA2_USE_INTTYPES_H option: +By default, this code uses u_intXX_t data types for 8 bit, 32 bit, and +64 bit unsigned integer type definitions. Most BSD systems define these, +as does Linux. However, some (like Compaq's Tru64 Unix) may instead +use uintXX_t data types as defined by recent ANSI C standards and as +included in the inttypes.h header file. Those wanting to use inttypes.h +need to define this either in sha.h or at compile time. + +On those systems where NEITHER definitions are available, you will need +to edit both sha2.h and sha2.c and define things by hand in the appropriate +sections. + +* BYTE_ORDER definitions: +This code assumes that BYTE_ORDER will be defined by the system during +compile to either equal LITTLE_ENDIAN or BIG_ENDIAN. If your system +does not define these, you may need to define them by hand in the sha.c +file according to the byte ordering conventions of your system. + +* SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY +The code in sha2.c can use either memset()/memcpy() for memory block +operations, or bzero()/mcopy(). If you define neither of these, the +code will default to memset()/memcpy(). You can define either at the +command line or in sha2.h or in sha2.c. + +* SHA2_UNROLL_TRANSFORM +By defining this either on the command line or in sha2.h or sha2.c, +the code will use macros to partially "unroll" the SHA transform +function. This usually generates bigger executables. It CAN (but +not necessarily WILL) generate faster code when you tell your compiler +to optimize things. For example, on the FreeBSD and Linux x86 systems +I tested things on (using gcc), when I optimized with just -O2 and +unrolled the transform, the hash transform was faster by 15-30%. On +these same systems, if I did NO optimization, the unrolled transform +was SLOWER, much slower (I'm guessing because the code was breaking +the cache, but I'm not sure). Your mileage may vary. + + +PORTABILITY: + +The code in sha2.c and sha2.h is intended to be portable. It may +require that you do a few #definitions in the .h file. I've successfully +compiled and tested the sha2.c and sha2.h code on Apple's OS X (on +a PPC), FreeBSD 4.1.1 on Intel, Linux on Intel, FreeBSD on the Alpha, +and even under Windows98SE using Metrowerks C. The utility/example +programs (sha2prog.c, sha2test.c, and sha2speed.c) will very likely +have more trouble in portability since they do I/O. + +To get sha2.c/sha2.h working under Windows, I had to define +SHA2_USE_INTTYPES_H, BYTE_ORDER, LITTLE_ENDIAN, and had to comment +out the include of in sha2.h. With a bit more work +I got the test program to run and verified that all the test +cases passed. + + +SUGGESTIONS/BUG FIXES: + +If you make changes to get it working on other architectures, if you fix +any bugs, or if you make changes that improve this implementation's +efficiency that would be relatively portable and you're willing to release +your changes under the same license, please send them to me for possible +inclusion in future versions. + +If you know where I can find some additional test vectors, please let me +know. + + +CHANGE HISTORY: + +0.8 to 0.9 - Fixed spelling errors, changed to u_intXX_t type usage, + removed names from prototypes, added prototypes to sha2.c, + and a few things I can't recall. + +0.9 to 0.9.5 - Add a new define in sha2.c that permits one to compile + it to either use memcpy()/memset() or bcopy()/bzero() + for memory block copying and zeroing. Added support + for unrolled SHA-256/384/512 transform loops. Just + compile with SHA2_UNROLL_TRANSFORM to enable. It takes + longer to compile, but I hope it is a bit faster. I + need to do some test to see whether or not it is. Oh, + in sha2.c, you either need to define SHA2_USE_BZERO_BCOPY + or SHA2_USE_MEMSET_MEMCPY to choose which way you want + to compile. *Whew* It's amazing how quickly something + simple starts to grow more complex even in the span of + just a few hours. I didn't really intend to do this much. +0.9.5 to 0.9.6 - Added a test program (sha2test) which tests against several + known test vectors. WARNING: Some of the test output + hashes are NOT from NIST's documentation and are the + output of this implementation and so may be incorrect. +0.9.6 to 0.9.7 - Fixed a bug that could cause invalid output in certain + cases and added an assumed scenario where zero-length + data is hashed. Also changed the rotation macros to use + a temporary variable as this reduces the number of operations. + When data is fed in blocks of the right length, copying of + data is reduced in this version. Added SHAYXZ_Data() + functions for ease of hashing a set of data. Added another + file sha2speed.c for doing speed testing. Added another test + vector with a larger data size (16KB). Fixed u_intXX_t and + uintXX_t handling by adding a define for SHA2_USE_INTTYPES_H + as well as made a few other minor changes to get rid of + warnings when compiling on Compaq's Tru64 Unix. +0.9.7 to 0.9.8 - The bug fix in 0.9.7 was incomplete and in some cases made + things worse. I believe that 0.9.8 fixes the bug completely + so that output is correct. I cannot verify this, however, + because of the lack of test vectors against which to do such + verification. All versions correctly matched the very few + NIST-provided vectors, but unfortunately the bug only + appeared in longer message data sets. +0.9.8 to 0.9.9 - Fixed some really bad typos and mistakes on my part that + only affected big-endian systems. I didn't have direct + access for testing before this version. Thanks to + Lucas Marshall for giving me access to his OS X system. +0.9.9 to 1.0.0b1 Added a few more test samples and made a few changes to + make things easier compiling on several other platforms. + Also I experimented with alternate macro definitions + in the SHA2_UNROLL_TRANSFORM version (see sha2.slower.c) + and eliminated the T1 temporary variable (the compiler + would of course still use internal temporary storage + during expression evaluation, but I'd hoped the compiler + would be more efficient), but unfortunately under FreeBSD + 4.1.1-STABLE on an x86 platform, the change slowed things + down. +1.0.0b1 to 1.0 RELEASE Fixed an off-by-one implementation bug that affected + SHA-256 when hashed data length L = 55 + 64 * X where X is + either zero or a positive integer, and another (basically + the same bug) bug in SHA-384 and SHA-512 that showed up when + hashed data lengths L = 111 + 128 * X. Thanks to Rogier + van de Pol for sending me test data that revealed the bug. + The fix was very simple (just two tiny changes). Also, + I finally put the files into RCS so future changes will be + easier to manage. The sha2prog.c file was rewritten to + be more useful to me, and I got rid of the old C testing + program and now use a perl script with a subdirectory full + of test data. It's a more flexible test system. + + +LATEST VERSION: + +The latest version and documentation (if any ;) should always be available +on the web at: + + http://www.aarongifford.com/computers/sha.html + + +CONTACT ME: + +I can be reached via email at: + + Aaron Gifford + +Please don't send support questions. I don't have the time to answer and +they'll probably be ignored. Bug fixes, or patches that add something useful +will be gratefully accepted, however. + +If you use this implementation, I would enjoy getting a brief email message +letting me know who you are and what use to which it is being put. There +is no requirement to do so. I just think it would be fun. + + +EXAMPLES: + +Here's an example of compiling and using the sha2 program (in this example +I build it using the unrolled transform version with -O2 optimizations), +and then running the perl testing script: + + cc -O2 -DSHA2_UNROLL_TRANSFORM -Wall -o sha2 sha2prog.c sha2.c + % ./sha2test.pl + + [most of the perl script output deleted for brevity] + + ===== RESULTS (18 VECTOR DATA FILES HASHED) ===== + + HASH TYPE NO. OF TESTS PASSED FAILED + --------- ------------ ------ ------ + SHA-256 18 18 0 + SHA-384 18 18 0 + SHA-512 18 18 0 + ---------------------------------------------- + TOTAL: 54 54 0 + + NO ERRORS! ALL TESTS WERE SUCCESSFUL! + + ALL TEST VECTORS PASSED! + +That's all folks! Have fun! + +Aaron out. + diff --git a/engine/libraries/sha2/sha2.c b/engine/libraries/sha2/sha2.c new file mode 100644 index 0000000..810eb83 --- /dev/null +++ b/engine/libraries/sha2/sha2.c @@ -0,0 +1,1065 @@ +/* + * FILE: sha2.c + * AUTHOR: Aaron D. Gifford - http://www.aarongifford.com/ + * + * Copyright (c) 2000-2001, Aaron D. Gifford + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holder nor the names of contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ + */ + +#include /* memcpy()/memset() or bcopy()/bzero() */ +#include /* assert() */ +#include "sha2.h" + +/* + * ASSERT NOTE: + * Some sanity checking code is included using assert(). On my FreeBSD + * system, this additional code can be removed by compiling with NDEBUG + * defined. Check your own systems manpage on assert() to see how to + * compile WITHOUT the sanity checking code on your system. + * + * UNROLLED TRANSFORM LOOP NOTE: + * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform + * loop version for the hash transform rounds (defined using macros + * later in this file). Either define on the command line, for example: + * + * cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c + * + * or define below: + * + * #define SHA2_UNROLL_TRANSFORM + * + */ + + +/*** SHA-256/384/512 Machine Architecture Definitions *****************/ +/* + * BYTE_ORDER NOTE: + * + * Please make sure that your system defines BYTE_ORDER. If your + * architecture is little-endian, make sure it also defines + * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are + * equivilent. + * + * If your system does not define the above, then you can do so by + * hand like this: + * + * #define LITTLE_ENDIAN 1234 + * #define BIG_ENDIAN 4321 + * + * And for little-endian machines, add: + * + * #define BYTE_ORDER LITTLE_ENDIAN + * + * Or for big-endian machines: + * + * #define BYTE_ORDER BIG_ENDIAN + * + * The FreeBSD machine this was written on defines BYTE_ORDER + * appropriately by including (which in turn includes + * where the appropriate definitions are actually + * made). + */ +#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN) +#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN +#endif + +/* + * Define the followingsha2_* types to types of the correct length on + * the native archtecture. Most BSD systems and Linux define u_intXX_t + * types. Machines with very recent ANSI C headers, can use the + * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H + * during compile or in the sha.h header file. + * + * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t + * will need to define these three typedefs below (and the appropriate + * ones in sha.h too) by hand according to their system architecture. + * + * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t + * types and pointing out recent ANSI C support for uintXX_t in inttypes.h. + */ +#ifdef SHA2_USE_INTTYPES_H + +typedef uint8_t sha2_byte; /* Exactly 1 byte */ +typedef uint32_t sha2_word32; /* Exactly 4 bytes */ +typedef uint64_t sha2_word64; /* Exactly 8 bytes */ + +#else /* SHA2_USE_INTTYPES_H */ + +typedef u_int8_t sha2_byte; /* Exactly 1 byte */ +typedef u_int32_t sha2_word32; /* Exactly 4 bytes */ +typedef u_int64_t sha2_word64; /* Exactly 8 bytes */ + +#endif /* SHA2_USE_INTTYPES_H */ + + +/*** SHA-256/384/512 Various Length Definitions ***********************/ +/* NOTE: Most of these are in sha2.h */ +#define SHA256_SHORT_BLOCK_LENGTH (SHA256_BLOCK_LENGTH - 8) +#define SHA384_SHORT_BLOCK_LENGTH (SHA384_BLOCK_LENGTH - 16) +#define SHA512_SHORT_BLOCK_LENGTH (SHA512_BLOCK_LENGTH - 16) + + +/*** ENDIAN REVERSAL MACROS *******************************************/ +#if BYTE_ORDER == LITTLE_ENDIAN +#define REVERSE32(w,x) { \ + sha2_word32 tmp = (w); \ + tmp = (tmp >> 16) | (tmp << 16); \ + (x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \ +} +#define REVERSE64(w,x) { \ + sha2_word64 tmp = (w); \ + tmp = (tmp >> 32) | (tmp << 32); \ + tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \ + ((tmp & 0x00ff00ff00ff00ffULL) << 8); \ + (x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \ + ((tmp & 0x0000ffff0000ffffULL) << 16); \ +} +#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + +/* + * Macro for incrementally adding the unsigned 64-bit integer n to the + * unsigned 128-bit integer (represented using a two-element array of + * 64-bit words): + */ +#define ADDINC128(w,n) { \ + (w)[0] += (sha2_word64)(n); \ + if ((w)[0] < (n)) { \ + (w)[1]++; \ + } \ +} + +/* + * Macros for copying blocks of memory and for zeroing out ranges + * of memory. Using these macros makes it easy to switch from + * using memset()/memcpy() and using bzero()/bcopy(). + * + * Please define either SHA2_USE_MEMSET_MEMCPY or define + * SHA2_USE_BZERO_BCOPY depending on which function set you + * choose to use: + */ +#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY) +/* Default to memset()/memcpy() if no option is specified */ +#define SHA2_USE_MEMSET_MEMCPY 1 +#endif +#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY) +/* Abort with an error if BOTH options are defined */ +#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both! +#endif + +#ifdef SHA2_USE_MEMSET_MEMCPY +#define MEMSET_BZERO(p,l) memset((p), 0, (l)) +#define MEMCPY_BCOPY(d,s,l) memcpy((d), (s), (l)) +#endif +#ifdef SHA2_USE_BZERO_BCOPY +#define MEMSET_BZERO(p,l) bzero((p), (l)) +#define MEMCPY_BCOPY(d,s,l) bcopy((s), (d), (l)) +#endif + + +/*** THE SIX LOGICAL FUNCTIONS ****************************************/ +/* + * Bit shifting and rotation (used by the six SHA-XYZ logical functions: + * + * NOTE: The naming of R and S appears backwards here (R is a SHIFT and + * S is a ROTATION) because the SHA-256/384/512 description document + * (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this + * same "backwards" definition. + */ +/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */ +#define R(b,x) ((x) >> (b)) +/* 32-bit Rotate-right (used in SHA-256): */ +#define S32(b,x) (((x) >> (b)) | ((x) << (32 - (b)))) +/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */ +#define S64(b,x) (((x) >> (b)) | ((x) << (64 - (b)))) + +/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */ +#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z))) +#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z))) + +/* Four of six logical functions used in SHA-256: */ +#define Sigma0_256(x) (S32(2, (x)) ^ S32(13, (x)) ^ S32(22, (x))) +#define Sigma1_256(x) (S32(6, (x)) ^ S32(11, (x)) ^ S32(25, (x))) +#define sigma0_256(x) (S32(7, (x)) ^ S32(18, (x)) ^ R(3 , (x))) +#define sigma1_256(x) (S32(17, (x)) ^ S32(19, (x)) ^ R(10, (x))) + +/* Four of six logical functions used in SHA-384 and SHA-512: */ +#define Sigma0_512(x) (S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x))) +#define Sigma1_512(x) (S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x))) +#define sigma0_512(x) (S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7, (x))) +#define sigma1_512(x) (S64(19, (x)) ^ S64(61, (x)) ^ R( 6, (x))) + +/*** INTERNAL FUNCTION PROTOTYPES *************************************/ +/* NOTE: These should not be accessed directly from outside this + * library -- they are intended for private internal visibility/use + * only. + */ +void SHA512_Last(SHA512_CTX*); +void SHA256_Transform(SHA256_CTX*, const sha2_word32*); +void SHA512_Transform(SHA512_CTX*, const sha2_word64*); + + +/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ +/* Hash constant words K for SHA-256: */ +const static sha2_word32 K256[64] = { + 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, + 0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, + 0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL, + 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL, + 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, + 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, + 0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, + 0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL, + 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL, + 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, + 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, + 0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, + 0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL, + 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL, + 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, + 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL +}; + +/* Initial hash value H for SHA-256: */ +const static sha2_word32 sha256_initial_hash_value[8] = { + 0x6a09e667UL, + 0xbb67ae85UL, + 0x3c6ef372UL, + 0xa54ff53aUL, + 0x510e527fUL, + 0x9b05688cUL, + 0x1f83d9abUL, + 0x5be0cd19UL +}; + +/* Hash constant words K for SHA-384 and SHA-512: */ +const static sha2_word64 K512[80] = { + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, + 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, + 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, + 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, + 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, + 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, + 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, + 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, + 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, + 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, + 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, + 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, + 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, + 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, + 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, + 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, + 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, + 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, + 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, + 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, + 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, + 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, + 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, + 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, + 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, + 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, + 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, + 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, + 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, + 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, + 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, + 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, + 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, + 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, + 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, + 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, + 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, + 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, + 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL +}; + +/* Initial hash value H for SHA-384 */ +const static sha2_word64 sha384_initial_hash_value[8] = { + 0xcbbb9d5dc1059ed8ULL, + 0x629a292a367cd507ULL, + 0x9159015a3070dd17ULL, + 0x152fecd8f70e5939ULL, + 0x67332667ffc00b31ULL, + 0x8eb44a8768581511ULL, + 0xdb0c2e0d64f98fa7ULL, + 0x47b5481dbefa4fa4ULL +}; + +/* Initial hash value H for SHA-512 */ +const static sha2_word64 sha512_initial_hash_value[8] = { + 0x6a09e667f3bcc908ULL, + 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, + 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, + 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, + 0x5be0cd19137e2179ULL +}; + +/* + * Constant used by SHA256/384/512_End() functions for converting the + * digest to a readable hexadecimal character string: + */ +static const char *sha2_hex_digits = "0123456789abcdef"; + + +/*** SHA-256: *********************************************************/ +void SHA256_Init(SHA256_CTX* context) { + if (context == (SHA256_CTX*)0) { + return; + } + MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH); + MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH); + context->bitcount = 0; +} + +#ifdef SHA2_UNROLL_TRANSFORM + +/* Unrolled SHA-256 round macros: */ + +#if BYTE_ORDER == LITTLE_ENDIAN + +#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \ + REVERSE32(*data++, W256[j]); \ + T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \ + K256[j] + W256[j]; \ + (d) += T1; \ + (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ + j++ + + +#else /* BYTE_ORDER == LITTLE_ENDIAN */ + +#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \ + T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \ + K256[j] + (W256[j] = *data++); \ + (d) += T1; \ + (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ + j++ + +#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + +#define ROUND256(a,b,c,d,e,f,g,h) \ + s0 = W256[(j+1)&0x0f]; \ + s0 = sigma0_256(s0); \ + s1 = W256[(j+14)&0x0f]; \ + s1 = sigma1_256(s1); \ + T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \ + (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \ + (d) += T1; \ + (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ + j++ + +void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { + sha2_word32 a, b, c, d, e, f, g, h, s0, s1; + sha2_word32 T1, *W256; + int j; + + W256 = (sha2_word32*)context->buffer; + + /* Initialize registers with the prev. intermediate value */ + a = context->state[0]; + b = context->state[1]; + c = context->state[2]; + d = context->state[3]; + e = context->state[4]; + f = context->state[5]; + g = context->state[6]; + h = context->state[7]; + + j = 0; + do { + /* Rounds 0 to 15 (unrolled): */ + ROUND256_0_TO_15(a,b,c,d,e,f,g,h); + ROUND256_0_TO_15(h,a,b,c,d,e,f,g); + ROUND256_0_TO_15(g,h,a,b,c,d,e,f); + ROUND256_0_TO_15(f,g,h,a,b,c,d,e); + ROUND256_0_TO_15(e,f,g,h,a,b,c,d); + ROUND256_0_TO_15(d,e,f,g,h,a,b,c); + ROUND256_0_TO_15(c,d,e,f,g,h,a,b); + ROUND256_0_TO_15(b,c,d,e,f,g,h,a); + } while (j < 16); + + /* Now for the remaining rounds to 64: */ + do { + ROUND256(a,b,c,d,e,f,g,h); + ROUND256(h,a,b,c,d,e,f,g); + ROUND256(g,h,a,b,c,d,e,f); + ROUND256(f,g,h,a,b,c,d,e); + ROUND256(e,f,g,h,a,b,c,d); + ROUND256(d,e,f,g,h,a,b,c); + ROUND256(c,d,e,f,g,h,a,b); + ROUND256(b,c,d,e,f,g,h,a); + } while (j < 64); + + /* Compute the current intermediate hash value */ + context->state[0] += a; + context->state[1] += b; + context->state[2] += c; + context->state[3] += d; + context->state[4] += e; + context->state[5] += f; + context->state[6] += g; + context->state[7] += h; + + /* Clean up */ + a = b = c = d = e = f = g = h = T1 = 0; +} + +#else /* SHA2_UNROLL_TRANSFORM */ + +void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { + sha2_word32 a, b, c, d, e, f, g, h, s0, s1; + sha2_word32 T1, T2, *W256; + int j; + + W256 = (sha2_word32*)context->buffer; + + /* Initialize registers with the prev. intermediate value */ + a = context->state[0]; + b = context->state[1]; + c = context->state[2]; + d = context->state[3]; + e = context->state[4]; + f = context->state[5]; + g = context->state[6]; + h = context->state[7]; + + j = 0; + do { +#if BYTE_ORDER == LITTLE_ENDIAN + /* Copy data while converting to host byte order */ + REVERSE32(*data++,W256[j]); + /* Apply the SHA-256 compression function to update a..h */ + T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j]; +#else /* BYTE_ORDER == LITTLE_ENDIAN */ + /* Apply the SHA-256 compression function to update a..h with copy */ + T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++); +#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + T2 = Sigma0_256(a) + Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + + j++; + } while (j < 16); + + do { + /* Part of the message block expansion: */ + s0 = W256[(j+1)&0x0f]; + s0 = sigma0_256(s0); + s1 = W256[(j+14)&0x0f]; + s1 = sigma1_256(s1); + + /* Apply the SHA-256 compression function to update a..h */ + T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + + (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); + T2 = Sigma0_256(a) + Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + + j++; + } while (j < 64); + + /* Compute the current intermediate hash value */ + context->state[0] += a; + context->state[1] += b; + context->state[2] += c; + context->state[3] += d; + context->state[4] += e; + context->state[5] += f; + context->state[6] += g; + context->state[7] += h; + + /* Clean up */ + a = b = c = d = e = f = g = h = T1 = T2 = 0; +} + +#endif /* SHA2_UNROLL_TRANSFORM */ + +void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { + unsigned int freespace, usedspace; + + if (len == 0) { + /* Calling with no data is valid - we do nothing */ + return; + } + + /* Sanity check: */ + assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0); + + usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH; + if (usedspace > 0) { + /* Calculate how much free space is available in the buffer */ + freespace = SHA256_BLOCK_LENGTH - usedspace; + + if (len >= freespace) { + /* Fill the buffer completely and process it */ + MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace); + context->bitcount += freespace << 3; + len -= freespace; + data += freespace; + SHA256_Transform(context, (sha2_word32*)context->buffer); + } else { + /* The buffer is not yet full */ + MEMCPY_BCOPY(&context->buffer[usedspace], data, len); + context->bitcount += len << 3; + /* Clean up: */ + usedspace = freespace = 0; + return; + } + } + while (len >= SHA256_BLOCK_LENGTH) { + /* Process as many complete blocks as we can */ + SHA256_Transform(context, (sha2_word32*)data); + context->bitcount += SHA256_BLOCK_LENGTH << 3; + len -= SHA256_BLOCK_LENGTH; + data += SHA256_BLOCK_LENGTH; + } + if (len > 0) { + /* There's left-overs, so save 'em */ + MEMCPY_BCOPY(context->buffer, data, len); + context->bitcount += len << 3; + } + /* Clean up: */ + usedspace = freespace = 0; +} + +void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { + sha2_word32 *d = (sha2_word32*)digest; + unsigned int usedspace; + + /* Sanity check: */ + assert(context != (SHA256_CTX*)0); + + /* If no digest buffer is passed, we don't bother doing this: */ + if (digest != (sha2_byte*)0) { + usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH; +#if BYTE_ORDER == LITTLE_ENDIAN + /* Convert FROM host byte order */ + REVERSE64(context->bitcount,context->bitcount); +#endif + if (usedspace > 0) { + /* Begin padding with a 1 bit: */ + context->buffer[usedspace++] = 0x80; + + if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) { + /* Set-up for the last transform: */ + MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace); + } else { + if (usedspace < SHA256_BLOCK_LENGTH) { + MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace); + } + /* Do second-to-last transform: */ + SHA256_Transform(context, (sha2_word32*)context->buffer); + + /* And set-up for the last transform: */ + MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH); + } + } else { + /* Set-up for the last transform: */ + MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH); + + /* Begin padding with a 1 bit: */ + *context->buffer = 0x80; + } + /* Set the bit count: */ + *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; + + /* Final transform: */ + SHA256_Transform(context, (sha2_word32*)context->buffer); + +#if BYTE_ORDER == LITTLE_ENDIAN + { + /* Convert TO host byte order */ + int j; + for (j = 0; j < 8; j++) { + REVERSE32(context->state[j],context->state[j]); + *d++ = context->state[j]; + } + } +#else + MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH); +#endif + } + + /* Clean up state data: */ + MEMSET_BZERO(context, sizeof(context)); + usedspace = 0; +} + +char *SHA256_End(SHA256_CTX* context, char buffer[]) { + sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest; + int i; + + /* Sanity check: */ + assert(context != (SHA256_CTX*)0); + + if (buffer != (char*)0) { + SHA256_Final(digest, context); + + for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { + *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; + *buffer++ = sha2_hex_digits[*d & 0x0f]; + d++; + } + *buffer = (char)0; + } else { + MEMSET_BZERO(context, sizeof(context)); + } + MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); + return buffer; +} + +char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) { + SHA256_CTX context; + + SHA256_Init(&context); + SHA256_Update(&context, data, len); + return SHA256_End(&context, digest); +} + + +/*** SHA-512: *********************************************************/ +void SHA512_Init(SHA512_CTX* context) { + if (context == (SHA512_CTX*)0) { + return; + } + MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH); + MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH); + context->bitcount[0] = context->bitcount[1] = 0; +} + +#ifdef SHA2_UNROLL_TRANSFORM + +/* Unrolled SHA-512 round macros: */ +#if BYTE_ORDER == LITTLE_ENDIAN + +#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \ + REVERSE64(*data++, W512[j]); \ + T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \ + K512[j] + W512[j]; \ + (d) += T1, \ + (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \ + j++ + + +#else /* BYTE_ORDER == LITTLE_ENDIAN */ + +#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \ + T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \ + K512[j] + (W512[j] = *data++); \ + (d) += T1; \ + (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ + j++ + +#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + +#define ROUND512(a,b,c,d,e,f,g,h) \ + s0 = W512[(j+1)&0x0f]; \ + s0 = sigma0_512(s0); \ + s1 = W512[(j+14)&0x0f]; \ + s1 = sigma1_512(s1); \ + T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \ + (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \ + (d) += T1; \ + (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ + j++ + +void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { + sha2_word64 a, b, c, d, e, f, g, h, s0, s1; + sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; + int j; + + /* Initialize registers with the prev. intermediate value */ + a = context->state[0]; + b = context->state[1]; + c = context->state[2]; + d = context->state[3]; + e = context->state[4]; + f = context->state[5]; + g = context->state[6]; + h = context->state[7]; + + j = 0; + do { + ROUND512_0_TO_15(a,b,c,d,e,f,g,h); + ROUND512_0_TO_15(h,a,b,c,d,e,f,g); + ROUND512_0_TO_15(g,h,a,b,c,d,e,f); + ROUND512_0_TO_15(f,g,h,a,b,c,d,e); + ROUND512_0_TO_15(e,f,g,h,a,b,c,d); + ROUND512_0_TO_15(d,e,f,g,h,a,b,c); + ROUND512_0_TO_15(c,d,e,f,g,h,a,b); + ROUND512_0_TO_15(b,c,d,e,f,g,h,a); + } while (j < 16); + + /* Now for the remaining rounds up to 79: */ + do { + ROUND512(a,b,c,d,e,f,g,h); + ROUND512(h,a,b,c,d,e,f,g); + ROUND512(g,h,a,b,c,d,e,f); + ROUND512(f,g,h,a,b,c,d,e); + ROUND512(e,f,g,h,a,b,c,d); + ROUND512(d,e,f,g,h,a,b,c); + ROUND512(c,d,e,f,g,h,a,b); + ROUND512(b,c,d,e,f,g,h,a); + } while (j < 80); + + /* Compute the current intermediate hash value */ + context->state[0] += a; + context->state[1] += b; + context->state[2] += c; + context->state[3] += d; + context->state[4] += e; + context->state[5] += f; + context->state[6] += g; + context->state[7] += h; + + /* Clean up */ + a = b = c = d = e = f = g = h = T1 = 0; +} + +#else /* SHA2_UNROLL_TRANSFORM */ + +void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { + sha2_word64 a, b, c, d, e, f, g, h, s0, s1; + sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer; + int j; + + /* Initialize registers with the prev. intermediate value */ + a = context->state[0]; + b = context->state[1]; + c = context->state[2]; + d = context->state[3]; + e = context->state[4]; + f = context->state[5]; + g = context->state[6]; + h = context->state[7]; + + j = 0; + do { +#if BYTE_ORDER == LITTLE_ENDIAN + /* Convert TO host byte order */ + REVERSE64(*data++, W512[j]); + /* Apply the SHA-512 compression function to update a..h */ + T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j]; +#else /* BYTE_ORDER == LITTLE_ENDIAN */ + /* Apply the SHA-512 compression function to update a..h with copy */ + T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++); +#endif /* BYTE_ORDER == LITTLE_ENDIAN */ + T2 = Sigma0_512(a) + Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + + j++; + } while (j < 16); + + do { + /* Part of the message block expansion: */ + s0 = W512[(j+1)&0x0f]; + s0 = sigma0_512(s0); + s1 = W512[(j+14)&0x0f]; + s1 = sigma1_512(s1); + + /* Apply the SHA-512 compression function to update a..h */ + T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + + (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); + T2 = Sigma0_512(a) + Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + + j++; + } while (j < 80); + + /* Compute the current intermediate hash value */ + context->state[0] += a; + context->state[1] += b; + context->state[2] += c; + context->state[3] += d; + context->state[4] += e; + context->state[5] += f; + context->state[6] += g; + context->state[7] += h; + + /* Clean up */ + a = b = c = d = e = f = g = h = T1 = T2 = 0; +} + +#endif /* SHA2_UNROLL_TRANSFORM */ + +void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { + unsigned int freespace, usedspace; + + if (len == 0) { + /* Calling with no data is valid - we do nothing */ + return; + } + + /* Sanity check: */ + assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0); + + usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; + if (usedspace > 0) { + /* Calculate how much free space is available in the buffer */ + freespace = SHA512_BLOCK_LENGTH - usedspace; + + if (len >= freespace) { + /* Fill the buffer completely and process it */ + MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace); + ADDINC128(context->bitcount, freespace << 3); + len -= freespace; + data += freespace; + SHA512_Transform(context, (sha2_word64*)context->buffer); + } else { + /* The buffer is not yet full */ + MEMCPY_BCOPY(&context->buffer[usedspace], data, len); + ADDINC128(context->bitcount, len << 3); + /* Clean up: */ + usedspace = freespace = 0; + return; + } + } + while (len >= SHA512_BLOCK_LENGTH) { + /* Process as many complete blocks as we can */ + SHA512_Transform(context, (sha2_word64*)data); + ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3); + len -= SHA512_BLOCK_LENGTH; + data += SHA512_BLOCK_LENGTH; + } + if (len > 0) { + /* There's left-overs, so save 'em */ + MEMCPY_BCOPY(context->buffer, data, len); + ADDINC128(context->bitcount, len << 3); + } + /* Clean up: */ + usedspace = freespace = 0; +} + +void SHA512_Last(SHA512_CTX* context) { + unsigned int usedspace; + + usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; +#if BYTE_ORDER == LITTLE_ENDIAN + /* Convert FROM host byte order */ + REVERSE64(context->bitcount[0],context->bitcount[0]); + REVERSE64(context->bitcount[1],context->bitcount[1]); +#endif + if (usedspace > 0) { + /* Begin padding with a 1 bit: */ + context->buffer[usedspace++] = 0x80; + + if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) { + /* Set-up for the last transform: */ + MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace); + } else { + if (usedspace < SHA512_BLOCK_LENGTH) { + MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace); + } + /* Do second-to-last transform: */ + SHA512_Transform(context, (sha2_word64*)context->buffer); + + /* And set-up for the last transform: */ + MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2); + } + } else { + /* Prepare for final transform: */ + MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH); + + /* Begin padding with a 1 bit: */ + *context->buffer = 0x80; + } + /* Store the length of input data (in bits): */ + *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; + *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; + + /* Final transform: */ + SHA512_Transform(context, (sha2_word64*)context->buffer); +} + +void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { + sha2_word64 *d = (sha2_word64*)digest; + + /* Sanity check: */ + assert(context != (SHA512_CTX*)0); + + /* If no digest buffer is passed, we don't bother doing this: */ + if (digest != (sha2_byte*)0) { + SHA512_Last(context); + + /* Save the hash data for output: */ +#if BYTE_ORDER == LITTLE_ENDIAN + { + /* Convert TO host byte order */ + int j; + for (j = 0; j < 8; j++) { + REVERSE64(context->state[j],context->state[j]); + *d++ = context->state[j]; + } + } +#else + MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH); +#endif + } + + /* Zero out state data */ + MEMSET_BZERO(context, sizeof(context)); +} + +char *SHA512_End(SHA512_CTX* context, char buffer[]) { + sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest; + int i; + + /* Sanity check: */ + assert(context != (SHA512_CTX*)0); + + if (buffer != (char*)0) { + SHA512_Final(digest, context); + + for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { + *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; + *buffer++ = sha2_hex_digits[*d & 0x0f]; + d++; + } + *buffer = (char)0; + } else { + MEMSET_BZERO(context, sizeof(context)); + } + MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); + return buffer; +} + +char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { + SHA512_CTX context; + + SHA512_Init(&context); + SHA512_Update(&context, data, len); + return SHA512_End(&context, digest); +} + + +/*** SHA-384: *********************************************************/ +void SHA384_Init(SHA384_CTX* context) { + if (context == (SHA384_CTX*)0) { + return; + } + MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH); + MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH); + context->bitcount[0] = context->bitcount[1] = 0; +} + +void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) { + SHA512_Update((SHA512_CTX*)context, data, len); +} + +void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { + sha2_word64 *d = (sha2_word64*)digest; + + /* Sanity check: */ + assert(context != (SHA384_CTX*)0); + + /* If no digest buffer is passed, we don't bother doing this: */ + if (digest != (sha2_byte*)0) { + SHA512_Last((SHA512_CTX*)context); + + /* Save the hash data for output: */ +#if BYTE_ORDER == LITTLE_ENDIAN + { + /* Convert TO host byte order */ + int j; + for (j = 0; j < 6; j++) { + REVERSE64(context->state[j],context->state[j]); + *d++ = context->state[j]; + } + } +#else + MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH); +#endif + } + + /* Zero out state data */ + MEMSET_BZERO(context, sizeof(context)); +} + +char *SHA384_End(SHA384_CTX* context, char buffer[]) { + sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest; + int i; + + /* Sanity check: */ + assert(context != (SHA384_CTX*)0); + + if (buffer != (char*)0) { + SHA384_Final(digest, context); + + for (i = 0; i < SHA384_DIGEST_LENGTH; i++) { + *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; + *buffer++ = sha2_hex_digits[*d & 0x0f]; + d++; + } + *buffer = (char)0; + } else { + MEMSET_BZERO(context, sizeof(context)); + } + MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); + return buffer; +} + +char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) { + SHA384_CTX context; + + SHA384_Init(&context); + SHA384_Update(&context, data, len); + return SHA384_End(&context, digest); +} + diff --git a/engine/libraries/sha2/sha2.h b/engine/libraries/sha2/sha2.h new file mode 100644 index 0000000..bf759ad --- /dev/null +++ b/engine/libraries/sha2/sha2.h @@ -0,0 +1,197 @@ +/* + * FILE: sha2.h + * AUTHOR: Aaron D. Gifford - http://www.aarongifford.com/ + * + * Copyright (c) 2000-2001, Aaron D. Gifford + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holder nor the names of contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ + */ + +#ifndef __SHA2_H__ +#define __SHA2_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +/* + * Import u_intXX_t size_t type definitions from system headers. You + * may need to change this, or define these things yourself in this + * file. + */ +#include + +#ifdef SHA2_USE_INTTYPES_H + +#include + +#endif /* SHA2_USE_INTTYPES_H */ + + +/*** SHA-256/384/512 Various Length Definitions ***********************/ +#define SHA256_BLOCK_LENGTH 64 +#define SHA256_DIGEST_LENGTH 32 +#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1) +#define SHA384_BLOCK_LENGTH 128 +#define SHA384_DIGEST_LENGTH 48 +#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1) +#define SHA512_BLOCK_LENGTH 128 +#define SHA512_DIGEST_LENGTH 64 +#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1) + + +/*** SHA-256/384/512 Context Structures *******************************/ +/* NOTE: If your architecture does not define either u_intXX_t types or + * uintXX_t (from inttypes.h), you may need to define things by hand + * for your system: + */ +#if 0 +typedef unsigned char u_int8_t; /* 1-byte (8-bits) */ +typedef unsigned int u_int32_t; /* 4-bytes (32-bits) */ +typedef unsigned long long u_int64_t; /* 8-bytes (64-bits) */ +#endif +/* + * Most BSD systems already define u_intXX_t types, as does Linux. + * Some systems, however, like Compaq's Tru64 Unix instead can use + * uintXX_t types defined by very recent ANSI C standards and included + * in the file: + * + * #include + * + * If you choose to use then please define: + * + * #define SHA2_USE_INTTYPES_H + * + * Or on the command line during compile: + * + * cc -DSHA2_USE_INTTYPES_H ... + */ +#ifdef SHA2_USE_INTTYPES_H + +typedef struct _SHA256_CTX { + uint32_t state[8]; + uint64_t bitcount; + uint8_t buffer[SHA256_BLOCK_LENGTH]; +} SHA256_CTX; +typedef struct _SHA512_CTX { + uint64_t state[8]; + uint64_t bitcount[2]; + uint8_t buffer[SHA512_BLOCK_LENGTH]; +} SHA512_CTX; + +#else /* SHA2_USE_INTTYPES_H */ + +typedef struct _SHA256_CTX { + u_int32_t state[8]; + u_int64_t bitcount; + u_int8_t buffer[SHA256_BLOCK_LENGTH]; +} SHA256_CTX; +typedef struct _SHA512_CTX { + u_int64_t state[8]; + u_int64_t bitcount[2]; + u_int8_t buffer[SHA512_BLOCK_LENGTH]; +} SHA512_CTX; + +#endif /* SHA2_USE_INTTYPES_H */ + +typedef SHA512_CTX SHA384_CTX; + + +/*** SHA-256/384/512 Function Prototypes ******************************/ +#ifndef NOPROTO +#ifdef SHA2_USE_INTTYPES_H + +void SHA256_Init(SHA256_CTX *); +void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t); +void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); +char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); +char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]); + +void SHA384_Init(SHA384_CTX*); +void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t); +void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); +char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); +char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); + +void SHA512_Init(SHA512_CTX*); +void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t); +void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); +char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); +char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); + +#else /* SHA2_USE_INTTYPES_H */ + +void SHA256_Init(SHA256_CTX *); +void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t); +void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); +char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); +char* SHA256_Data(const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]); + +void SHA384_Init(SHA384_CTX*); +void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t); +void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); +char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); +char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); + +void SHA512_Init(SHA512_CTX*); +void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t); +void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); +char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); +char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); + +#endif /* SHA2_USE_INTTYPES_H */ + +#else /* NOPROTO */ + +void SHA256_Init(); +void SHA256_Update(); +void SHA256_Final(); +char* SHA256_End(); +char* SHA256_Data(); + +void SHA384_Init(); +void SHA384_Update(); +void SHA384_Final(); +char* SHA384_End(); +char* SHA384_Data(); + +void SHA512_Init(); +void SHA512_Update(); +void SHA512_Final(); +char* SHA512_End(); +char* SHA512_Data(); + +#endif /* NOPROTO */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __SHA2_H__ */ + diff --git a/engine/tests/CMakeLists.txt b/engine/tests/CMakeLists.txt index 5797f41..236d50f 100644 --- a/engine/tests/CMakeLists.txt +++ b/engine/tests/CMakeLists.txt @@ -12,6 +12,7 @@ SET ( TESTS_SRCS EventBaseTests.cc PhysicsTests.cc ControllerBaseTests.cc + UtilsTests.cc ) FIND_PACKAGE (UnitTest++) diff --git a/server/data/global_highscore.db b/server/data/global_highscore.db new file mode 100644 index 0000000000000000000000000000000000000000..d82eb886d82cb341dbc69724f1f08f790064d883 GIT binary patch literal 2048 zcmWFz^vNtqRY=P(%1ta$FlJz3U}R))P*7lCV2}o4CLo3ZMj!)(VE~y86GNw^8FU{> z@d8B|nbR47XcUZwz(@>%MlnWqab;!3#^RF1q@2{^(xlwX;^NHwykaCKlXH-(V~DFl zh@+E_s{)dQf<|VFf~Q}ItGjEELO_tGuVYZ8g12j=jzU3BVr6Pkd|qO1szQisM2L<; zadLi9YJ6E@PH8Gki;hA{A~27;0L=!<=a&{Gr^aU%fYob)@+L6TkAl$<7!83D7y[Error] " . $e->getMessage() . "\n"); + die(); + } + + $query = $db->query('SELECT * FROM submissions ORDER BY score_value DESC LIMIT 10'); + + while ($row = $query->fetchArray(SQLITE3_ASSOC)) { + print ($row['player_name'] . "\t" . $row['score_value'] . "\n"); + } + $db->close(); + + die(); +} + +function print_scores () { + global $database_file; + + try { + $db = new SQlite3($database_file); + } catch (Exception $e) { + print ("

[Error] " . $e->getMessage() . "

\n"); + die(); + } + + $query = $db->query('SELECT * FROM submissions ORDER BY score_value DESC'); + + print ("\n"); + print ("\n"); + + while ($row = $query->fetchArray(SQLITE3_ASSOC)) { + print (""); + + print (""); + print (""); + print (""); + print (""); + print (""); + + print ("\n"); + } + print ("
idplayernamescoredateip
" . $row['id'] . "" . $row['player_name'] . "" . $row['score_value'] . "" . $row['date'] . "" . $row['source_ip'] . "
\n"); + print ("
\n"); + + $db->close(); +} + +function check_is_submission () { + global $player_name, $score_value, $key, $valid_name_characters, $raw_format; + + if (isset ($_REQUEST["player_name"]) + && isset ($_REQUEST["score_value"]) + && isset ($_REQUEST["key"] )) { + $player_name = $_REQUEST["player_name"]; + + // check whether the name only contains valid characters + foreach (str_split ($player_name) as $c) { + if (strpos ($valid_name_characters, $c) === FALSE) { + if ($raw_format) { + print ("ERROR: Invalid characters found in name!"); + die(); + } + print ("

ERROR: Invalid characters found in name!

"); + + return false; + } + } + + $score_value = (int) $_REQUEST["score_value"]; + $key = $_REQUEST["key"]; + + return true; + } + return false; +} + +function validate_submission () { + if (!check_is_submission()) { + return false; + } + global $player_name, $score_value, $key, $submission_salt, $raw_format; + + $verification_string = $player_name . ":" . (int) $score_value . ":" . $submission_salt; + $verification_hash = hash ("sha256", $verification_string); + + if ($verification_hash == $key) { + return true; + } + + if (!$raw_format) + print ("verification_hash = " . $verification_hash . "
\n"); + + return false; +} + +function dispatch_submission () { + if (!validate_submission()) { + die ("This is not a valid submission!"); + } + + global $database_file, $player_name, $score_value, $raw_format; + + try { + $db = new SQlite3($database_file, SQLITE3_OPEN_READWRITE); + } catch (Exception $e) { + print ("ERROR: " . $e->getMessage() . "\n"); + die(); + } + + // check whether we already have an entry with the same data + $query = $db->query('SELECT * FROM submissions WHERE player_name="' . $player_name . '" AND score_value=' . $score_value . ';'); + + // if it already exists we just return as if it was accepted + if ($query->fetchArray()) { + if ($raw_format) { + print ("OK\n"); + die(); + } else { + print ("

OK

\n"); + return; + } + } + + while ($row = $query->fetchArray(SQLITE3_ASSOC)) { + print ($row['player_name'] . "\t" . $row['score_value'] . "\n"); + } + + $submit_statement = 'INSERT INTO submissions (player_name, score_value, date, source_ip) + VALUES (\'' . $player_name . '\', ' . (int) $score_value . ', DATETIME(\'NOW\'), \'' . $_SERVER['REMOTE_ADDR'] . '\');'; + + $result = $db->exec($submit_statement); + + if ($result) { + if ($raw_format) + print ("OK\n"); + else + print ("

OK

\n"); + } else { + if ($raw_format) + print ("ERROR: Database error when submitting value\n"); + else + print ("

ERROR: Database error when submitting value

\n"); + } + + $db->close(); +} + +if ($raw_format) { + if (check_is_submission()) { + if (validate_submission()) { + dispatch_submission(); + } else { + print ("ERROR: invalid submission!"); + } + } else { + print_raw_scores(); + } + die(); +} + +print ("

Asteroids Highscores

\n"); + +print_scores(); + +if (check_is_submission()) { + print ("player_name = " . $player_name . "
\n"); + print ("score_value = " . $score_value . "
\n"); + print ("key = " . $key . "
\n"); + + dispatch_submission(); +} + +?> +

Submit Entry

+
+ + + + +
Name:
Score:
Key:
+ +