summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-04-26 20:07:58 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-04-27 11:02:06 (GMT)
commit5d8c328e236f57d7390d32f9ea7bd17a31e1e740 (patch)
treebebe606707a6b835fe3fd15e694d629b5e420947 /Swiften/SConscript
parentaa131405927fc7f597ed06aff71abb0a30b59926 (diff)
downloadswift-5d8c328e236f57d7390d32f9ea7bd17a31e1e740.zip
swift-5d8c328e236f57d7390d32f9ea7bd17a31e1e740.tar.bz2
Removing third-party hash implementations.
Using library/platform implementation instead. Change-Id: I2457c2dad80e6fdda023a7f31c3906ff10fe09ed
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r--Swiften/SConscript12
1 files changed, 1 insertions, 11 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index b9fad17..1cb3543 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -221,8 +221,6 @@ if env["SCONS_STAGE"] == "build" :
"Session/BasicSessionStream.cpp",
"Session/BOSHSessionStream.cpp",
"StringCodecs/Base64.cpp",
- "StringCodecs/SHA256.cpp",
- "StringCodecs/MD5.cpp",
"StringCodecs/Hexify.cpp",
"Whiteboard/WhiteboardResponder.cpp",
"Whiteboard/WhiteboardSession.cpp",
@@ -241,6 +239,7 @@ if env["SCONS_STAGE"] == "build" :
"IDN",
"SASL",
"TLS",
+ "Crypto",
"EventLoop",
"Parser",
"JID",
@@ -267,11 +266,6 @@ if env["SCONS_STAGE"] == "build" :
])
myenv = swiften_env.Clone()
- if myenv["PLATFORM"] == "win32":
- sources.append("StringCodecs/SHA1_Windows.cpp")
- else:
- sources.append("StringCodecs/SHA1.cpp")
-
if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
env.MergeFlags(env["GCONF_FLAGS"])
@@ -441,11 +435,7 @@ if env["SCONS_STAGE"] == "build" :
File("StreamStack/UnitTest/StreamStackTest.cpp"),
File("StreamStack/UnitTest/XMPPLayerTest.cpp"),
File("StringCodecs/UnitTest/Base64Test.cpp"),
- File("StringCodecs/UnitTest/SHA1Test.cpp"),
- File("StringCodecs/UnitTest/SHA256Test.cpp"),
- File("StringCodecs/UnitTest/MD5Test.cpp"),
File("StringCodecs/UnitTest/HexifyTest.cpp"),
- File("StringCodecs/UnitTest/HMACTest.cpp"),
File("StringCodecs/UnitTest/PBKDF2Test.cpp"),
File("TLS/UnitTest/ServerIdentityVerifierTest.cpp"),
File("TLS/UnitTest/CertificateTest.cpp"),