1 files changed, 16 insertions, 16 deletions
diff --git a/src/Common/CommandAPDU.h b/src/Common/CommandAPDU.h
index 98825faa..f1adf176 100644
--- a/src/Common/CommandAPDU.h
+++ b/src/Common/CommandAPDU.h
@@ -7,87 +7,87 @@
 namespace VeraCrypt
 {
 	inline const std::string vformat(const char* zcFormat, ...)
 	{
 		if (zcFormat)
 		{
 			va_list vaArgs;
 			va_start(vaArgs, zcFormat);
 
 			const int iLen = vsnprintf(NULL, 0, zcFormat, vaArgs);
 			va_end(vaArgs);
 
 			if (iLen)
 			{
 				std::vector<char> zc((size_t)iLen + 1);
 				va_start(vaArgs, zcFormat);
 				vsnprintf(zc.data(), zc.size(), zcFormat, vaArgs);
 				va_end(vaArgs);
 
 				return std::string(zc.data(), iLen);
 			}
 		}
 	
 		return "";
 	}
 
 	class CommandAPDU 
 	{
 	protected:
 
-		vector<byte> m_apdu;
+		vector<uint8> m_apdu;
 		uint32 m_nc;
 		uint32 m_ne;
 		uint32 m_dataOffset;
 		bool m_isExtendedAPDU;
 		std::string m_parsingErrorStr;
 		bool m_parsedSuccessfully;
 
 		void parse();
-		void init(byte cla, byte ins, byte p1, byte p2, const byte* data, uint32 dataOffset, uint32 dataLength, uint32 ne);
-		void setHeader(byte cla, byte ins, byte p1, byte p2);
+		void init(uint8 cla, uint8 ins, uint8 p1, uint8 p2, const uint8* data, uint32 dataOffset, uint32 dataLength, uint32 ne);
+		void setHeader(uint8 cla, uint8 ins, uint8 p1, uint8 p2);
 
 	public:
 
 		void clear();
 
 		CommandAPDU();
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2, const byte* data, uint32 dataOffset, uint32 dataLength, uint32 ne);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2, const uint8* data, uint32 dataOffset, uint32 dataLength, uint32 ne);
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2);
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2, uint32 ne);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2, uint32 ne);
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2, const vector<byte>& data);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2, const vector<uint8>& data);
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2, const byte* data, uint32 dataOffset, uint32 dataLength);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2, const uint8* data, uint32 dataOffset, uint32 dataLength);
 
-		CommandAPDU(byte cla, byte ins, byte p1, byte p2, const vector<byte>& data, uint32 ne);
+		CommandAPDU(uint8 cla, uint8 ins, uint8 p1, uint8 p2, const vector<uint8>& data, uint32 ne);
 
-		CommandAPDU(const vector<byte>& apdu);
+		CommandAPDU(const vector<uint8>& apdu);
 
-		byte getCLA();
+		uint8 getCLA();
 
-		byte getINS();
+		uint8 getINS();
 
-		byte getP1();
+		uint8 getP1();
 
-		byte getP2();
+		uint8 getP2();
 
 		uint32 getNc();
 
-		const vector<byte> getData();
+		const vector<uint8> getData();
 
 		uint32 getNe();
 
-		const vector<byte> getAPDU();
+		const vector<uint8> getAPDU();
 
 		bool isValid();
 
 		std::string getErrorStr();
 
 		bool isExtended();
 	};
 };
 
 #endif // TC_HEADER_Common_CommandAPDU
 \ No newline at end of file