5 files changed, 22 insertions, 23 deletions
diff --git a/Swiften/TLS/Certificate.cpp b/Swiften/TLS/Certificate.cpp
index ecd7d5e..a796463 100644
--- a/Swiften/TLS/Certificate.cpp
+++ b/Swiften/TLS/Certificate.cpp
@@ -22,7 +22,7 @@ Certificate::~Certificate() {
 std::string Certificate::getSHA1Fingerprint() const {
 	ByteArray hash = SHA1::getHash(toDER());
 	std::ostringstream s;
-	for (size_t i = 0; i < hash.getSize(); ++i) {
+	for (size_t i = 0; i < hash.size(); ++i) {
 		if (i > 0) {
 			s << ":";
 		}
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index 0b2df5b..06ce360 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -23,11 +23,11 @@ OpenSSLCertificate::OpenSSLCertificate(boost::shared_ptr<X509> cert) : cert(cert
 
 OpenSSLCertificate::OpenSSLCertificate(const ByteArray& der) {
 #if OPENSSL_VERSION_NUMBER <= 0x009070cfL
-	unsigned char* p = const_cast<unsigned char*>(der.getData());
+	unsigned char* p = const_cast<unsigned char*>(vecptr(der));
 #else
-	const unsigned char* p = der.getData();
+	const unsigned char* p = vecptr(der);
 #endif
-	cert = boost::shared_ptr<X509>(d2i_X509(NULL, &p, der.getSize()), X509_free);
+	cert = boost::shared_ptr<X509>(d2i_X509(NULL, &p, der.size()), X509_free);
 	if (!cert) {
 		SWIFT_LOG(warning) << "Error creating certificate from DER data" << std::endl;
 	}
@@ -41,7 +41,7 @@ ByteArray OpenSSLCertificate::toDER() const {
 
 	ByteArray result;
 	result.resize(i2d_X509(cert.get(), NULL));
-	unsigned char* p = reinterpret_cast<unsigned char*>(result.getData());
+	unsigned char* p = vecptr(result);
 	i2d_X509(cert.get(), &p);
 	return result;
 }
@@ -57,15 +57,15 @@ void OpenSSLCertificate::parse() {
 		// Subject name
 		ByteArray subjectNameData;
 		subjectNameData.resize(256);
-		X509_NAME_oneline(X509_get_subject_name(cert.get()), reinterpret_cast<char*>(subjectNameData.getData()), subjectNameData.getSize());
-		this->subjectName = std::string(reinterpret_cast<const char*>(subjectNameData.getData()));
+		X509_NAME_oneline(X509_get_subject_name(cert.get()), reinterpret_cast<char*>(vecptr(subjectNameData)), subjectNameData.size());
+		this->subjectName = byteArrayToString(subjectNameData);
 
 		// Common name
 		int cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, -1);
 		while (cnLoc != -1) {
 			X509_NAME_ENTRY* cnEntry = X509_NAME_get_entry(subjectName, cnLoc);
 			ASN1_STRING* cnData = X509_NAME_ENTRY_get_data(cnEntry);
-			commonNames.push_back(ByteArray(cnData->data, cnData->length).toString());
+			commonNames.push_back(byteArrayToString(createByteArray(reinterpret_cast<const char*>(cnData->data), cnData->length)));
 			cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, cnLoc);
 		}
 	}
@@ -87,7 +87,7 @@ void OpenSSLCertificate::parse() {
 						continue;
 					}
 					ASN1_UTF8STRING* xmppAddrValue = otherName->value->value.utf8string;
-					addXMPPAddress(ByteArray(ASN1_STRING_data(xmppAddrValue), ASN1_STRING_length(xmppAddrValue)).toString());
+					addXMPPAddress(byteArrayToString(createByteArray(reinterpret_cast<const char*>(ASN1_STRING_data(xmppAddrValue)), ASN1_STRING_length(xmppAddrValue))));
 				}
 				else if (OBJ_cmp(otherName->type_id, dnsSRVObject.get()) == 0) {
 					// SRVName
@@ -95,12 +95,12 @@ void OpenSSLCertificate::parse() {
 						continue;
 					}
 					ASN1_IA5STRING* srvNameValue = otherName->value->value.ia5string;
-					addSRVName(ByteArray(ASN1_STRING_data(srvNameValue), ASN1_STRING_length(srvNameValue)).toString());
+					addSRVName(byteArrayToString(createByteArray(reinterpret_cast<const char*>(ASN1_STRING_data(srvNameValue)), ASN1_STRING_length(srvNameValue))));
 				}
 			}
 			else if (generalName->type == GEN_DNS) {
 				// DNSName
-				addDNSName(ByteArray(ASN1_STRING_data(generalName->d.dNSName), ASN1_STRING_length(generalName->d.dNSName)).toString());
+				addDNSName(byteArrayToString(createByteArray(ASN1_STRING_data(generalName->d.dNSName), ASN1_STRING_length(generalName->d.dNSName))));
 			}
 		}
 	}
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
index a2f97e6..edd1503 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
@@ -48,8 +48,7 @@ OpenSSLContext::OpenSSLContext() : state_(Start), context_(0), handle_(0), readB
 			if (!certContext) {
 				break;
 			}
