FCL/sf/mw/appinstall: comparison secureswitools/swisistools/source/common/util.cpp

equal deleted inserted replaced

-:5cc91383ab1e
+:7333d7932ef7
 #include <sstream>
 // openssl
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 #ifdef _WIN32
 #include <windows.h>
 #endif // _WIN32
-#include "utf8.h"
+#include "utf8_wrapper.h"
 static const TUint32 CrcTab32[256] =
 {
 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
 	return value;
 	}
 TInt64 Util::WideCharToInt64(const wchar_t* aWideChar)
 	{
-	TInt64 i64 = 0;
+	TInt64 value=0;
-	swscanf(aWideChar, L"%I64d", &i64);
+	std::wstringstream str(aWideChar);
-	return i64;
+	str >> value;
+	return value;
 	}
 DllExport const std::wstring Util::IntegerToWideString(int aInt)
 	{
 	std::wstringstream wstream;
 	return encodedString;
 	}
 std::string Util::Base64Decode( const std::string& aEncodedData )
 	{
-	BIO *mem = BIO_new(BIO_s_mem());
+	unsigned char* pIn = aEncodedData.c_str();
-	BIO_write(mem, aEncodedData.c_str(), aEncodedData.length());
+	int inLen = aEncodedData.length();
+	unsigned char* pOut = new unsigned char[inLen];
-	BIO* b64 = BIO_new(BIO_f_base64());
-	mem = BIO_push(b64, mem);
+	int outLen;
-	int inlen = 0;
+	std::string aDecodeData;
-	char inbuf[40]={0};
+// create a memory buffer containing base64 encoded data
-	inlen = BIO_read(b64, inbuf, aEncodedData.length());
+BIO* bmem = BIO_new_mem_buf((void*)pIn, inLen);
-BIO_write(mem, inbuf, inlen);
-	std::string decodedData = inbuf;
+// push a Base64 filter so that reading from buffer decodes it
+BIO *bioCmd = BIO_new(BIO_f_base64());
-	BIO_free_all(mem);
+// we don't want newlines
-	return decodedData;
+BIO_set_flags(bioCmd, BIO_FLAGS_BASE64_NO_NL);
-	}
+bmem = BIO_push(bioCmd, bmem);
+int finalLen = BIO_read(bmem, (void*)pOut, outLen);
+	aDecodeData.assign(pOut, pOut+finalLen);
+	delete pOut;
+BIO_free_all(bmem);
+	return aDecodeData;
+	}
 TUint32 Util::Crc32(const void* aPtr, TInt aLength)
 	{
 	const TUint8* p = (const TUint8*)aPtr;
 	const TUint8* q = p + aLength;
 	TUint32 crc = 0;
 	while (p < q)
 	 crc = (crc >> 8) ^ CrcTab32[(crc ^ *p++) & 0xff];
 	return crc;
 	}

branch	RCL_3
changeset 65	7333d7932ef7
parent 62	5cc91383ab1e
child 66	8b7f4e561641