diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 3 | ||||
| -rw-r--r-- | Swift/Controllers/SConscript | 3 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp | 8 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/XMLConsoleWidget.h | 2 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarManager.cpp | 5 | ||||
| -rw-r--r-- | Swiften/Disco/CapsInfoGenerator.cpp | 2 | ||||
| -rw-r--r-- | Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | 2 | ||||
| -rw-r--r-- | Swiften/SConscript | 4 | ||||
| -rw-r--r-- | Swiften/StringCodecs/Base64.h | 8 | ||||
| -rw-r--r-- | Swiften/StringCodecs/HMACSHA1.cpp | 4 | ||||
| -rw-r--r-- | Swiften/StringCodecs/Hexify.cpp | 22 | ||||
| -rw-r--r-- | Swiften/StringCodecs/Hexify.h | 11 | ||||
| -rw-r--r-- | Swiften/StringCodecs/MD5.cpp | 359 | ||||
| -rw-r--r-- | Swiften/StringCodecs/MD5.h | 10 | ||||
| -rw-r--r-- | Swiften/StringCodecs/SHA1.cpp | 17 | ||||
| -rw-r--r-- | Swiften/StringCodecs/SHA1.h | 10 | ||||
| -rw-r--r-- | Swiften/StringCodecs/UnitTest/Base64Test.cpp | 5 | ||||
| -rw-r--r-- | Swiften/StringCodecs/UnitTest/HexifyTest.cpp | 21 | ||||
| -rw-r--r-- | Swiften/StringCodecs/UnitTest/MD5Test.cpp | 29 | ||||
| -rw-r--r-- | Swiften/StringCodecs/UnitTest/SHA1Test.cpp | 33 | 
21 files changed, 500 insertions, 62 deletions
@@ -1,50 +1,51 @@  import sys, os  sys.path.append(Dir("BuildTools/SCons").abspath) +import SCons.SConf  ################################################################################  # Build variables  ################################################################################  vars = Variables("config.py")  vars.Add('ccflags', "Extra C(++) compiler flags")  vars.Add('linkflags', "Extra linker flags")  vars.Add(EnumVariable("test", "Compile and run tests", "none", ["none", "all", "unit", "system"]))  vars.Add(BoolVariable("optimize", "Compile with optimizations turned on", "no"))  vars.Add(BoolVariable("debug", "Compile with debug information", "yes" if os.name != "nt" else "no"))  vars.Add(BoolVariable("warnings", "Compile with warnings turned on",   		"yes" if os.name != "nt" else "no"))  if os.name != "nt" :  	vars.Add(BoolVariable("coverage", "Compile with coverage information", "no"))  if os.name == "posix" :  	vars.Add(BoolVariable("valgrind", "Run tests with valgrind", "no"))  if os.name == "mac" :  	vars.Add(BoolVariable("universal", "Create universal binaries", "no"))  if os.name == "nt" :  	vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept))  if os.name == "nt" :  	vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes"))  vars.Add(PackageVariable("openssl", "OpenSSL location", "yes"))  vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))  ################################################################################  # Set up default build & configure environment  ################################################################################  env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH']}, variables = vars)  Help(vars.GenerateHelpText(env))  env.Alias("dist", ["."])  # Default custom tools  env.Tool("Test", toolpath = ["#/BuildTools/SCons/Tools"])  env.Tool("WriteVal", toolpath = ["#/BuildTools/SCons/Tools"])  env.Tool("BuildVersion", toolpath = ["#/BuildTools/SCons/Tools"])  if env["PLATFORM"] == "darwin" :  	env.Tool("Nib", toolpath = ["#/BuildTools/SCons/Tools"])  	env.Tool("AppBundle", toolpath = ["#/BuildTools/SCons/Tools"])  if env["PLATFORM"] == "win32" :  	env.Tool("WindowsBundle", toolpath = ["#/BuildTools/SCons/Tools"])  # Default compiler flags  env["CCFLAGS"] = env.get("ccflags", []) @@ -114,96 +115,99 @@ conf_env = env.Clone()  Export("env")  Export("conf_env")  ################################################################################  # Extend the default build environment (not affecting the configure env)  #  # Keeping both environments separated mostly because of SCons Issue 2391,  # although it doesn't hurt to separate them (e.g. not have pretty printed  # strings in config.log)  ################################################################################  #if env["PLATFORM"] == "win32" :  #	env["MSVC_BATCH"] = 1  # Pretty output  def colorize(command, target, color) :  	colors = { "red": "31", "green": "32", "yellow": "33", "blue": "34" }  	prefix = ""  	suffix = ""  	if sys.stdout.isatty() and env["PLATFORM"] != "win32":  		prefix = "\033[0;" + colors[color] + ";140m"  		suffix = "\033[0m"  	return "  " + prefix + command + suffix + " " + target  if int(ARGUMENTS.get("V", 0)) == 0:  	env["CCCOMSTR"] = colorize("CC", "$TARGET", "green")  	env["CXXCOMSTR"] = colorize("CXX", "$TARGET", "green")  	env["LINKCOMSTR"] = colorize("LINK", "$TARGET", "red")  	env["ARCOMSTR"] = colorize("AR", "$TARGET", "red")  	env["RANLIBCOMSTR"] = colorize("RANLIB", "$TARGET", "red")  	env["QT4_RCCCOMSTR"] = colorize("RCC", "$TARGET", "blue")  	env["QT4_UICCOMSTR"] = colorize("UIC", "$TARGET", "blue")  	env["QT4_MOCFROMHCOMSTR"] = colorize("MOC", "$TARGET", "blue")  	env["QT4_MOCFROMCXXCOMSTR"] = colorize("MOC", "$TARGET", "blue")  	env["GENCOMSTR"] = colorize("GEN", "$TARGET", "blue")  	env["RCCOMSTR"] = colorize("RC", "$TARGET", "blue")  	env["BUNDLECOMSTR"] = colorize("BUNDLE", "$TARGET", "blue")  	env["NIBCOMSTR"] = colorize("NIB", "$TARGET", "blue")  	env["NSISCOMSTR"] = colorize("NSIS", "$TARGET", "blue")  	env["TESTCOMSTR"] = colorize("TEST", "$SOURCE", "yellow")  	#Progress(colorize("DEP", "$TARGET", "red")  ################################################################################  # Platform configuration  ################################################################################ +if ARGUMENTS.get("force-configure", 0) : +  SCons.SConf.SetCacheMode("force") +  conf = Configure(conf_env)  if conf.CheckLib("z") :  	env.Append(LIBS = "z")  	env["ZLIB_FLAGS"] = ""  else :  	SConscript("3rdParty/ZLib/SConscript")  if conf.CheckLib("dl") :  	env.Append(LIBS = ["dl"])  if conf.CheckLib("c") :  	env.Append(LIBS = ["c"])  if conf.CheckLib("resolv") :  	env.Append(LIBS = ["resolv"])  # Expat  if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") :  	env["HAVE_EXPAT"] = 1  	env["EXPAT_FLAGS"] = { "LIBS": ["expat"] }  conf.Finish()  # Xss  env["HAVE_XSS"] = 0  if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :  	xss_flags = {  			"LIBPATH": ["/usr/X11R6/lib"],  			"LIBS": ["X11", "Xss"]  		}  	xss_env = conf_env.Clone()  	xss_env.MergeFlags(xss_flags)  	conf = Configure(xss_env)  	if conf.CheckFunc("XScreenSaverQueryExtension") :  		env["HAVE_XSS"] = 1  		env["XSS_FLAGS"] = xss_flags  	conf.Finish()  # LibXML  conf = Configure(conf_env)  if conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") :  	env["HAVE_LIBXML"] = 1  	env["LIBXML_FLAGS"] = { "LIBS": ["xml2"] }  conf.Finish()  if not env.get("HAVE_LIBXML", 0) :  	libxml_env = conf_env.Clone() diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 39c63dd..52efe0e 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -1,93 +1,94 @@  #include "Swift/Controllers/MainController.h"  #include <boost/bind.hpp>  #include <boost/lexical_cast.hpp>  #include <boost/shared_ptr.hpp>  #include <stdlib.h>  #include "Swiften/Application/Application.h"  #include "Swiften/Application/ApplicationMessageDisplay.h"  #include "Swift/Controllers/ChatController.h"  #include "Swift/Controllers/ChatWindowFactory.h"  #include "Swift/Controllers/EventController.h"  #include "Swift/Controllers/UIInterfaces/LoginWindow.h"  #include "Swift/Controllers/UIInterfaces/LoginWindowFactory.h"  #include "Swift/Controllers/MainWindow.h"  #include "Swift/Controllers/MainWindowFactory.h"  #include "Swift/Controllers/MUCController.h"  #include "Swift/Controllers/NickResolver.h"  #include "Swift/Controllers/ProfileSettingsProvider.h"  #include "Swift/Controllers/RosterController.h"  #include "Swift/Controllers/SoundEventController.h"  #include "Swift/Controllers/SoundPlayer.h"  #include "Swift/Controllers/SystemTray.h"  #include "Swift/Controllers/SystemTrayController.h"  #include "Swift/Controllers/XMLConsoleController.h"  #include "Swift/Controllers/XMPPRosterController.h"  #include "Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h"  #include "Swift/Controllers/UIEvents/UIEventStream.h"  #include "Swiften/Base/foreach.h"  #include "Swiften/Base/String.h"  #include "Swiften/Client/Client.h"  #include "Swiften/Presence/PresenceSender.h"  #include "Swiften/Elements/Presence.h"  #include "Swiften/Elements/VCardUpdate.h"  #include "Swiften/Queries/Responders/SoftwareVersionResponder.h"  #include "Swiften/Roster/TreeWidgetFactory.h"  #include "Swiften/Settings/SettingsProvider.h"  #include "Swiften/Elements/DiscoInfo.h"  #include "Swiften/Queries/Responders/DiscoInfoResponder.h"  #include "Swiften/Disco/CapsInfoGenerator.h"  #include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"  #include "Swiften/Queries/Requests/GetVCardRequest.h"  #include "Swiften/Avatars/AvatarFileStorage.h"  #include "Swiften/Avatars/AvatarManager.h"  #include "Swiften/StringCodecs/SHA1.h" +#include "Swiften/StringCodecs/Hexify.h"  namespace {  	void printIncomingData(const Swift::String& data) {  		std::cout << "<- " << data << std::endl;  	}  	void printOutgoingData(const Swift::String& data) {  		std::cout << "-> " << data << std::endl;  	}  }  namespace Swift {  static const String CLIENT_NAME = "Swift";  static const String CLIENT_VERSION = "0.3";  static const String CLIENT_NODE = "http://swift.im";  typedef std::pair<JID, ChatController*> JIDChatControllerPair;  typedef std::pair<JID, MUCController*> JIDMUCControllerPair;  MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory)  		: timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), presenceSender_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {  	application_ = application;  	presenceOracle_ = NULL;  	avatarManager_ = NULL;  	uiEventStream_ = new UIEventStream();  	avatarStorage_ = new AvatarFileStorage(application_->getAvatarDir());  	eventController_ = new EventController();  	eventController_->onEventQueueLengthChange.connect(boost::bind(&MainController::handleEventQueueLengthChange, this, _1));  	systemTrayController_ = new SystemTrayController(eventController_, systemTray);  	soundEventController_ = new SoundEventController(eventController_, soundPlayer, settings->getBoolSetting("playSounds", true));  	loginWindow_ = loginWindowFactory_->createLoginWindow(uiEventStream_);  	foreach (String profile, settings->getAvailableProfiles()) {  		ProfileSettingsProvider* profileSettings = new ProfileSettingsProvider(profile, settings);  		loginWindow_->addAvailableAccount(profileSettings->getStringSetting("jid"), profileSettings->getStringSetting("pass"), profileSettings->getStringSetting("certificate"));  		delete profileSettings;  	}  	loginWindow_->selectUser(settings_->getStringSetting("lastLoginJID"));  	loginWindow_->onLoginRequest.connect(boost::bind(&MainController::handleLoginRequest, this, _1, _2, _3, _4));  	loginWindow_->onCancelLoginRequest.connect(boost::bind(&MainController::handleCancelLoginRequest, this));  	idleDetector_.setIdleTimeSeconds(600);  	idleDetector_.onIdleChanged.connect(boost::bind(&MainController::handleInputIdleChanged, this, _1));  	xmlConsoleController_ = new XMLConsoleController(uiEventStream_, xmlConsoleWidgetFactory);  } @@ -385,57 +386,57 @@ void MainController::handleChatControllerJIDChanged(const JID& from, const JID&  void MainController::handleJoinMUCRequest(const JID &muc, const String &nick) {  	mucControllers_[muc] = new MUCController(jid_, muc, nick, client_, presenceSender_, client_, chatWindowFactory_, treeWidgetFactory_, presenceOracle_, avatarManager_);  	mucControllers_[muc]->setAvailableServerFeatures(serverDiscoInfo_);  }  void MainController::handleIncomingMessage(boost::shared_ptr<Message> message) {  	JID jid = message->getFrom();  	boost::shared_ptr<MessageEvent> event(new MessageEvent(message));  	if (!event->isReadable()) {  		return;  	}  	// Try to deliver it to a MUC  	if (message->getType() == Message::Groupchat || message->getType() == Message::Error) {  		std::map<JID, MUCController*>::iterator i = mucControllers_.find(jid.toBare());  		if (i != mucControllers_.end()) {  			i->second->handleIncomingMessage(event);  			return;  		}  		else if (message->getType() == Message::Groupchat) {  			//FIXME: Error handling - groupchat messages from an unknown muc.  			return;  		}  	}  	//if not a mucroom  	eventController_->handleIncomingEvent(event);  	getChatController(jid)->handleIncomingMessage(event);  }  void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, const boost::optional<ErrorPayload>& error) {  	if (!error) {  		serverDiscoInfo_ = info;  		foreach (JIDChatControllerPair pair, chatControllers_) {  			pair.second->setAvailableServerFeatures(info);  		}  		foreach (JIDMUCControllerPair pair, mucControllers_) {  			pair.second->setAvailableServerFeatures(info);  		}  	}  }  bool MainController::isMUC(const JID& jid) const {  	return mucControllers_.find(jid.toBare()) != mucControllers_.end();  }  void MainController::handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {  	if (!error && !vCard->getPhoto().isEmpty()) { -		vCardPhotoHash_ = SHA1::getHexHash(vCard->getPhoto()); +		vCardPhotoHash_ = Hexify::hexify(SHA1::getHash(vCard->getPhoto()));  		if (lastSentPresence_) {  			sendPresence(lastSentPresence_);  		}  		avatarManager_->setAvatar(jid_, vCard->getPhoto());  	}  }  } diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript index 6c9b049..79357b5 100644 --- a/Swift/Controllers/SConscript +++ b/Swift/Controllers/SConscript @@ -1,29 +1,30 @@  Import("env")  env["SWIFT_CONTROLLERS_FLAGS"] = {  		"LIBPATH": [Dir(".")],  		"LIBS": ["SwiftControllers"]  	}  myenv = env.Clone()  myenv.MergeFlags(env["BOOST_FLAGS"])  myenv.StaticLibrary("SwiftControllers", [  		"ChatController.cpp",  		"ChatControllerBase.cpp",  		"MainController.cpp",  		"NickResolver.cpp",  		"RosterController.cpp",  		"XMPPRosterController.cpp",  		"MUCController.cpp",  		"EventController.cpp",  		"SoundEventController.cpp",  		"SystemTrayController.cpp",  		"XMLConsoleController.cpp", -		"UIEvents/UIEvent.cpp" +		"UIEvents/UIEvent.cpp", +		"UIInterfaces/XMLConsoleWidget.cpp",  	])  env.Append(UNITTEST_SOURCES = [  		File("UnitTest/NickResolverTest.cpp"),  		File("UnitTest/RosterControllerTest.cpp"),  		File("UnitTest/XMPPRosterControllerTest.cpp")  	]) diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp new file mode 100644 index 0000000..32e3065 --- /dev/null +++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp @@ -0,0 +1,8 @@ +#include "Swift/Controllers/UIInterfaces/XMLConsoleWidget.h" + +namespace Swift { + +XMLConsoleWidget::~XMLConsoleWidget() { +} + +} diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h index efde1a2..9098fbc 100644 --- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h +++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h @@ -1,8 +1,10 @@  #pragma once  namespace Swift {  	class XMLConsoleWidget {  		public: +			virtual ~XMLConsoleWidget(); +  			virtual void show() = 0;  	};  } diff --git a/Swiften/Avatars/AvatarManager.cpp b/Swiften/Avatars/AvatarManager.cpp index 574e199..599d1d4 100644 --- a/Swiften/Avatars/AvatarManager.cpp +++ b/Swiften/Avatars/AvatarManager.cpp @@ -1,87 +1,88 @@  #include "Swiften/Avatars/AvatarManager.h"  #include <boost/bind.hpp>  #include "Swiften/Client/StanzaChannel.h"  #include "Swiften/Elements/VCardUpdate.h"  #include "Swiften/Queries/Requests/GetVCardRequest.h"  #include "Swiften/StringCodecs/SHA1.h" +#include "Swiften/StringCodecs/Hexify.h"  #include "Swiften/Avatars/AvatarStorage.h"  #include "Swiften/MUC/MUCRegistry.h"  namespace Swift {  AvatarManager::AvatarManager(StanzaChannel* stanzaChannel, IQRouter* iqRouter, AvatarStorage* avatarStorage, MUCRegistry* mucRegistry) : stanzaChannel_(stanzaChannel), iqRouter_(iqRouter), avatarStorage_(avatarStorage), mucRegistry_(mucRegistry) {  	stanzaChannel->onPresenceReceived.connect(boost::bind(&AvatarManager::handlePresenceReceived, this, _1));  }  void AvatarManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) {  	boost::shared_ptr<VCardUpdate> update = presence->getPayload<VCardUpdate>();  	if (!update) {  		return;  	}  	JID from = getAvatarJID(presence->getFrom());  	String& hash = avatarHashes_[from];  	if (hash != update->getPhotoHash()) {  		String newHash = update->getPhotoHash();  		if (avatarStorage_->hasAvatar(newHash)) {  			setAvatarHash(from, newHash);  		}  		else {  			boost::shared_ptr<GetVCardRequest> request(new GetVCardRequest(from, iqRouter_));  			request->onResponse.connect(boost::bind(&AvatarManager::handleVCardReceived, this, from, newHash, _1, _2));  			request->send();  		}  	}  }  void AvatarManager::handleVCardReceived(const JID& from, const String& promisedHash, boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {  	if (error) {  		// FIXME: What to do here?  		std::cerr << "Warning: " << from << ": Could not get vCard" << std::endl;  		return;  	} -	String realHash = SHA1::getHexHash(vCard->getPhoto()); +	String realHash = Hexify::hexify(SHA1::getHash(vCard->getPhoto()));  	if (promisedHash != realHash) {  		std::cerr << "Warning: " << from << ": Got different vCard photo hash (" << promisedHash << " != " << realHash << ")" << std::endl;  	}  	avatarStorage_->addAvatar(realHash, vCard->getPhoto());  	setAvatarHash(from, realHash);  }  void AvatarManager::setAvatar(const JID& jid, const ByteArray& avatar) { -	String hash = SHA1::getHexHash(avatar); +	String hash = Hexify::hexify(SHA1::getHash(avatar));  	avatarStorage_->addAvatar(hash, avatar);  	setAvatarHash(getAvatarJID(jid), hash);  }  void AvatarManager::setAvatarHash(const JID& from, const String& hash) {  	avatarHashes_[from] = hash;  	onAvatarChanged(from, hash);  }  String AvatarManager::getAvatarHash(const JID& jid) const {  	std::map<JID, String>::const_iterator i = avatarHashes_.find(getAvatarJID(jid));  	if (i != avatarHashes_.end()) {  		return i->second;  	}  	else {  		return "";  	}  }  boost::filesystem::path AvatarManager::getAvatarPath(const JID& jid) const {  	String hash = getAvatarHash(jid);  	if (!hash.isEmpty()) {  		return avatarStorage_->getAvatarPath(hash);  	}  	return boost::filesystem::path();  }  JID AvatarManager::getAvatarJID(const JID& jid) const {  	JID bareFrom = jid.toBare();  	return (mucRegistry_->isMUC(bareFrom) ? jid : bareFrom);  }  } diff --git a/Swiften/Disco/CapsInfoGenerator.cpp b/Swiften/Disco/CapsInfoGenerator.cpp index 339d76e..8d9e407 100644 --- a/Swiften/Disco/CapsInfoGenerator.cpp +++ b/Swiften/Disco/CapsInfoGenerator.cpp @@ -1,34 +1,34 @@  #include "Swiften/Disco/CapsInfoGenerator.h"  #include <algorithm>  #include "Swiften/Base/foreach.h"  #include "Swiften/Elements/DiscoInfo.h"  #include "Swiften/StringCodecs/SHA1.h"  #include "Swiften/StringCodecs/Base64.h"  namespace Swift {  CapsInfoGenerator::CapsInfoGenerator(const String& node) : node_(node) {  }  CapsInfo CapsInfoGenerator::generateCapsInfo(const DiscoInfo& discoInfo) const {  	String serializedCaps;  	std::vector<DiscoInfo::Identity> identities(discoInfo.getIdentities());  	std::sort(identities.begin(), identities.end());  	foreach (const DiscoInfo::Identity& identity, identities) {  		serializedCaps += identity.getCategory() + "/" + identity.getType() + "/" + identity.getLanguage() + "/" + identity.getName() + "<";  	}  	std::vector<String> features(discoInfo.getFeatures());  	std::sort(features.begin(), features.end());  	foreach (const String& feature, features) {  		serializedCaps += feature + "<";  	} -	String version(Base64::encode(SHA1::getBinaryHash(serializedCaps))); +	String version(Base64::encode(SHA1::getHash(serializedCaps)));  	return CapsInfo(node_, version, "sha-1");  }  } diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp index a261810..5e6179f 100644 --- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp +++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp @@ -1,89 +1,89 @@  #include "Swiften/SASL/SCRAMSHA1ClientAuthenticator.h"  #include <cassert>  #include <map>  #include <boost/lexical_cast.hpp>  #include "Swiften/StringCodecs/SHA1.h"  #include "Swiften/StringCodecs/Base64.h"  #include "Swiften/StringCodecs/HMACSHA1.h"  #include "Swiften/StringCodecs/PBKDF2.h"  #include "Swiften/StringPrep/StringPrep.h"  namespace Swift {  static String escape(const String& s) {  	String result;  	for (size_t i = 0; i < s.getUTF8Size(); ++i) {  		if (s[i] == ',') {  			result += "=2C";  		}  		else if (s[i] == '=') {  			result += "=3D";  		}  		else {  			result += s[i];  		}  	}  	return result;  }  SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const String& nonce) : ClientAuthenticator("SCRAM-SHA-1"), step(Initial), clientnonce(nonce) {  }  ByteArray SCRAMSHA1ClientAuthenticator::getResponse() const {  	if (step == Initial) {  		return getGS2Header() + getInitialBareClientMessage();  	}  	else {  		ByteArray clientKey = HMACSHA1::getResult(saltedPassword, "Client Key"); -		ByteArray storedKey = SHA1::getBinaryHash(clientKey); +		ByteArray storedKey = SHA1::getHash(clientKey);  		ByteArray clientSignature = HMACSHA1::getResult(storedKey, authMessage);  		ByteArray clientProof = clientKey;  		for (unsigned int i = 0; i < clientProof.getSize(); ++i) {  			clientProof[i] ^= clientSignature[i];  		}  		ByteArray result = ByteArray("c=") + Base64::encode(getGS2Header()) + ",r=" + clientnonce + serverNonce + ",p=" + Base64::encode(clientProof);  		return result;  	}  }  bool SCRAMSHA1ClientAuthenticator::setChallenge(const ByteArray& challenge) {  	if (step == Initial) {  		initialServerMessage = challenge;  		std::map<char, String> keys = parseMap(String(initialServerMessage.getData(), initialServerMessage.getSize()));  		// Extract the salt  		ByteArray salt = Base64::decode(keys['s']);  		// Extract the server nonce  		String clientServerNonce = keys['r'];  		if (clientServerNonce.getUTF8Size() <= clientnonce.getUTF8Size()) {  			return false;  		}  		String receivedClientNonce = clientServerNonce.getSubstring(0, clientnonce.getUTF8Size());  		if (receivedClientNonce != clientnonce) {  			return false;  		}  		serverNonce = clientServerNonce.getSubstring(clientnonce.getUTF8Size(), clientServerNonce.npos());  		// Extract the number of iterations  		int iterations = 0;  		try {  			iterations = boost::lexical_cast<int>(keys['i'].getUTF8String());  		}  		catch (const boost::bad_lexical_cast&) {  			return false;  		}  		if (iterations <= 0) {  			return false;  		}  		// Compute all the values needed for the server signature  		saltedPassword = PBKDF2::encode(StringPrep::getPrepared(getPassword(), StringPrep::SASLPrep), salt, iterations);  		authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=" + Base64::encode(getGS2Header()) + ",r=" + clientnonce + serverNonce;  		ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key");  		serverSignature = HMACSHA1::getResult(serverKey, authMessage); diff --git a/Swiften/SConscript b/Swiften/SConscript index e7e1582..6c13edb 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -38,97 +38,99 @@ sources = [  		"Queries/IQHandler.cpp",  		"Queries/IQRouter.cpp",  		"Queries/Request.cpp",  		"Queries/Responders/DiscoInfoResponder.cpp",  		"Queries/Responders/SoftwareVersionResponder.cpp",  		"Roster/ContactRosterItem.cpp",  		"Roster/Roster.cpp",  		"Roster/XMPPRoster.cpp",  		"Serializer/AuthRequestSerializer.cpp",  		"Serializer/AuthSuccessSerializer.cpp",  		"Serializer/AuthChallengeSerializer.cpp",  		"Serializer/AuthResponseSerializer.cpp",  		"Serializer/CompressRequestSerializer.cpp",  		"Serializer/ElementSerializer.cpp",  		"Serializer/MessageSerializer.cpp",  		"Serializer/PayloadSerializer.cpp",  		"Serializer/PayloadSerializerCollection.cpp",  		"Serializer/PayloadSerializers/CapsInfoSerializer.cpp",  		"Serializer/PayloadSerializers/DiscoInfoSerializer.cpp",  		"Serializer/PayloadSerializers/ErrorSerializer.cpp",  		"Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp",  		"Serializer/PayloadSerializers/MUCPayloadSerializer.cpp",  		"Serializer/PayloadSerializers/ResourceBindSerializer.cpp",  		"Serializer/PayloadSerializers/RosterSerializer.cpp",  		"Serializer/PayloadSerializers/SecurityLabelSerializer.cpp",  		"Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp",  		"Serializer/PayloadSerializers/SoftwareVersionSerializer.cpp",  		"Serializer/PayloadSerializers/VCardSerializer.cpp",  		"Serializer/PayloadSerializers/VCardUpdateSerializer.cpp",  		"Serializer/PayloadSerializers/StorageSerializer.cpp",  		"Serializer/PayloadSerializers/PrivateStorageSerializer.cpp",  		"Serializer/PresenceSerializer.cpp",  		"Serializer/StanzaSerializer.cpp",  		"Serializer/StreamFeaturesSerializer.cpp",  		"Serializer/XML/XMLElement.cpp",  		"Serializer/XML/XMLNode.cpp",  		"Serializer/XMPPSerializer.cpp",  		"Server/ServerFromClientSession.cpp",  		"Server/ServerSession.cpp",  		"Server/ServerStanzaRouter.cpp",  		"Server/SimpleUserRegistry.cpp",  		"Server/UserRegistry.cpp",  		"Session/Session.cpp",  		"Session/SessionStream.cpp",  		"Session/BasicSessionStream.cpp",  		"StringCodecs/Base64.cpp",  		"StringCodecs/SHA1.cpp",  		"StringCodecs/HMACSHA1.cpp", +		"StringCodecs/MD5.cpp",  		"StringCodecs/PBKDF2.cpp", +		"StringCodecs/Hexify.cpp",  	]  # "Notifier/GrowlNotifier.cpp",  if myenv.get("HAVE_OPENSSL", 0) :  	sources += ["TLS/OpenSSL/OpenSSLContext.cpp"]  SConscript(dirs = [  		"Base",  		"StringPrep",  		"SASL",  		"Application",  		"EventLoop",  		"Parser",  		"JID",  		"Network",  		"History",  		"StreamStack",  		"LinkLocal",  		"QA",  	])  myenv.StaticLibrary("Swiften", sources + swiften_env["SWIFTEN_OBJECTS"])  env.Append(UNITTEST_SOURCES = [  		File("Application/UnitTest/ApplicationTest.cpp"),  		File("Base/UnitTest/IDGeneratorTest.cpp"),  		File("Base/UnitTest/StringTest.cpp"),  		File("Base/UnitTest/ByteArrayTest.cpp"),  		File("Client/UnitTest/ClientSessionTest.cpp"),  		File("Compress/UnitTest/ZLibCompressorTest.cpp"),  		File("Compress/UnitTest/ZLibDecompressorTest.cpp"),  		File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),  		File("Elements/UnitTest/IQTest.cpp"),  		File("Elements/UnitTest/StanzaTest.cpp"),  		File("Elements/UnitTest/StanzasTest.cpp"),  		File("EventLoop/UnitTest/EventLoopTest.cpp"),  		File("EventLoop/UnitTest/SimpleEventLoopTest.cpp"),  		File("History/UnitTest/SQLiteHistoryManagerTest.cpp"),  		File("JID/UnitTest/JIDTest.cpp"),  		File("LinkLocal/UnitTest/LinkLocalConnectorTest.cpp"),  		File("LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp"),  		File("LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp"),  		File("LinkLocal/UnitTest/LinkLocalServiceTest.cpp"),  		File("Network/UnitTest/HostAddressTest.cpp"),  		File("Network/UnitTest/ConnectorTest.cpp"),  		File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),  		File("Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp"),  		File("Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp"), @@ -145,51 +147,53 @@ env.Append(UNITTEST_SOURCES = [  		File("Parser/PayloadParsers/UnitTest/StorageParserTest.cpp"),  		File("Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp"),  		File("Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp"),  		File("Parser/UnitTest/AttributeMapTest.cpp"),  		File("Parser/UnitTest/IQParserTest.cpp"),  		File("Parser/UnitTest/MessageParserTest.cpp"),  		File("Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp"),  		File("Parser/UnitTest/PresenceParserTest.cpp"),  		File("Parser/UnitTest/SerializingParserTest.cpp"),  		File("Parser/UnitTest/StanzaParserTest.cpp"),  		File("Parser/UnitTest/StreamFeaturesParserTest.cpp"),  		File("Parser/UnitTest/XMLParserTest.cpp"),  		File("Parser/UnitTest/XMPPParserTest.cpp"),  		File("Presence/UnitTest/PresenceOracleTest.cpp"),  		File("Presence/UnitTest/PresenceSenderTest.cpp"),  		File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),  		File("Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp"),  		File("Queries/UnitTest/IQRouterTest.cpp"),  		File("Queries/UnitTest/RequestTest.cpp"),  		File("Queries/UnitTest/ResponderTest.cpp"),  		File("Roster/UnitTest/OfflineRosterFilterTest.cpp"),  		File("Roster/UnitTest/RosterTest.cpp"),  		File("Roster/UnitTest/XMPPRosterTest.cpp"),  		File("SASL/UnitTest/PLAINMessageTest.cpp"),  		File("SASL/UnitTest/PLAINClientAuthenticatorTest.cpp"),  		File("SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/PrioritySerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/ResourceBindSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/SoftwareVersionSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/StatusSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/StatusShowSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/VCardUpdateSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp"),  		File("Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp"),  		File("Serializer/UnitTest/StreamFeaturesSerializerTest.cpp"),  		File("Serializer/XML/UnitTest/XMLElementTest.cpp"),  		File("Server/UnitTest/ServerStanzaRouterTest.cpp"),  		File("StreamStack/UnitTest/StreamStackTest.cpp"),  		File("StreamStack/UnitTest/XMPPLayerTest.cpp"),  		File("StringCodecs/UnitTest/Base64Test.cpp"),  		File("StringCodecs/UnitTest/SHA1Test.cpp"), +		File("StringCodecs/UnitTest/MD5Test.cpp"), +		File("StringCodecs/UnitTest/HexifyTest.cpp"),  		File("StringCodecs/UnitTest/HMACSHA1Test.cpp"),  		File("StringCodecs/UnitTest/PBKDF2Test.cpp"),  	]) diff --git a/Swiften/StringCodecs/Base64.h b/Swiften/StringCodecs/Base64.h index 41ff62e..1ea378c 100644 --- a/Swiften/StringCodecs/Base64.h +++ b/Swiften/StringCodecs/Base64.h @@ -1,18 +1,14 @@ -#ifndef SWIFTEN_STRINGCODECS_BASE64_H -#define SWIFTEN_STRINGCODECS_BASE64_H +#pragma once  #include <vector>  #include "Swiften/Base/String.h"  #include "Swiften/Base/ByteArray.h"  namespace Swift { -	class Base64 -	{ +	class Base64 {  		public:  			static String encode(const ByteArray& s);  			static ByteArray decode(const String &s);  	};  } - -#endif diff --git a/Swiften/StringCodecs/HMACSHA1.cpp b/Swiften/StringCodecs/HMACSHA1.cpp index 59f1482..f4066cb 100644 --- a/Swiften/StringCodecs/HMACSHA1.cpp +++ b/Swiften/StringCodecs/HMACSHA1.cpp @@ -1,39 +1,39 @@  #include "Swiften/StringCodecs/HMACSHA1.h"  #include <cassert>  #include "Swiften/StringCodecs/SHA1.h"  #include "Swiften/Base/ByteArray.h"  namespace Swift {  static const unsigned int B = 64;  ByteArray HMACSHA1::getResult(const ByteArray& key, const ByteArray& data) {  	assert(key.getSize() <= B);  	// Create the padded key  	ByteArray paddedKey(key);  	paddedKey.resize(B);  	for (unsigned int i = key.getSize(); i < paddedKey.getSize(); ++i) {  		paddedKey[i] = 0x0;  	}  	// Create the first value  	ByteArray x(paddedKey);  	for (unsigned int i = 0; i < x.getSize(); ++i) {  		x[i] ^= 0x36;  	}  	x += data;  	// Create the second value  	ByteArray y(paddedKey);  	for (unsigned int i = 0; i < y.getSize(); ++i) {  		y[i] ^= 0x5c;  	} -	y += SHA1::getBinaryHash(x); +	y += SHA1::getHash(x); -	return SHA1::getBinaryHash(y); +	return SHA1::getHash(y);  }  } diff --git a/Swiften/StringCodecs/Hexify.cpp b/Swiften/StringCodecs/Hexify.cpp new file mode 100644 index 0000000..504e314 --- /dev/null +++ b/Swiften/StringCodecs/Hexify.cpp @@ -0,0 +1,22 @@ +#include "Swiften/StringCodecs/Hexify.h" + +#include <sstream> +#include <iomanip> +#include <boost/numeric/conversion/cast.hpp> + +#include "Swiften/Base/String.h" +#include "Swiften/Base/ByteArray.h" + +namespace Swift { + +String Hexify::hexify(const ByteArray& data) { +	std::ostringstream result; +	result << std::hex; + +	for (unsigned int i = 0; i < data.getSize(); ++i) { +		result << std::setw(2) << std::setfill('0') << boost::numeric_cast<unsigned int>(static_cast<unsigned char>(data[i])); +	} +	return String(result.str()); +} + +} diff --git a/Swiften/StringCodecs/Hexify.h b/Swiften/StringCodecs/Hexify.h new file mode 100644 index 0000000..7bd5bee --- /dev/null +++ b/Swiften/StringCodecs/Hexify.h @@ -0,0 +1,11 @@ +#pragma once + +namespace Swift { +	class String; +	class ByteArray; + +	class Hexify { +		public: +			static String hexify(const ByteArray& data); +	}; +} diff --git a/Swiften/StringCodecs/MD5.cpp b/Swiften/StringCodecs/MD5.cpp new file mode 100644 index 0000000..937d128 --- /dev/null +++ b/Swiften/StringCodecs/MD5.cpp @@ -0,0 +1,359 @@ +/*  + * This implementation is shamelessly copied from L. Peter Deutsch's  + * implementation, and altered to use our own defines and datastructures.  + * Original license below. + */ + +/* +	Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved. + +	This software is provided 'as-is', without any express or implied +	warranty.  In no event will the authors be held liable for any damages +	arising from the use of this software. + +	Permission is granted to anyone to use this software for any purpose, +	including commercial applications, and to alter it and redistribute it +	freely, subject to the following restrictions: + +	1. The origin of this software must not be misrepresented; you must not +		 claim that you wrote the original software. If you use this software +		 in a product, an acknowledgment in the product documentation would be +		 appreciated but is not required. +	2. Altered source versions must be plainly marked as such, and must not be +		 misrepresented as being the original software. +	3. This notice may not be removed or altered from any source distribution. + +	L. Peter Deutsch +	ghost@aladdin.com + */ + +#include "Swiften/StringCodecs/MD5.h" + +#include <cassert> + +#include "Swiften/Base/ByteArray.h" +#include "Swiften/Base/Platform.h" + +namespace Swift { + +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ + +/* Define the state of the MD5 Algorithm. */ +typedef struct md5_state_s { +		md5_word_t count[2];				/* message length in bits, lsw first */ +		md5_word_t abcd[4];					/* digest buffer */ +		md5_byte_t buf[64];					/* accumulate block */ +} md5_state_t; + +#define T_MASK ((md5_word_t)~0) +#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87) +#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9) +#define T3		0x242070db +#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111) +#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050) +#define T6		0x4787c62a +#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec) +#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe) +#define T9		0x698098d8 +#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850) +#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e) +#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841) +#define T13		 0x6b901122 +#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c) +#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71) +#define T16		 0x49b40821 +#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d) +#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf) +#define T19		 0x265e5a51 +#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855) +#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2) +#define T22		 0x02441453 +#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e) +#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437) +#define T25		 0x21e1cde6 +#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829) +#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278) +#define T28		 0x455a14ed +#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa) +#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07) +#define T31		 0x676f02d9 +#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375) +#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd) +#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e) +#define T35		 0x6d9d6122 +#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3) +#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb) +#define T38		 0x4bdecfa9 +#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f) +#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f) +#define T41		 0x289b7ec6 +#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805) +#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a) +#define T44		 0x04881d05 +#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6) +#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a) +#define T47		 0x1fa27cf8 +#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a) +#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb) +#define T50		 0x432aff97 +#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58) +#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6) +#define T53		 0x655b59c3 +#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d) +#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82) +#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e) +#define T57		 0x6fa87e4f +#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f) +#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb) +#define T60		 0x4e0811a1 +#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d) +#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca) +#define T63		 0x2ad7d2bb +#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) + + +static void md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) { +		md5_word_t +		a = pms->abcd[0], b = pms->abcd[1], +		c = pms->abcd[2], d = pms->abcd[3]; +		md5_word_t t; +#ifdef SWIFTEN_BIG_ENDIAN +		/* Define storage only for big-endian CPUs. */ +		md5_word_t X[16]; +#else +		/* Define storage for little-endian or both types of CPUs. */ +		md5_word_t xbuf[16]; +		const md5_word_t *X; +#endif + +		{ +#ifdef SWIFTEN_LITTLE_ENDIAN +				{ +						/* +						 * On little-endian machines, we can process properly aligned +						 * data without copying it. +						 */ +						if (!((data - (const md5_byte_t *)0) & 3)) { +								/* data are properly aligned */ +								X = (const md5_word_t *)data; +						} else { +								/* not aligned */ +								memcpy(xbuf, data, 64); +								X = xbuf; +						} +				} +#else +				{ +						/* +						 * On big-endian machines, we must arrange the bytes in the +						 * right order. +						 */ +						const md5_byte_t *xp = data; +						int i; + +						for (i = 0; i < 16; ++i, xp += 4) +								X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); +				} +#endif +		} + +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) + +		/* Round 1. */ +		/* Let [abcd k s i] denote the operation +			 a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ +#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +#define SET(a, b, c, d, k, s, Ti)\ +	t = a + F(b,c,d) + X[k] + Ti;\ +	a = ROTATE_LEFT(t, s) + b +		/* Do the following 16 operations. */ +		SET(a, b, c, d,  0,  7,  T1); +		SET(d, a, b, c,  1, 12,  T2); +		SET(c, d, a, b,  2, 17,  T3); +		SET(b, c, d, a,  3, 22,  T4); +		SET(a, b, c, d,  4,  7,  T5); +		SET(d, a, b, c,  5, 12,  T6); +		SET(c, d, a, b,  6, 17,  T7); +		SET(b, c, d, a,  7, 22,  T8); +		SET(a, b, c, d,  8,  7,  T9); +		SET(d, a, b, c,  9, 12, T10); +		SET(c, d, a, b, 10, 17, T11); +		SET(b, c, d, a, 11, 22, T12); +		SET(a, b, c, d, 12,  7, T13); +		SET(d, a, b, c, 13, 12, T14); +		SET(c, d, a, b, 14, 17, T15); +		SET(b, c, d, a, 15, 22, T16); +#undef SET + +		 /* Round 2. */ +		 /* Let [abcd k s i] denote the operation +					a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ +#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ +	t = a + G(b,c,d) + X[k] + Ti;\ +	a = ROTATE_LEFT(t, s) + b +		 /* Do the following 16 operations. */ +		SET(a, b, c, d,  1,  5, T17); +		SET(d, a, b, c,  6,  9, T18); +		SET(c, d, a, b, 11, 14, T19); +		SET(b, c, d, a,  0, 20, T20); +		SET(a, b, c, d,  5,  5, T21); +		SET(d, a, b, c, 10,  9, T22); +		SET(c, d, a, b, 15, 14, T23); +		SET(b, c, d, a,  4, 20, T24); +		SET(a, b, c, d,  9,  5, T25); +		SET(d, a, b, c, 14,  9, T26); +		SET(c, d, a, b,  3, 14, T27); +		SET(b, c, d, a,  8, 20, T28); +		SET(a, b, c, d, 13,  5, T29); +		SET(d, a, b, c,  2,  9, T30); +		SET(c, d, a, b,  7, 14, T31); +		SET(b, c, d, a, 12, 20, T32); +#undef SET + +		 /* Round 3. */ +		 /* Let [abcd k s t] denote the operation +					a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define SET(a, b, c, d, k, s, Ti)\ +	t = a + H(b,c,d) + X[k] + Ti;\ +	a = ROTATE_LEFT(t, s) + b +		 /* Do the following 16 operations. */ +		SET(a, b, c, d,  5,  4, T33); +		SET(d, a, b, c,  8, 11, T34); +		SET(c, d, a, b, 11, 16, T35); +		SET(b, c, d, a, 14, 23, T36); +		SET(a, b, c, d,  1,  4, T37); +		SET(d, a, b, c,  4, 11, T38); +		SET(c, d, a, b,  7, 16, T39); +		SET(b, c, d, a, 10, 23, T40); +		SET(a, b, c, d, 13,  4, T41); +		SET(d, a, b, c,  0, 11, T42); +		SET(c, d, a, b,  3, 16, T43); +		SET(b, c, d, a,  6, 23, T44); +		SET(a, b, c, d,  9,  4, T45); +		SET(d, a, b, c, 12, 11, T46); +		SET(c, d, a, b, 15, 16, T47); +		SET(b, c, d, a,  2, 23, T48); +#undef SET + +		 /* Round 4. */ +		 /* Let [abcd k s t] denote the operation +					a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ +#define I(x, y, z) ((y) ^ ((x) | ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ +	t = a + I(b,c,d) + X[k] + Ti;\ +	a = ROTATE_LEFT(t, s) + b +		 /* Do the following 16 operations. */ +		SET(a, b, c, d,  0,  6, T49); +		SET(d, a, b, c,  7, 10, T50); +		SET(c, d, a, b, 14, 15, T51); +		SET(b, c, d, a,  5, 21, T52); +		SET(a, b, c, d, 12,  6, T53); +		SET(d, a, b, c,  3, 10, T54); +		SET(c, d, a, b, 10, 15, T55); +		SET(b, c, d, a,  1, 21, T56); +		SET(a, b, c, d,  8,  6, T57); +		SET(d, a, b, c, 15, 10, T58); +		SET(c, d, a, b,  6, 15, T59); +		SET(b, c, d, a, 13, 21, T60); +		SET(a, b, c, d,  4,  6, T61); +		SET(d, a, b, c, 11, 10, T62); +		SET(c, d, a, b,  2, 15, T63); +		SET(b, c, d, a,  9, 21, T64); +#undef SET + +		 /* Then perform the following additions. (That is increment each +				of the four registers by the value it had before this block +				was started.) */ +		pms->abcd[0] += a; +		pms->abcd[1] += b; +		pms->abcd[2] += c; +		pms->abcd[3] += d; +} + +void +md5_init(md5_state_t *pms) +{ +		pms->count[0] = pms->count[1] = 0; +		pms->abcd[0] = 0x67452301; +		pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476; +		pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301; +		pms->abcd[3] = 0x10325476; +} + +void +md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +{ +		const md5_byte_t *p = data; +		int left = nbytes; +		int offset = (pms->count[0] >> 3) & 63; +		md5_word_t nbits = (md5_word_t)(nbytes << 3); + +		if (nbytes <= 0) +				return; + +		/* Update the message length. */ +		pms->count[1] += nbytes >> 29; +		pms->count[0] += nbits; +		if (pms->count[0] < nbits) +				pms->count[1]++; + +		/* Process an initial partial block. */ +		if (offset) { +				int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + +				memcpy(pms->buf + offset, p, copy); +				if (offset + copy < 64) +						return; +				p += copy; +				left -= copy; +				md5_process(pms, pms->buf); +		} + +		/* Process full blocks. */ +		for (; left >= 64; p += 64, left -= 64) +				md5_process(pms, p); + +		/* Process a final partial block. */ +		if (left) +				memcpy(pms->buf, p, left); +} + +void +md5_finish(md5_state_t *pms, md5_byte_t digest[16]) +{ +		static const md5_byte_t pad[64] = { +				0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +		}; +		md5_byte_t data[8]; +		int i; + +		/* Save the length before padding. */ +		for (i = 0; i < 8; ++i) +				data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); +		/* Pad to 56 bytes mod 64. */ +		md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); +		/* Append the length. */ +		md5_append(pms, data, 8); +		for (i = 0; i < 16; ++i) +				digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); +} + +ByteArray MD5::getHash(const ByteArray& data) { +	ByteArray digest; +	digest.resize(16); + +	md5_state_t state; +	md5_init(&state); +	md5_append(&state, reinterpret_cast<const md5_byte_t*>(data.getData()), data.getSize()); +	md5_finish(&state, reinterpret_cast<md5_byte_t*>(digest.getData())); + +	return digest; +} + +} diff --git a/Swiften/StringCodecs/MD5.h b/Swiften/StringCodecs/MD5.h new file mode 100644 index 0000000..8773409 --- /dev/null +++ b/Swiften/StringCodecs/MD5.h @@ -0,0 +1,10 @@ +#pragma once + +namespace Swift { +	class ByteArray; + +	class MD5 { +		public: +			static ByteArray getHash(const ByteArray& data); +	}; +} diff --git a/Swiften/StringCodecs/SHA1.cpp b/Swiften/StringCodecs/SHA1.cpp index 70256e9..ef99d9a 100644 --- a/Swiften/StringCodecs/SHA1.cpp +++ b/Swiften/StringCodecs/SHA1.cpp @@ -1,52 +1,48 @@ -#include <sstream> -#include <iomanip> -#include <boost/numeric/conversion/cast.hpp> -  #include "Swiften/Base/Platform.h"  #pragma GCC diagnostic ignored "-Wold-style-cast"  /*  SHA-1 in C  By Steve Reid <steve@edmweb.com>  100% Public Domain  Test Vectors (from FIPS PUB 180-1)  "abc"  	A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"  	84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1  A million repetitions of "a"  	34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F  */  /* #define LITTLE_ENDIAN * This should be #define'd if true. */  /* #define SHA1HANDSOFF * Copies data before messing with it. */  #include <boost/cstdint.hpp>  #include <stdio.h>  #include <string.h>  typedef struct {  		boost::uint32_t state[5];  		boost::uint32_t count[2];  		boost::uint8_t buffer[64];  } SHA1_CTX;  void SHA1Transform(boost::uint32_t state[5], boost::uint8_t buffer[64]);  void SHA1Init(SHA1_CTX* context);  void SHA1Update(SHA1_CTX* context, boost::uint8_t* data, unsigned int len);  void SHA1Final(boost::uint8_t digest[20], SHA1_CTX* context);  #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))  /* blk0() and blk() perform the initial expand. */  /* I got the idea of expanding during the round function from SSLeay */  #ifdef SWIFTEN_LITTLE_ENDIAN  #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \  		|(rol(block->l[i],8)&0x00FF00FF))  #else  #define blk0(i) block->l[i]  #endif  #define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \  		^block->l[(i+2)&15]^block->l[i&15],1)) @@ -142,71 +138,60 @@ unsigned int i, j;  				SHA1Transform(context->state, context->buffer);  				for ( ; i + 63 < len; i += 64) {  						SHA1Transform(context->state, &data[i]);  				}  				j = 0;  		}  		else i = 0;  		memcpy(&context->buffer[j], &data[i], len - i);  }  /* Add padding and return the message digest. */  void SHA1Final(boost::uint8_t digest[20], SHA1_CTX* context)  {  boost::uint32_t i, j;  boost::uint8_t finalcount[8];  		for (i = 0; i < 8; i++) {  				finalcount[i] = (boost::uint8_t) ((context->count[(i >= 4 ? 0 : 1)]  				 >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */  		}  		SHA1Update(context, (boost::uint8_t *)("\200"), 1);  		while ((context->count[0] & 504) != 448) {  				SHA1Update(context, (boost::uint8_t *)("\0"), 1);  		}  		SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */  		for (i = 0; i < 20; i++) {  				digest[i] = (boost::uint8_t)  				 ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);  		}  		/* Wipe variables */  		i = j = 0;  		memset(context->buffer, 0, 64);  		memset(context->state, 0, 20);  		memset(context->count, 0, 8);  		memset(&finalcount, 0, 8);  #ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */  		SHA1Transform(context->state, context->buffer);  #endif  }  // -----------------------------------------------------------------------------  #include "Swiften/StringCodecs/SHA1.h"  namespace Swift { -ByteArray SHA1::getBinaryHash(const ByteArray& input) { +ByteArray SHA1::getHash(const ByteArray& input) {  	ByteArray inputCopy(input);  	ByteArray digest;  	digest.resize(20);  	SHA1_CTX context;  	SHA1Init(&context);  	SHA1Update(&context, (boost::uint8_t*) inputCopy.getData(), inputCopy.getSize());  	SHA1Final((boost::uint8_t*) digest.getData(), &context);  	return digest;  } -String SHA1::getHexHash(const ByteArray& input) { -	ByteArray digest = getBinaryHash(input); -	std::ostringstream result; -	result << std::hex; - -	for (unsigned int i = 0; i < digest.getSize(); ++i) { -		result << std::setw(2) << std::setfill('0') << boost::numeric_cast<unsigned int>(static_cast<unsigned char>(digest[i])); -	} -	return String(result.str()); -} -  } diff --git a/Swiften/StringCodecs/SHA1.h b/Swiften/StringCodecs/SHA1.h index 0b0f434..9f54e8e 100644 --- a/Swiften/StringCodecs/SHA1.h +++ b/Swiften/StringCodecs/SHA1.h @@ -1,14 +1,10 @@ -#ifndef SWIFTEN_SHA1_H -#define SWIFTEN_SHA1_H +#pragma once  #include "Swiften/Base/ByteArray.h"  namespace Swift {  	class SHA1 {  		public: -			static ByteArray getBinaryHash(const ByteArray& data); -			static String getHexHash(const ByteArray& data); -		}; +			static ByteArray getHash(const ByteArray& data); +	};  } - -#endif diff --git a/Swiften/StringCodecs/UnitTest/Base64Test.cpp b/Swiften/StringCodecs/UnitTest/Base64Test.cpp index 0217758..a28a9ab 100644 --- a/Swiften/StringCodecs/UnitTest/Base64Test.cpp +++ b/Swiften/StringCodecs/UnitTest/Base64Test.cpp @@ -1,47 +1,44 @@  #include <cppunit/extensions/HelperMacros.h>  #include <cppunit/extensions/TestFactoryRegistry.h>  #include "Swiften/StringCodecs/Base64.h"  using namespace Swift; -class Base64Test : public CppUnit::TestFixture -{ +class Base64Test : public CppUnit::TestFixture {  		CPPUNIT_TEST_SUITE(Base64Test);  		CPPUNIT_TEST(testEncode);  		CPPUNIT_TEST(testEncode_NonAscii);  		CPPUNIT_TEST(testEncode_NoData);  		CPPUNIT_TEST(testDecode);  		CPPUNIT_TEST(testDecode_NoData);  		CPPUNIT_TEST_SUITE_END();  	public: -		Base64Test() {} -  		void testEncode() {  			String result(Base64::encode("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"));  			CPPUNIT_ASSERT_EQUAL(String("QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejEyMzQ1Njc4OTA="), result);  		}  		void testEncode_NonAscii() {  			String result(Base64::encode(ByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed")));  			CPPUNIT_ASSERT_EQUAL(String("QgayPKawpkPSDYmwT/WM94uAlu0="), result);  		}  		void testEncode_NoData() {  			String result(Base64::encode(ByteArray()));  			CPPUNIT_ASSERT_EQUAL(String(""), result);  		}  		void testDecode() {  			ByteArray result(Base64::decode("QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejEyMzQ1Njc4OTA="));  			CPPUNIT_ASSERT_EQUAL(ByteArray("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"), result);  		}  		void testDecode_NoData() {  			ByteArray result(Base64::decode(""));  			CPPUNIT_ASSERT_EQUAL(ByteArray(), result);  		}  };  CPPUNIT_TEST_SUITE_REGISTRATION(Base64Test); diff --git a/Swiften/StringCodecs/UnitTest/HexifyTest.cpp b/Swiften/StringCodecs/UnitTest/HexifyTest.cpp new file mode 100644 index 0000000..bf032a3 --- /dev/null +++ b/Swiften/StringCodecs/UnitTest/HexifyTest.cpp @@ -0,0 +1,21 @@ +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + +#include "Swiften/StringCodecs/Hexify.h" +#include "Swiften/Base/String.h" +#include "Swiften/Base/ByteArray.h" + +using namespace Swift; + +class HexifyTest : public CppUnit::TestFixture { +		CPPUNIT_TEST_SUITE(HexifyTest); +		CPPUNIT_TEST(testHexify); +		CPPUNIT_TEST_SUITE_END(); + +	public: +		void testHexify() { +			CPPUNIT_ASSERT_EQUAL(String("4206b23ca6b0a643d20d89b04ff58cf78b8096ed"), Hexify::hexify(ByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed"))); +		} +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(HexifyTest); diff --git a/Swiften/StringCodecs/UnitTest/MD5Test.cpp b/Swiften/StringCodecs/UnitTest/MD5Test.cpp new file mode 100644 index 0000000..cad8754 --- /dev/null +++ b/Swiften/StringCodecs/UnitTest/MD5Test.cpp @@ -0,0 +1,29 @@ +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/extensions/TestFactoryRegistry.h> + +#include "Swiften/StringCodecs/MD5.h" +#include "Swiften/Base/ByteArray.h" + +using namespace Swift; + +class MD5Test : public CppUnit::TestFixture { +		CPPUNIT_TEST_SUITE(MD5Test); +		CPPUNIT_TEST(testGetHash_Empty); +		CPPUNIT_TEST(testGetHash_Alphabet); +		CPPUNIT_TEST_SUITE_END(); + +	public: +		void testGetHash_Empty() { +			ByteArray result(MD5::getHash("")); + +			CPPUNIT_ASSERT_EQUAL(ByteArray("\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e", 16), result); +		} + +		void testGetHash_Alphabet() { +			ByteArray result(MD5::getHash("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")); + +			CPPUNIT_ASSERT_EQUAL(ByteArray("\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f", 16), result); +		} +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(MD5Test); diff --git a/Swiften/StringCodecs/UnitTest/SHA1Test.cpp b/Swiften/StringCodecs/UnitTest/SHA1Test.cpp index 849dd6d..3dbf341 100644 --- a/Swiften/StringCodecs/UnitTest/SHA1Test.cpp +++ b/Swiften/StringCodecs/UnitTest/SHA1Test.cpp @@ -1,46 +1,37 @@  #include <cppunit/extensions/HelperMacros.h>  #include <cppunit/extensions/TestFactoryRegistry.h>  #include "Swiften/StringCodecs/SHA1.h"  using namespace Swift; -class SHA1Test : public CppUnit::TestFixture -{ +class SHA1Test : public CppUnit::TestFixture {  		CPPUNIT_TEST_SUITE(SHA1Test); -		CPPUNIT_TEST(testGetBinaryHash); -		CPPUNIT_TEST(testGetBinaryHash_Twice); -		CPPUNIT_TEST(testGetHexHash); -		CPPUNIT_TEST(testGetHexHash_NoData); +		CPPUNIT_TEST(testGetHash); +		CPPUNIT_TEST(testGetHash_Twice); +		CPPUNIT_TEST(testGetHash_NoData);  		CPPUNIT_TEST_SUITE_END();  	public: -		SHA1Test() {} - -		void testGetBinaryHash() { -			ByteArray result(SHA1::getBinaryHash("client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<")); +		void testGetHash() { +			ByteArray result(SHA1::getHash("client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<"));  			CPPUNIT_ASSERT_EQUAL(ByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed"), result);  		} -		void testGetBinaryHash_Twice() { +		void testGetHash_Twice() {  			ByteArray input("client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<"); -			SHA1::getBinaryHash(input); -			ByteArray result(SHA1::getBinaryHash(input)); +			SHA1::getHash(input); +			ByteArray result(SHA1::getHash(input));  			CPPUNIT_ASSERT_EQUAL(ByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed"), result);  		} -		void testGetHexHash() { -			String result(SHA1::getHexHash("client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<")); -			CPPUNIT_ASSERT_EQUAL(String("4206b23ca6b0a643d20d89b04ff58cf78b8096ed"), result); -		} - -		void testGetHexHash_NoData() { -			String result(SHA1::getHexHash(ByteArray())); +		void testGetHash_NoData() { +			ByteArray result(SHA1::getHash(ByteArray())); -			CPPUNIT_ASSERT_EQUAL(String("da39a3ee5e6b4b0d3255bfef95601890afd80709"), result); +			CPPUNIT_ASSERT_EQUAL(ByteArray("\xda\x39\xa3\xee\x5e\x6b\x4b\x0d\x32\x55\xbf\xef\x95\x60\x18\x90\xaf\xd8\x07\x09"), result);  		}  };  CPPUNIT_TEST_SUITE_REGISTRATION(SHA1Test);  | 
 Swift