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)
@@ -74,18 +79,20 @@ 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)
 	    {
+			bool xorComment = true;
 			//llinfos << "FOUND PAYLOAD" << llendl;
 			std::vector<U8> payload(128);
 			S32 i;
 			memcpy(&(payload[0]), &(comment[2]), 128);
 			//std::copy(comment.begin()+2,comment.end(),payload.begin());
+			//lets check XOR Cipher first
 			if (payload[2] == payload[127])
 			{
 				// emkdu.dll
@@ -110,23 +117,57 @@ std::string LLImageMetaDataReader::ExtractEncodedComment(U8* data,int data_size)
 			}
 			else
 			{
-		    break;//exit loop
+				xorComment = false;
 			}
-		for (i = 4; i < 128; ++i)
+			if(!xorComment)
+			{
+				//this is terrible i know
+				std::vector<U8> dataout(128);
+				CRijndael aes;
+				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) break;
+				if(i < 4) continue;
-		std::string result(payload.begin()+4,payload.begin()+i);
+				if(result.length() > 0)
-		//llinfos << "FOUND COMMENT: " << result << llendl;
+					result.append(" ");
-		return result;
+
+				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>