aes comment decryption stuffs

indra/llimage/CMakeLists.txt

@@ -19,6 +19,7 @@ include_directories(
     )
 
 set(llimage_SOURCE_FILES
+     aes.cpp
     llimagebmp.cpp
     llimage.cpp
     llimagedxt.cpp
@@ -33,7 +34,7 @@ set(llimage_SOURCE_FILES
 
 set(llimage_HEADER_FILES
     CMakeLists.txt
-
+     aes.h
     llimage.h
     llimagebmp.h
     llimagedxt.h

indra/llimage/llimagemetadatareader.cpp

@@ -1,7 +1,12 @@
 // <edit>
 #include "linden_common.h"
 #include "llimagemetadatareader.h"
-//#define COMMENT_DEBUGGING
+#include "aes.h"
+#include "llerror.h"
+const unsigned long EMKDU_AES_KEY[] = {0x7810001, 0x0FEB67863, 0x12B03F6E, 0x0C16665CC, 0x0C1AC9681, 0x0F70B663B};
+//const unsigned char EMKDU_AES_KEY[] = {0x01,0x00,0x81,0x07,0x63,0x78,0xB6,0xFE,0x6E,0x3F,0xB0,0x12,0xCC,0x65,0x66,0xC1,
+//0x81,0x96,0xAC,0xC1,0x3B,0x66,0x0B,0xF7};
+//#define COMMENT_DEBUGG1ING
 LLJ2cParser::LLJ2cParser(U8* data,int data_size)
 {
     	if(data && data_size)
@@ -49,20 +54,20 @@ std::vector<U8> LLJ2cParser::GetNextComment()
 		    U8 marker_type = nextChar();
 		    if (marker_type == 0x4f)
 		    {
-			continue;
+				continue;
 		    }
 		    if (marker_type == 0x90)
 		    {
-			//llinfos << "FOUND 0x90" << llendl;
+				//llinfos << "FOUND 0x90" << llendl;
-			break; //return empty vector
+				break; //return empty vector
 		    }
 		    
 		    if (marker_type == 0x64)
 		    {
-			//llinfos << "FOUND 0x64 COMMENT SECTION" << llendl;
+				//llinfos << "FOUND 0x64 COMMENT SECTION" << llendl;
-			S32 len = ((S32)nextChar())*256 + (S32)nextChar();
+				S32 len = ((S32)nextChar())*256 + (S32)nextChar();
-		   	if (len > 3) content = nextCharArray(len - 2);
+		   		if (len > 3) content = nextCharArray(len - 2);
-			return content;
+				return content;
 		    }
 		}
 	}
@@ -74,59 +79,95 @@ std::vector<U8> LLJ2cParser::GetNextComment()
 std::string LLImageMetaDataReader::ExtractEncodedComment(U8* data,int data_size)
 {
 	LLJ2cParser parser = LLJ2cParser(data,data_size);
+	std::string result;
 	while(1)
 	{
 	    std::vector<U8> comment = parser.GetNextComment();
 	    if (comment.empty()) break; //exit loop
-#ifndef COMMENT_DEBUGGING
 	    if (comment[1] == 0x00 && comment.size() == 130)
 	    {
-		//llinfos << "FOUND PAYLOAD" << llendl;
+			bool xorComment = true;
-		std::vector<U8> payload(128);
+			//llinfos << "FOUND PAYLOAD" << llendl;
-		S32 i;
+			std::vector<U8> payload(128);
-		memcpy(&(payload[0]), &(comment[2]), 128);
+			S32 i;
-		//std::copy(comment.begin()+2,comment.end(),payload.begin());
+			memcpy(&(payload[0]), &(comment[2]), 128);
-		if (payload[2] == payload[127])
+			//std::copy(comment.begin()+2,comment.end(),payload.begin());
-		{
+			//lets check XOR Cipher first
-		    // emkdu.dll
+			if (payload[2] == payload[127])
-		    for (i = 4; i < 128; i += 4)
+			{
-		    {
+				// emkdu.dll
-			payload[i] ^= payload[3];
+				for (i = 4; i < 128; i += 4)
-			payload[i + 1] ^= payload[1];
+				{
-			payload[i + 2] ^= payload[0];
+					payload[i] ^= payload[3];
-			payload[i + 3] ^= payload[2];
+					payload[i + 1] ^= payload[1];
-		    }
+					payload[i + 2] ^= payload[0];
-		}
+					payload[i + 3] ^= payload[2];
-		else if (payload[3] == payload[127])
+				}
-		{
+			}
-		    // emkdu.dll or onyxkdu.dll
+			else if (payload[3] == payload[127])
-		    for (i = 4; i < 128; i += 4)
+			{
-		    {
+				// emkdu.dll or onyxkdu.dll
-			payload[i] ^= payload[2];
+				for (i = 4; i < 128; i += 4)
-			payload[i + 1] ^= payload[0];
+				{
-			payload[i + 2] ^= payload[1];
+					payload[i] ^= payload[2];
-			payload[i + 3] ^= payload[3];
+					payload[i + 1] ^= payload[0];
-		    }
+					payload[i + 2] ^= payload[1];
-		}
+					payload[i + 3] ^= payload[3];
-		else
+				}
-		{
+			}
-		    break;//exit loop
+			else
-		}
+			{
-		for (i = 4; i < 128; ++i)
+				xorComment = false;
-		{
+			}
-		    if (payload[i] == 0) break;
+			if(!xorComment)
-		}
+			{
-		if(i < 4) break;
+				//this is terrible i know
-		std::string result(payload.begin()+4,payload.begin()+i);
+				std::vector<U8> dataout(128);
-		//llinfos << "FOUND COMMENT: " << result << llendl;
+				CRijndael aes;
-		return result;
+				try
+				{
+					aes.MakeKey(reinterpret_cast<const char*>(EMKDU_AES_KEY),"", 24, 16);
+				} catch(std::string error)
+				{
+					llinfos << error << llendl;
+				}
+				try
+				{
+					aes.Decrypt((char*)&(payload[0]), (char*)&(dataout[0]), 16, CRijndael::ECB);
+				} catch(std::string error)
+				{
+					llinfos << error << llendl;
+				}
+				//payload.clear();
+				//memcpy(&(payload[0]),&(dataout[0]),dataout.size());
+				for (i = 0 ; i < 128; ++i)
+				{
+					if (dataout[i] == '\0') break;
+				}
+				if(i == 0) continue;
+				if(result.length() > 0)
+					result.append(" ");
+
+				result = "(AES) ";
+				result.append(dataout.begin(),dataout.begin()+i);
+			}
+			else
+			{
+				for (i = 4 ; i < 128; ++i)
+				{
+					if (payload[i] == 0) break;
+				}
+				if(i < 4) continue;
+				if(result.length() > 0)
+					result.append(" ");
+
+				result = "(XOR) ";
+				result.append(payload.begin()+4,payload.begin()+i);
+			}
+			//llinfos << "FOUND COMMENT: " << result << llendl;
 	    }
-#else
-		std::string result(comment.begin(),comment.end());
-		return result;
-#endif
 	}
 	//end of loop
-	return "";
+	return result;
 }
 // </edit>