summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Crypto')
-rw-r--r--Swiften/Crypto/CryptoProvider.cpp4
-rw-r--r--Swiften/Crypto/CryptoProvider.h6
-rw-r--r--Swiften/Crypto/UnitTest/CryptoProviderTest.cpp10
-rw-r--r--Swiften/Crypto/WindowsCryptoProvider.cpp4
-rw-r--r--Swiften/Crypto/WindowsCryptoProvider.h5
5 files changed, 15 insertions, 14 deletions
diff --git a/Swiften/Crypto/CryptoProvider.cpp b/Swiften/Crypto/CryptoProvider.cpp
index 04b0b16..9c7c637 100644
--- a/Swiften/Crypto/CryptoProvider.cpp
+++ b/Swiften/Crypto/CryptoProvider.cpp
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Crypto/CryptoProvider.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
using namespace Swift;
diff --git a/Swiften/Crypto/CryptoProvider.h b/Swiften/Crypto/CryptoProvider.h
index a86468c..3eaeeb3 100644
--- a/Swiften/Crypto/CryptoProvider.h
+++ b/Swiften/Crypto/CryptoProvider.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -26,11 +26,11 @@ namespace Swift {
// Convenience
template<typename T> ByteArray getSHA1Hash(const T& data) {
- return boost::shared_ptr<Hash>(createSHA1())->update(data).getHash();
+ return std::shared_ptr<Hash>(createSHA1())->update(data).getHash();
}
template<typename T> ByteArray getMD5Hash(const T& data) {
- return boost::shared_ptr<Hash>(createMD5())->update(data).getHash();
+ return std::shared_ptr<Hash>(createMD5())->update(data).getHash();
}
};
}
diff --git a/Swiften/Crypto/UnitTest/CryptoProviderTest.cpp b/Swiften/Crypto/UnitTest/CryptoProviderTest.cpp
index d37e776..72eb81d 100644
--- a/Swiften/Crypto/UnitTest/CryptoProviderTest.cpp
+++ b/Swiften/Crypto/UnitTest/CryptoProviderTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -58,14 +58,14 @@ class CryptoProviderTest : public CppUnit::TestFixture {
////////////////////////////////////////////////////////////
void testGetSHA1Hash() {
- boost::shared_ptr<Hash> sha = boost::shared_ptr<Hash>(provider->createSHA1());
+ std::shared_ptr<Hash> sha = std::shared_ptr<Hash>(provider->createSHA1());
sha->update(createByteArray("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(createByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed"), sha->getHash());
}
void testGetSHA1Hash_TwoUpdates() {
- boost::shared_ptr<Hash> sha = boost::shared_ptr<Hash>(provider->createSHA1());
+ std::shared_ptr<Hash> sha = std::shared_ptr<Hash>(provider->createSHA1());
sha->update(createByteArray("client/pc//Exodus 0.9.1<http://jabber.org/protocol/caps<"));
sha->update(createByteArray("http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<"));
@@ -73,7 +73,7 @@ class CryptoProviderTest : public CppUnit::TestFixture {
}
void testGetSHA1Hash_NoData() {
- boost::shared_ptr<Hash> sha = boost::shared_ptr<Hash>(provider->createSHA1());
+ std::shared_ptr<Hash> sha = std::shared_ptr<Hash>(provider->createSHA1());
sha->update(std::vector<unsigned char>());
CPPUNIT_ASSERT_EQUAL(createByteArray("\xda\x39\xa3\xee\x5e\x6b\x4b\x0d\x32\x55\xbf\xef\x95\x60\x18\x90\xaf\xd8\x07\x09"), sha->getHash());
@@ -117,7 +117,7 @@ class CryptoProviderTest : public CppUnit::TestFixture {
}
void testMD5Incremental() {
- boost::shared_ptr<Hash> testling = boost::shared_ptr<Hash>(provider->createMD5());
+ std::shared_ptr<Hash> testling = std::shared_ptr<Hash>(provider->createMD5());
testling->update(createByteArray("ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
testling->update(createByteArray("abcdefghijklmnopqrstuvwxyz0123456789"));
diff --git a/Swiften/Crypto/WindowsCryptoProvider.cpp b/Swiften/Crypto/WindowsCryptoProvider.cpp
index e0410c6..61ac03e 100644
--- a/Swiften/Crypto/WindowsCryptoProvider.cpp
+++ b/Swiften/Crypto/WindowsCryptoProvider.cpp
@@ -17,7 +17,7 @@
#include <security.h>
#include <Wincrypt.h>
#include <cassert>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
#include <Swiften/Crypto/Hash.h>
#include <Swiften/Base/ByteArray.h>
@@ -191,7 +191,7 @@ namespace {
}
WindowsCryptoProvider::WindowsCryptoProvider() {
- p = boost::make_shared<Private>();
+ p = std::make_shared<Private>();
if (!CryptAcquireContext(&p->context, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
assert(false);
}
diff --git a/Swiften/Crypto/WindowsCryptoProvider.h b/Swiften/Crypto/WindowsCryptoProvider.h
index 4c998d2..ddf7ffa 100644
--- a/Swiften/Crypto/WindowsCryptoProvider.h
+++ b/Swiften/Crypto/WindowsCryptoProvider.h
@@ -6,8 +6,9 @@
#pragma once
+#include <memory>
+
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <Swiften/Base/Override.h>
#include <Swiften/Crypto/CryptoProvider.h>
@@ -26,6 +27,6 @@ namespace Swift {
private:
struct Private;
- boost::shared_ptr<Private> p;
+ std::shared_ptr<Private> p;
};
}