--- a/omadrm/drmengine/utils/src/Base64.cpp Fri Mar 12 15:43:46 2010 +0200
+++ b/omadrm/drmengine/utils/src/Base64.cpp Mon Mar 15 12:41:43 2010 +0200
@@ -19,10 +19,10 @@
// INCLUDE FILES
#include <e32std.h>
-#include "base64.h"
+#include "Base64.h"
// LOCAL CONSTANTS AND MACROS
-LOCAL_C const TUint8* const KBase64Chars =
+LOCAL_C const TUint8* const KBase64Chars =
_S8("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789+/");
@@ -72,7 +72,7 @@
TUint8 charArray3[3];
TUint8 charArray4[4];
TInt l = 0;
-
+
ret = HBufC8::NewL((aInput.Length() * 4 + 1) / 3);
TPtr8 des = ret->Des();
while (l < aInput.Length())
@@ -87,7 +87,7 @@
charArray4[2] = static_cast<TUint8>(
((charArray3[1] & 0x0f) << 2) + ((charArray3[2] & 0xc0) >> 6));
charArray4[3] = static_cast<TUint8>(charArray3[2] & 0x3f);
-
+
for (i = 0; i <4; i++)
{
des.Append(KBase64Chars[charArray4[i]]);
@@ -95,32 +95,32 @@
i = 0;
}
}
-
+
if (i != 0)
{
for (j = i; j < 3; j++)
{
charArray3[j] = '\0';
}
-
+
charArray4[0] = static_cast<TUint8>((charArray3[0] & 0xfc) >> 2);
charArray4[1] = static_cast<TUint8>(
((charArray3[0] & 0x03) << 4) +((charArray3[1] & 0xf0) >> 4));
charArray4[2] = static_cast<TUint8>(
((charArray3[1] & 0x0f) << 2) +((charArray3[2] & 0xc0) >> 6));
charArray4[3] = static_cast<TUint8>(charArray3[2] & 0x3f);
-
+
for (j = 0; j < i + 1; j++)
{
des.Append(KBase64Chars[charArray4[j]]);
}
-
+
while ((i++ < 3))
{
des.Append('=');
}
}
-
+
return ret;
}
@@ -141,7 +141,7 @@
TInt in = 0;
TUint8 charArray4[4], charArray3[3];
HBufC8* ret;
-
+
ret = HBufC8::NewL((aInput.Length() * 3 + 1) / 4);
TPtr8 des = ret->Des();
while (len-- && aInput[in] != '=')
@@ -154,21 +154,21 @@
{
in++;
}
-
+
if (i == 4)
{
for (i = 0; i < 4; i++)
{
charArray4[i] = FindBase64Char(charArray4[i]);
}
-
+
charArray3[0] = static_cast<TUint8>(
(charArray4[0] << 2) + ((charArray4[1] & 0x30) >> 4));
charArray3[1] = static_cast<TUint8>(
((charArray4[1] & 0xf) << 4) + ((charArray4[2] & 0x3c) >> 2));
charArray3[2] = static_cast<TUint8>(
((charArray4[2] & 0x3) << 6) + charArray4[3]);
-
+
for (i = 0; i < 3; i++)
{
des.Append(charArray3[i]);
@@ -176,33 +176,33 @@
i = 0;
}
}
-
+
if (i != 0)
{
for (j = i; j < 4; j++)
{
charArray4[j] = 0;
}
-
+
for (j = 0; j < 4; j++)
{
charArray4[j] = FindBase64Char(charArray4[j]);
}
-
+
charArray3[0] = static_cast<TUint8>(
(charArray4[0] << 2) + ((charArray4[1] & 0x30) >> 4));
charArray3[1] = static_cast<TUint8>(
((charArray4[1] & 0xf) << 4) + ((charArray4[2] & 0x3c) >> 2));
charArray3[2] = static_cast<TUint8>(
((charArray4[2] & 0x3) << 6) + charArray4[3]);
-
+
for (j = 0; j < i - 1; j++)
{
des.Append(charArray3[j]);
}
}
-
+
return ret;
}
-// End of File
+// End of File