clean and hub

include/plcLicence.h

@@ -221,6 +221,12 @@ private:
   const char *dataFileName; // name of xml containing data (if not taken from commandline)
   WORD licType = 2;         // type of licence
   BinaryGenerationType binaryGeneration = BinaryGenerationType::Base64Cout; //typ generování binárního souboru
+  
+  string dataLicenceType = ""; //type of licence from xmlFile;
+  string dataLicenceVersion = ""; //version type of licence from xmlFile;
+  string dataCryptoVersion = ""; //version of crypting from xmlFile
+  string dataGenerationType = ""; //version of dataGeneration from xmlFile
+  string dataLicenceDataFileName = ""; //name of licence file to read
 
   CryptData cryptData; // structure for encryp
   CidData sdData;      // data loaded from SD card
@@ -228,7 +234,9 @@ private:
   void processConfigFile(string &dataFileName); //process data from config file
   void getSDData();                       // reads SD card
   string getLicenceName(BYTE licPostfix); // get proper licencename
-  void initCrypto();                      // inits keys and vectors for encrypting
+  void initCrypto();        
+  bool CreateEosEovLicence(); // create licence for EOV_OSV
+  bool ReadEosEovLicence(const char *dataFileName);
   
 public:
   string operationErrors = "";
@@ -238,6 +246,10 @@ public:
   PlcLicence(char *cid, char *csd, string binaryType, string dataFileName);
   bool CreateLicence(); // creates licence
   bool ReadLicence(const char *dataFileName, WORD licType, BYTE licPostfix, char *cid, char *csd); // reads licence file to readable structures
+  bool ReadLicence(const char *dataFileName, string licenceType, string licenceVersion, char *cid, char *csd);
+
+  // bool CreateEosEovLicence();
+
 };
 
 #endif