-			ByteArray certData(certContext->pbCertEncoded, certContext->cbCertEncoded);
-			OpenSSLCertificate cert(certData);
+			OpenSSLCertificate cert(createByteArray(certContext->pbCertEncoded, certContext->cbCertEncoded));
 			if (store && cert.getInternalX509()) {
 				X509_STORE_add_cert(store, cert.getInternalX509().get());
 			}
@@ -140,13 +139,13 @@ void OpenSSLContext::sendPendingDataToNetwork() {
 	if (size > 0) {
 		ByteArray data;
 		data.resize(size);
-		BIO_read(writeBIO_, data.getData(), size);
+		BIO_read(writeBIO_, vecptr(data), size);
 		onDataForNetwork(data);
 	}
 }
 
 void OpenSSLContext::handleDataFromNetwork(const ByteArray& data) {
-	BIO_write(readBIO_, data.getData(), data.getSize());
+	BIO_write(readBIO_, vecptr(data), data.size());
 	switch (state_) {
 		case Connecting:
 			doConnect();
@@ -160,7 +159,7 @@ void OpenSSLContext::handleDataFromNetwork(const ByteArray& data) {
 }
 
 void OpenSSLContext::handleDataFromApplication(const ByteArray& data) {
-	if (SSL_write(handle_, data.getData(), data.getSize()) >= 0) {
+	if (SSL_write(handle_, vecptr(data), data.size()) >= 0) {
 		sendPendingDataToNetwork();
 	}
 	else {
@@ -172,12 +171,12 @@ void OpenSSLContext::handleDataFromApplication(const ByteArray& data) {
 void OpenSSLContext::sendPendingDataToApplication() {
 	ByteArray data;
 	data.resize(SSL_READ_BUFFERSIZE);
-	int ret = SSL_read(handle_, data.getData(), data.getSize());
+	int ret = SSL_read(handle_, vecptr(data), data.size());
 	while (ret > 0) {
 		data.resize(ret);
 		onDataForApplication(data);
 		data.resize(SSL_READ_BUFFERSIZE);
-		ret = SSL_read(handle_, data.getData(), data.getSize());
+		ret = SSL_read(handle_, vecptr(data), data.size());
 	}
 	if (ret < 0 && SSL_get_error(handle_, ret) != SSL_ERROR_WANT_READ) {
 		state_ = Error;
@@ -192,7 +191,7 @@ bool OpenSSLContext::setClientCertificate(const PKCS12Certificate& certificate)
 
 	// Create a PKCS12 structure
 	BIO* bio = BIO_new(BIO_s_mem());
-	BIO_write(bio, certificate.getData().getData(), certificate.getData().getSize());
+	BIO_write(bio, vecptr(certificate.getData()), certificate.getData().size());
 	boost::shared_ptr<PKCS12> pkcs12(d2i_PKCS12_bio(bio, NULL), PKCS12_free);
 	BIO_free(bio);
 	if (!pkcs12) {
@@ -247,7 +246,7 @@ boost::shared_ptr<CertificateVerificationError> OpenSSLContext::getPeerCertifica
 ByteArray OpenSSLContext::getFinishMessage() const {
 	ByteArray data;
 	data.resize(MAX_FINISHED_SIZE);
-	size_t size = SSL_get_finished(handle_, data.getData(), data.getSize());
+	size_t size = SSL_get_finished(handle_, vecptr(data), data.size());
 	data.resize(size);
 	return data;
 }
diff --git a/Swiften/TLS/PKCS12Certificate.h b/Swiften/TLS/PKCS12Certificate.h
index c5b93ca..d4cb367 100644
--- a/Swiften/TLS/PKCS12Certificate.h
+++ b/Swiften/TLS/PKCS12Certificate.h
@@ -14,11 +14,11 @@ namespace Swift {
 			PKCS12Certificate() {}
 
 			PKCS12Certificate(const std::string& filename, const std::string& password) : password_(password) {
-				data_.readFromFile(filename);
+				readByteArrayFromFile(data_, filename);
 			}
 
 			bool isNull() const {
-				return data_.isEmpty();
+				return data_.empty();
 			}
 
 			const ByteArray& getData() const {
diff --git a/Swiften/TLS/UnitTest/CertificateTest.cpp b/Swiften/TLS/UnitTest/CertificateTest.cpp
index 216aaae..5df5639 100644
--- a/Swiften/TLS/UnitTest/CertificateTest.cpp
+++ b/Swiften/TLS/UnitTest/CertificateTest.cpp
@@ -23,7 +23,7 @@ class CertificateTest : public CppUnit::TestFixture {
 	public:
 		void testGetSHA1Fingerprint() {
 			SimpleCertificate::ref testling = boost::make_shared<SimpleCertificate>();
-			testling->setDER(ByteArray("abcdefg"));
+			testling->setDER(createByteArray("abcdefg"));
 
 			CPPUNIT_ASSERT_EQUAL(std::string("2f:b5:e1:34:19:fc:89:24:68:65:e7:a3:24:f4:76:ec:62:4e:87:40"), testling->getSHA1Fingerprint());
 		}