Changeset 41

Timestamp:

02/15/12 19:53:48 (9 years ago)

Author:

vsilva

Message:

Implement Check SOD; Resolve some fixes; Remove Auto load library from sdk(cause problems on windows); PINPAD ACR Plugin; Firefox Certificates Extension on MSI

Location:

middleware-offline/trunk/_src/eidmw

Files:

• applayer/APLCard.cpp (modified) (2 diffs)
• applayer/APLCardPteid.cpp (modified) (5 diffs)
• applayer/APLCertif.cpp (modified) (3 diffs)
• applayer/APLCertif.h (modified) (3 diffs)
• applayer/CardFile.cpp (modified) (1 diff)
• applayer/CardFile.h (modified) (1 diff)
• applayer/CardPteid.cpp (modified) (18 diffs)
• applayer/CardPteid.h (modified) (6 diffs)
• applayer/SODParser.cpp (added)
• applayer/SODParser.h (added)
• applayer/SigContainer.cpp (modified) (7 diffs)
• applayer/XadesSignature.cpp (modified) (15 diffs)
• applayer/XadesSignature.h (modified) (5 diffs)
• applayer/applayer.pro (modified) (2 diffs)
• applayer/cryptoFramework.cpp (modified) (1 diff)
• applayer/cryptoFramework.h (modified) (2 diffs)
• common/Config.h (modified) (4 diffs)
• common/ConfigCommon.cpp (modified) (2 diffs)
• common/eidErrors.h (modified) (1 diff)
• eidgui/AutoUpdates.cpp (modified) (12 diffs)
• eidgui/Images/application_print_PDF.png (modified) (previous)
• eidgui/dlgPrint.ui (modified) (5 diffs)
• eidgui/dlgSignature.ui (modified) (2 diffs)
• eidgui/dlgVerifySignature.ui (modified) (2 diffs)
• eidgui/dlgprint.cpp (modified) (3 diffs)
• eidgui/dlgsignature.cpp (modified) (1 diff)
• eidgui/eidmw_nl.qm (modified) (previous)
• eidgui/eidmw_nl.ts (modified) (8 diffs)
• eidgui/httpwindow.cpp (modified) (1 diff)
• eidgui/mainwnd.cpp (modified) (2 diffs)
• eidgui/mainwnd.ui (modified) (1 diff)
• eidlib/eidlib.i (modified) (2 diffs)
• eidlib/eidlibCard.cpp (modified) (1 diff)
• eidlib/eidlibException.cpp (modified) (2 diffs)
• eidlib/eidlibException.h (modified) (1 diff)
• eidlib/eidlibReader.cpp (modified) (1 diff)
• eidlib/eidlibdefines.h (modified) (1 diff)
• install/pteid.conf.3.5 (modified) (1 diff)
• mdw_online_patches/apply_patches.sh (modified) (1 diff)
• misc/Wix_MW35/MW35Wix/Product.wxs (modified) (1 diff)
• pkcs11/asn1.h (modified) (1 diff)
• pteidlinuxversion.pl (modified) (1 diff)

middleware-offline/trunk/_src/eidmw/applayer/APLCard.cpp

@@ -145 +145 @@
         XadesSignature sig(this);
 
-        CByteArray &signature = sig.SignXades(paths,n_paths);
+        CByteArray &signature = sig.SignXades(paths, n_paths, false);
         StoreSignatureToDisk (signature, paths, n_paths,output_path);
 
@@ -168 +168 @@
 }
 
-CByteArray &APL_Card::SignXadesT(const char ** path, unsigned int n_paths, const char *output_file)
-{
-        CByteArray * ba = new CByteArray();
-        //TODO
-        return *ba;
+CByteArray &APL_Card::SignXadesT(const char ** paths, unsigned int n_paths, const char *output_file)
+{
+        if (paths == NULL || n_paths < 1)
+           throw CMWEXCEPTION(EIDMW_ERR_CHECK);
+        XadesSignature sig(this);
+
+        CByteArray &signature = sig.SignXades(paths, n_paths, true);
+        StoreSignatureToDisk (signature, paths, n_paths, output_file);
+
+        //Write zip container signature and referenced files in zip container
+
+        return signature;
 }
 

middleware-offline/trunk/_src/eidmw/applayer/APLCardPteid.cpp

@@ -30 +30 @@
 #include "MiscUtil.h"
 #include "StringOps.h"
+#include "APLConfig.h"
+
 
 using namespace std;
@@ -748 +750 @@
                 CAutoMutex autoMutex(&m_Mutex);         //We lock for only one instanciation
                 if(!m_FileID)
-                {
                         m_FileID=new APL_EidFile_ID(this);
-                        if (m_sodCheck)
-                                m_FileID->doSODCheck(m_sodCheck);
-                }
-        }
-
-        if (m_sodCheck)
-                m_FileID->doSODCheck(m_sodCheck);
+        }
+
+        m_FileID->doSODCheck(m_sodCheck);
 
         return m_FileID;
@@ -781 +778 @@
                 CAutoMutex autoMutex(&m_Mutex);         //We lock for only one instanciation
                 if(!m_FileAddress)
-                {
                         m_FileAddress=new APL_EidFile_Address(this);
-                        if (m_sodCheck)
-                                m_FileAddress->doSODCheck(m_sodCheck);
-                }
-        }
-
-        if (m_sodCheck)
-                m_FileAddress->doSODCheck(m_sodCheck);
+        }
+
+        m_FileAddress->doSODCheck(m_sodCheck);
 
         return m_FileAddress;
@@ -1346 +1338 @@
         if (check){
                 if (!m_FileSod){
-                        getFileSod();
-                }
-                m_FileSod->VerifyFile();
+                        m_FileSod = getFileSod();
+                        m_FileSod->doSODCheck(check);
+                }
         }
 }
@@ -2665 +2657 @@
 const CByteArray& APL_SodEid::getData()
 {
-        return m_card->getFileSod()->getData();
+        cout << "ddksadsjksdjskdjs 1" << endl;
+        const CByteArray &cb = m_card->getFileSod()->getData();
+
+        m_card->getFileSod()->getAddressHash();
+        cout << "tamanho = " << m_card->getFileSod()->getAddressHash().Size() << endl;
+        APL_Config conf_dir(CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR);
+        cout << "DIRECTORIA = "<< conf_dir.getString() << endl;
+
+
+
+        return cb;
 }
 

middleware-offline/trunk/_src/eidmw/applayer/APLCertif.cpp

@@ -102 +102 @@
 APL_Certifs::APL_Certifs(APL_SmartCard *card)
 {
+        init(card);
+
+        loadCard();
+        loadFromFile();
+}
+
+APL_Certifs::APL_Certifs()
+{
+        init(NULL);
+        loadFromFile();
+}
+
+void APL_Certifs::init(APL_SmartCard *card){
+
+        APL_Config certs_dir(CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR);
+        m_certs_dir = certs_dir.getString();
         m_cryptoFwk=AppLayer.getCryptoFwk();
 
         m_card=card;
-
-        loadCard();
-}
-
-APL_Certifs::APL_Certifs()
-{
-        m_cryptoFwk=AppLayer.getCryptoFwk();
-
-        m_card=NULL;
+        m_certExtension = "der";
 }
 
@@ -676 +684 @@
 }
 
+void APL_Certifs::loadFromFile()
+{
+        bool bStopRequest = false;
+        CPathUtil::scanDir(m_certs_dir.c_str(),"",m_certExtension.c_str(),bStopRequest,this,&APL_Certifs::foundCertificate);
+}
+
+void APL_Certifs::foundCertificate(const char *SubDir, const char *File, void *param)
+{
+        APL_Certifs *certifs = static_cast < APL_Certifs * > ( param );
+        std::string path=certifs->m_certs_dir;
+        FILE *m_stream;
+        long int bufsize;
+        int result;
+        unsigned char *buf;
+        CByteArray *cert;
+
+#ifdef WIN32
+        errno_t werr;
+#endif
+        path+=SubDir;
+#ifdef WIN32
+        path+=(strlen(SubDir)!=0?"\\":"");
+#else
+        path+=(strlen(SubDir)!=0 ? "/" : "");
+#endif
+        path+=File;
+
+#ifdef WIN32
+        if ((werr = fopen_s(&m_stream, path.c_str(), "rb")) != 0)
+                goto err;
+#else
+        if ((m_stream = fopen(path.c_str(), "rb")) == NULL)
+                goto err;
+#endif
+
+        if (fseek( m_stream, 0L, SEEK_END))
+                goto err;
+
+        bufsize = ftell(m_stream);
+        buf = (unsigned char *) malloc(bufsize*sizeof(unsigned char));
+
+        if (fseek(m_stream, 0L, SEEK_SET)){
+                free(buf);
+                goto err;
+        }
+
+        if (fread(buf, sizeof( unsigned char ), bufsize, m_stream) != bufsize)
+                goto err;
+
+        cert = new CByteArray(buf,bufsize);
+        certifs->addCert(*cert, APL_CERTIF_TYPE_UNKNOWN, false);
+
+        err:
+        MWLOG(LEV_DEBUG, MOD_APL, L"APL_Certifs::foundCertificate: problem with file %s ", path.c_str());
+}
+
 APL_Certif *APL_Certifs::findIssuer(const APL_Certif *cert)
 {
@@ -1672 +1736 @@
     if ((time_t)-1 != res) {
         struct tm ltm;
-        res -= timezone;
         localtime_r(&res, &ltm);
         // Use the ISO 8601 timestamp format

middleware-offline/trunk/_src/eidmw/applayer/APLCertif.h

@@ -307 +307 @@
 
         void loadCard();                                                                                /**< Load all the certificates from the card */
+        void loadFromFile();                                                                    /**< Load all the certificates from the certificates directory */
+        void init(APL_SmartCard *card);
 
         void resetIssuers(); /**< Reset issuer pointer in the certifactes from the store */
@@ -312 +314 @@
         void resetTests();      /**< Reset test flag in the certifactes from the store */
 
+        /**
+         * This is a callback function for the scanDir
+         *
+         * @param SubDir is the sub directory relative the the Dir of scanDir
+         * @param File is the file to threat
+         * @param param must be this pointer
+         */
+        static void foundCertificate(const char *SubDir, const char *File, void *param);
+
         APL_SmartCard *m_card;                                                                  /**< The smart card from which some certificate comes */
         APL_CryptoFwk *m_cryptoFwk;                                                             /**< Pointer to the crypto framework */
@@ -323 +334 @@
         std::map<unsigned long,APL_Certif *> m_certifs;
         std::vector<unsigned long> m_certifsOrder;
+        std::string m_certExtension;
+        std::string m_certs_dir;
 
 friend APL_Certifs *APL_SmartCard::getCertificates();   /**< This method must access protected constructor */

middleware-offline/trunk/_src/eidmw/applayer/CardFile.cpp

@@ -53 +53 @@
         m_cryptoFwk=AppLayer.getCryptoFwk();
         m_mappedFields = false;
+        m_isVerified = false;
         m_card=card;
 

middleware-offline/trunk/_src/eidmw/applayer/CardFile.h

@@ -123 +123 @@
         CMutex m_Mutex;                                 /**< Mutex */
         bool m_mappedFields;                    /**< are the fields mapped already? */
-
+        bool m_isVerified;                              /**< verify file only once */
         bool m_SODCheck;
 

middleware-offline/trunk/_src/eidmw/applayer/CardPteid.cpp

@@ -33 +33 @@
 #include "PhotoPteid.h"
 #include "APLPublicKey.h"
+#include "SODParser.h"
 
 #include "Log.h"
@@ -185 +186 @@
 APL_EidFile_ID::APL_EidFile_ID(APL_EIDCard *card):APL_CardFile(card,PTEID_FILE_ID,NULL)
 {
-        photo = NULL;
+        m_photo = NULL;
 }
 
@@ -192 +193 @@
 }
 
+
+void APL_EidFile_ID::PackIdData(CByteArray &cb){
+        cb.Append((unsigned char*)m_IssuingEntity.c_str(),m_IssuingEntity.length());
+        cb.Append((unsigned char*)m_Country.c_str(),m_Country.length());
+        cb.Append((unsigned char*)m_DocumentType.c_str(),m_DocumentType.length());
+        cb.Append((unsigned char*)m_DocumentNumber.c_str(),m_DocumentNumber.length());
+        cb.Append((unsigned char*)m_ChipNumber.c_str(),m_ChipNumber.length());
+        cb.Append((unsigned char*)m_DocumentVersion.c_str(),m_DocumentVersion.length());
+        cb.Append((unsigned char*)m_ValidityBeginDate.c_str(),m_ValidityBeginDate.length());
+        cb.Append((unsigned char*)m_LocalofRequest.c_str(),m_LocalofRequest.length());
+        cb.Append((unsigned char*)m_ValidityEndDate.c_str(),m_ValidityEndDate.length());
+        cb.Append((unsigned char*)m_Surname.c_str(),m_Surname.length());
+        cb.Append((unsigned char*)m_GivenName.c_str(),m_GivenName.length());
+        cb.Append((unsigned char*)m_Gender.c_str(),m_Gender.length());
+        cb.Append((unsigned char*)m_Nationality.c_str(),m_Nationality.length());
+        cb.Append((unsigned char*)m_DateOfBirth.c_str(),m_DateOfBirth.length());
+        cb.Append((unsigned char*)m_Height.c_str(),m_Height.length());
+        cb.Append((unsigned char*)m_CivilianIdNumber.c_str(),m_CivilianIdNumber.length());
+        cb.Append((unsigned char*)m_SurnameMother.c_str(),m_SurnameMother.length());
+        cb.Append((unsigned char*)m_GivenNameMother.c_str(),m_GivenNameMother.length());
+        cb.Append((unsigned char*)m_SurnameFather.c_str(),m_SurnameFather.length());
+        cb.Append((unsigned char*)m_GivenNameFather.c_str(),m_GivenNameFather.length());
+        cb.Append((unsigned char*)m_AccidentalIndications.c_str(),m_AccidentalIndications.length());
+        cb.Append((unsigned char*)m_TaxNo.c_str(),m_TaxNo.length());
+        cb.Append((unsigned char*)m_SocialSecurityNo.c_str(),m_SocialSecurityNo.length());
+        cb.Append((unsigned char*)m_HealthNo.c_str(),m_HealthNo.length());
+}
+
+void APL_EidFile_ID::PackPublicKeyData(CByteArray &cb){
+        cb.Append(*cardKey->getModulus());
+        cb.Append(*cardKey->getExponent());
+}
+
+
+void APL_EidFile_ID::PackPictureData(CByteArray &cb){
+        cb.Append(*m_photo->getCbeff());
+        cb.Append(*m_photo->getFacialrechdr());
+        cb.Append(*m_photo->getFacialinfo());
+        cb.Append(*m_photo->getImageinfo());
+        cb.Append(*m_photo->getPhotoRaw());
+}
+
+
 tCardFileStatus APL_EidFile_ID::VerifyFile()
 {
         if(!m_card)
-                return CARDFILESTATUS_ERROR;
+                        return CARDFILESTATUS_ERROR;
+
+        if (m_isVerified)
+                return CARDFILESTATUS_OK;
 
         APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
-        tCardFileStatus filestatus;
-
-        //Remove since it's rrn related
-        /*if(!CertRrn)
-                return CARDFILESTATUS_ERROR_RRN;
-
-        //If the status of the RRN file is not OK, 
-        //The rrn status is return
-        filestatus=CertRrn->getFileStatus();
-        if(filestatus!=CARDFILESTATUS_OK)
-                return filestatus;
-
-        //Get the status of the certificate RRN
-        APL_CertifStatus rrnstatus=CertRrn->getStatus();
-        if((rrnstatus==APL_CERTIF_STATUS_TEST || rrnstatus==APL_CERTIF_STATUS_ISSUER) && !pcard->getAllowTestCard())
-                return CARDFILESTATUS_ERROR_TEST; 
-
-        if(rrnstatus==APL_CERTIF_STATUS_DATE && !pcard->getAllowBadDate())
-                return CARDFILESTATUS_ERROR_DATE; 
-
-        //We test the oid of the RRN 
-        //except for test card because, test card may have a bad oid
-        if(!pcard->isTestCard())
-                if(!m_cryptoFwk->VerifyOidRrn(CertRrn->getData()))
-                        return CARDFILESTATUS_ERROR_RRN;
-
-        APL_EidFile_IDSign *sign=pcard->getFileIDSign();
-
-        //If the status of the IDSign file is not OK, 
-        //The IDSign status is return
-        filestatus=sign->getStatus(true);
-        if(filestatus!=CARDFILESTATUS_OK)
-                return filestatus;*/
-
-        //if(!m_cryptoFwk->VerifySignatureSha1(m_data,sign->getData(),CertRrn->getData()))
-        //      return CARDFILESTATUS_ERROR_SIGNATURE;
-
-        //If this is not a test card, the rrn status must be OK, unless we return an error
-        //For a test card, the status could be something else (for ex ISSUER)
-        /*L_CERTIF_STATUS_VALID
-                        && rrnstatus!=APL_CERTIF_STATUS_VALID_CRL
-                        && rrnstatus!=APL_CERTIF_STATUS_VALID_OCSP)
-                        return CARDFILESTATUS_ERROR_CERT; 
-        }*/
+
+        MapFieldsInternal();
+
+        if (m_SODCheck){
+                CByteArray pkData;
+                CByteArray idData;
+                CByteArray picData;
+                PackPublicKeyData(pkData);
+                PackIdData(idData);
+                PackPictureData(picData);
+
+                if (!m_cryptoFwk->VerifyHashSha256(pkData,pcard->getFileSod()->getCardPublicKeyHash()))
+                        throw CMWEXCEPTION(EIDMW_SOD_ERR_HASH_NO_MATCH_PUBLIC_KEY);
+
+                if (!m_cryptoFwk->VerifyHashSha256(idData,pcard->getFileSod()->getIdHash()))
+                        throw CMWEXCEPTION(EIDMW_SOD_ERR_HASH_NO_MATCH_ID);
+
+                if (!m_cryptoFwk->VerifyHashSha256(picData,pcard->getFileSod()->getPictureHash()))
+                        throw CMWEXCEPTION(EIDMW_SOD_ERR_HASH_NO_MATCH_PICTURE);
+        }
+        m_isVerified = true;
 
         return CARDFILESTATUS_OK;
@@ -275 +299 @@
         m_GivenNameMother.clear();
         m_SurnameMother.clear();
-        if (photo){
-                delete photo;
-                photo = NULL;
+        if (m_photo){
+                delete m_photo;
+                m_photo = NULL;
         }
         m_PhotoHash.ClearContents();
@@ -285 +309 @@
         }
         m_mappedFields = false;
-}
-
-bool APL_EidFile_ID::MapFields()
-{
+        m_isVerified = false;
+        m_SODCheck = false;
+}
+
+void APL_EidFile_ID::MapFieldsInternal(){
+        CByteArray pteidngidBuffer;
+
         // we dont want to read the fields every time
         if (m_mappedFields)
-                return true;
-
-        CByteArray pteidngidBuffer;
-        char cBuffer[15500];
-        unsigned char ucBuffer[15500];
-        unsigned long ulLen=0;
-        CTLVBuffer oTLVBuffer;
-    oTLVBuffer.ParseTLV(m_data.GetBytes(), m_data.Size());
+                return;
 
         //IDVersion - Card Version
-    pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DocumentVersion, PTEIDNG_FIELD_ID_LEN_DocumentVersion);
-    pteidngidBuffer.TrimRight(' ');
-    m_DocumentVersion.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
+        pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DocumentVersion, PTEIDNG_FIELD_ID_LEN_DocumentVersion);
+        pteidngidBuffer.TrimRight('\0');
+        m_DocumentVersion.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //ChipNr
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DocumentNumberPAN, PTEIDNG_FIELD_ID_LEN_DocumentNumberPAN);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_ChipNumber.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
         m_SerialNumber = m_ChipNumber;
@@ -313 +333 @@
         //Country
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Country,PTEIDNG_FIELD_ID_LEN_Country);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_Country.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //ValidityBeginDate
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_ValidityBeginDate,PTEIDNG_FIELD_ID_LEN_ValidityBeginDate);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_ValidityBeginDate.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //ValidityEndDate
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_ValidityEndDate,PTEIDNG_FIELD_ID_LEN_ValidityEndDate);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_ValidityEndDate.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //IssuingMunicipality
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_LocalofRequest, PTEIDNG_FIELD_ID_LEN_LocalofRequest);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_LocalofRequest.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //Civilian Identification Number (NIC)
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_CivilianIdNumber, PTEIDNG_FIELD_ID_LEN_CivilianIdNumber);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_CivilianIdNumber.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //Surname
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Surname, PTEIDNG_FIELD_ID_LEN_Surname);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_Surname.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //FirstName_1
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Name, PTEIDNG_FIELD_ID_LEN_Name);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_GivenName.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
-        /*std::string in_utf8;
-        in_utf8 = IBM850_toUtf8(m_FirstName1);
-        m_FirstName1 = in_utf8;*/
 
         //Nationality
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Nacionality, PTEIDNG_FIELD_ID_LEN_Nacionality);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_Nationality.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
-
-        //LocationOfBirth
-    ulLen = sizeof(cBuffer);
-        memset(cBuffer,0,ulLen);
-        oTLVBuffer.FillUTF8Data(PTEID_FIELD_TAG_ID_LocationOfBirth, cBuffer, &ulLen);
-        m_LocationOfBirth.assign(cBuffer, 0, ulLen);
 
         //DateOfBirth
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DateOfBirth, PTEIDNG_FIELD_ID_LEN_DateOfBirth);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_DateOfBirth.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //Gender
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Gender, PTEIDNG_FIELD_ID_LEN_Gender);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_Gender.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //DocumentType
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DocumentType, PTEIDNG_FIELD_ID_LEN_DocumentType);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_DocumentType.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
-
-        //SpecialStatus
-    ulLen = sizeof(cBuffer);
-        memset(cBuffer,0,ulLen);
-        oTLVBuffer.FillASCIIData(PTEID_FIELD_TAG_ID_SpecialStatus, cBuffer, &ulLen);
-        m_SpecialStatus.assign(cBuffer, 0, ulLen);
-
-        //PhotoHash
-    ulLen = sizeof(cBuffer);
-        memset(ucBuffer,0,ulLen);
-        oTLVBuffer.FillBinaryData(PTEID_FIELD_TAG_ID_PhotoHash, ucBuffer, &ulLen);
-        m_PhotoHash.ClearContents();
-        m_PhotoHash.Append(ucBuffer,ulLen);
-
-        //Duplicata
-    ulLen = sizeof(cBuffer);
-        memset(cBuffer,0,ulLen);
-        oTLVBuffer.FillASCIIData(PTEID_FIELD_TAG_ID_Duplicata, cBuffer, &ulLen);
-        m_Duplicata.assign(cBuffer, 0, ulLen);
-
-        //SpecialOrganization
-    ulLen = sizeof(cBuffer);
-        memset(cBuffer,0,ulLen);
-        oTLVBuffer.FillASCIIData(PTEID_FIELD_TAG_ID_SpecialOrganization, cBuffer, &ulLen);
-        m_SpecialOrganization.assign(cBuffer, 0, ulLen);
 
         //Height
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Height, PTEIDNG_FIELD_ID_LEN_Height);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_Height.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //DocumentNumber
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_DocumentNumber, PTEIDNG_FIELD_ID_LEN_DocumentNumber);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_DocumentNumber.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //TaxNo
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_TaxNo, PTEIDNG_FIELD_ID_LEN_TaxNo);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_TaxNo.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //SocialSecurityNo
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_SocialSecurityNo, PTEIDNG_FIELD_ID_LEN_SocialSecurityNo);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_SocialSecurityNo.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //HealthNo
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_HealthNo, PTEIDNG_FIELD_ID_LEN_HealthNo);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_HealthNo.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //IssuingEntity
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_IssuingEntity, PTEIDNG_FIELD_ID_LEN_IssuingEntity);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_IssuingEntity.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
@@ -464 +450 @@
                 facialinfo = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_FACIALINFO, PTEIDNG_FIELD_ID_LEN_FACIALINFO);
                 imageinfo = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_IMAGEINFO, PTEIDNG_FIELD_ID_LEN_IMAGEINFO);
-                photo = new PhotoPteid(photoRAW, cbeff, facialrechdr, facialinfo, imageinfo);
+                m_photo = new PhotoPteid(photoRAW, cbeff, facialrechdr, facialinfo, imageinfo);
         }
 
@@ -476 +462 @@
         //MRZ1
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Mrz1, PTEIDNG_FIELD_ID_LEN_Mrz1);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_MRZ1.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //MRZ2
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Mrz2, PTEIDNG_FIELD_ID_LEN_Mrz2);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_MRZ2.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //MRZ3
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_Mrz3, PTEIDNG_FIELD_ID_LEN_Mrz3);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_MRZ3.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
         //AccidentalIndications
         pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_AccidentalIndications, PTEIDNG_FIELD_ID_LEN_AccidentalIndications);
-        pteidngidBuffer.TrimRight(' ');
+        pteidngidBuffer.TrimRight('\0');
         m_AccidentalIndications.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
 
-        /* ID File Caching
-         * try
-        {
-                ofstream myfile;
-                APL_Config conf_dir(CConfig::EIDMW_CONFIG_PARAM_GENERAL_PTEID_CACHEDIR);
-                std::string     m_cachedirpath = conf_dir.getString();
-                std::string pteidfile = m_cachedirpath;
-                pteidfile.append("/pteidng-");
-                pteidfile.append(m_SerialNumber);
-                pteidfile.append("-");
-                pteidfile.append(PTEID_FILE_ID);
-                pteidfile.append(".bin");
-                myfile.open (pteidfile.c_str(), ios::binary);
-                pteidngidBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_FILE, PTEIDNG_FIELD_ID_LEN_FILE);
-                m_IDFile.assign((char*)(pteidngidBuffer.GetBytes()), pteidngidBuffer.Size());
-                myfile << m_IDFile;
-                myfile.close();
-        }
-        catch(CMWException& e)
-        {
-                MWLOG(LEV_INFO, MOD_APL, L"Write cache file %ls on disk failed", PTEID_FILE_ID);
-        }*/
-
-        //MemberOfFamily - See if this segfaults in every platform
-        //m_MemberOfFamily = m_GivenNameMother + " " + m_SurnameMother + " * " + m_GivenNameFather + " " + m_SurnameFather;
-
         m_mappedFields = true;
-
+}
+
+bool APL_EidFile_ID::MapFields()
+{
+        // do nothing verify will load the data and then verify if sod check is active
         return true;
 }
@@ -786 +750 @@
 
         if(ShowData())
-                return photo;
+                return m_photo;
 
         return NULL;
@@ -848 +812 @@
 void  APL_EidFile_ID::doSODCheck(bool check){
         m_SODCheck = check;
+        if (check){
+                m_isVerified = false;
+                m_mappedFields = false;
+        }
 }
 
@@ -884 +852 @@
 }
 
+
+void APL_EidFile_Address::PackAddressData(CByteArray &cb, bool isNational){
+
+        if (isNational){
+                cb.Append((unsigned char*)m_CountryCode.c_str(),m_CountryCode.length());
+                cb.Append((unsigned char*)m_DistrictCode.c_str(),m_DistrictCode.length());
+                cb.Append((unsigned char*)m_DistrictDescription.c_str(),m_DistrictDescription.length());
+                cb.Append((unsigned char*)m_MunicipalityCode.c_str(),m_MunicipalityCode.length());
+                cb.Append((unsigned char*)m_MunicipalityDescription.c_str(),m_MunicipalityDescription.length());
+                cb.Append((unsigned char*)m_CivilParishCode.c_str(),m_CivilParishCode.length());
+                cb.Append((unsigned char*)m_CivilParishDescription.c_str(),m_CivilParishDescription.length());
+                cb.Append((unsigned char*)m_AbbrStreetType.c_str(),m_AbbrStreetType.length());
+                cb.Append((unsigned char*)m_StreetType.c_str(),m_StreetType.length());
+                cb.Append((unsigned char*)m_StreetName.c_str(),m_StreetName.length());
+                cb.Append((unsigned char*)m_AbbrBuildingType.c_str(),m_AbbrBuildingType.length());
+                cb.Append((unsigned char*)m_BuildingType.c_str(),m_BuildingType.length());
+                cb.Append((unsigned char*)m_DoorNo.c_str(),m_DoorNo.length());
+                cb.Append((unsigned char*)m_Floor.c_str(),m_Floor.length());
+                cb.Append((unsigned char*)m_Side.c_str(),m_Side.length());
+                cb.Append((unsigned char*)m_Place.c_str(),m_Place.length());
+                cb.Append((unsigned char*)m_Locality.c_str(),m_Locality.length());
+                cb.Append((unsigned char*)m_Zip4.c_str(),m_Zip4.length());
+                cb.Append((unsigned char*)m_Zip3.c_str(),m_Zip3.length());
+                cb.Append((unsigned char*)m_PostalLocality.c_str(),m_PostalLocality.length());
+                cb.Append((unsigned char*)m_Generated_Address_Code.c_str(),m_Generated_Address_Code.length());
+        } else {
+                cb.Append((unsigned char*)m_Foreign_Country.c_str(),m_Foreign_Country.length());
+                cb.Append((unsigned char*)m_Foreign_Generic_Address.c_str(),m_Foreign_Generic_Address.length());
+                cb.Append((unsigned char*)m_Foreign_City.c_str(),m_Foreign_City.length());
+                cb.Append((unsigned char*)m_Foreign_Region.c_str(),m_Foreign_Region.length());
+                cb.Append((unsigned char*)m_Foreign_Locality.c_str(),m_Foreign_Locality.length());
+                cb.Append((unsigned char*)m_Foreign_Postal_Code.c_str(),m_Foreign_Postal_Code.length());
+                cb.Append((unsigned char*)m_Generated_Address_Code.c_str(),m_Generated_Address_Code.length());
+        }
+}
+
+
+void APL_EidFile_Address::MapFieldsInternal(){
+
+        if (m_mappedFields) // MARTINHO: have we mapped the fields yet?
+                return;
+
+        CByteArray pteidngAddressBuffer;
+
+        // Address Type
+        pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_TYPE);
+        pteidngAddressBuffer.TrimRight('\0');
+        m_AddressType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
+
+        // Country code
+        pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_COUNTRY, PTEIDNG_FIELD_ADDRESS_LEN_COUNTRY);
+        pteidngAddressBuffer.TrimRight('\0');
+        m_CountryCode.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
+
+        if (m_AddressType == m_FOREIGN)
+                ForeignerAddressFields();
+        else
+                AddressFields();
+
+        // MARTINHO: so we've mapped the fields no need to map them again
+        m_mappedFields = true;
+}
+
 tCardFileStatus APL_EidFile_Address::VerifyFile()
 {
         if(!m_card)
                 return CARDFILESTATUS_ERROR;
-        
-        APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
-        tCardFileStatus filestatus;
-
-        //APL_Certif *CertRrn=pcard->getRrn();
-
-        /*if(!CertRrn)
-                return CARDFILESTATUS_ERROR_RRN;
-
-        //If the status of the RRN file is not OK, 
-        //The rrn status is return
-        filestatus=CertRrn->getFileStatus();
-        if(filestatus!=CARDFILESTATUS_OK)
-                return filestatus;
-
-        //Get the status of the certificate RRN
-        APL_CertifStatus rrnstatus=CertRrn->getStatus();
-        if((rrnstatus==APL_CERTIF_STATUS_TEST || rrnstatus==APL_CERTIF_STATUS_ISSUER) && !pcard->getAllowTestCard())
-                return CARDFILESTATUS_ERROR_TEST; 
-
-        if(rrnstatus==APL_CERTIF_STATUS_DATE && !pcard->getAllowBadDate())
-                return CARDFILESTATUS_ERROR_DATE; 
-
-        //We test the oid of the RRN 
-        //except for test card because, test card may have a bad oid
-        if(!pcard->isTestCard())
-                if(!m_cryptoFwk->VerifyOidRrn(CertRrn->getData()))
-                        return CARDFILESTATUS_ERROR_RRN;
-
-        APL_EidFile_AddressSign *sign=pcard->getFileAddressSign();
-
-        //If the status of the IDSign file is not OK, 
-        //The IDSign status is return
-        filestatus=sign->getStatus(true);
-        if(filestatus!=CARDFILESTATUS_OK)
-                return filestatus;
-
-        APL_EidFile_IDSign *idsign=pcard->getFileIDSign();
-
-        CByteArray dataToSign;                                  //To check the signature,
-        dataToSign.Append(m_data);                              //we need to remove the null byte
-        dataToSign.TrimRight();                                 //at the end of the address file
-        dataToSign.Append(idsign->getData());   //then, we add the signature of the id file
-
-        if(!m_cryptoFwk->VerifySignatureSha1(dataToSign,sign->getData(),CertRrn->getData()))
-                return CARDFILESTATUS_ERROR_SIGNATURE;
-
-        //If this is not a test card, the rrn status must be OK, unless we return an error
-        //For a test card, the status could be something else (for ex ISSUER)
-        if(!pcard->isTestCard())
-        {
-                if(rrnstatus!=APL_CERTIF_STATUS_VALID 
-                        && rrnstatus!=APL_CERTIF_STATUS_VALID_CRL
-                        && rrnstatus!=APL_CERTIF_STATUS_VALID_OCSP)
-                        return CARDFILESTATUS_ERROR_CERT; 
-        }*/
+
+        if (m_isVerified)
+                        return CARDFILESTATUS_OK;
+
+                APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
+
+                MapFieldsInternal();
+
+                if (m_SODCheck){
+                        CByteArray addrData;
+                        PackAddressData(addrData, isNationalAddress());
+
+                        if (!m_cryptoFwk->VerifyHashSha256(addrData,pcard->getFileSod()->getAddressHash()))
+                                throw CMWEXCEPTION(EIDMW_SOD_ERR_HASH_NO_MATCH_ADDRESS);
+                }
+                m_isVerified = true;
 
         return CARDFILESTATUS_OK;
@@ -1010 +1001 @@
 
         m_mappedFields = false;
+        m_isVerified = false;
+        m_SODCheck = false;
 }
 
@@ -1015 +1008 @@
 {
                 CByteArray pteidngAddressBuffer;
-                char cBuffer[1200];
-                unsigned long ulLen=0;
-
-                CTLVBuffer oTLVBuffer;
-            oTLVBuffer.ParseTLV(m_data.GetBytes(), m_data.Size());
 
                 //District Code
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_DISTRICT, PTEIDNG_FIELD_ADDRESS_LEN_DISTRICT);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_DistrictCode.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //District Description
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_DISTRICT_DESCRIPTION, PTEIDNG_FIELD_ADDRESS_LEN_DISTRICT_DESCRIPTION);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_DistrictDescription.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Municipality Code
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_MUNICIPALITY, PTEIDNG_FIELD_ADDRESS_LEN_MUNICIPALITY);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_MunicipalityCode.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Municipality Description
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_MUNICIPALITY_DESCRIPTION, PTEIDNG_FIELD_ADDRESS_LEN_MUNICIPALITY_DESCRIPTION);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_MunicipalityDescription.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //CivilParish Code
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_CIVILPARISH, PTEIDNG_FIELD_ADDRESS_LEN_CIVILPARISH);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_CivilParishCode.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //CivilParish Description
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_CIVILPARISH_DESCRIPTION, PTEIDNG_FIELD_ADDRESS_LEN_CIVILPARISH_DESCRIPTION);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_CivilParishDescription.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Abbreviated Street Type
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_ABBR_STREET_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_ABBR_STREET_TYPE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_AbbrStreetType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Street Type
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_STREET_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_STREET_TYPE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_StreetType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Street Name
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_STREETNAME, PTEIDNG_FIELD_ADDRESS_LEN_STREETNAME);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_StreetName.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Abbreviated Building Type
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_ABBR_BUILDING_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_ABBR_BUILDING_TYPE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_AbbrBuildingType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Building Type
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_BUILDING_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_BUILDING_TYPE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_BuildingType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //DoorNo
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_DOORNO, PTEIDNG_FIELD_ADDRESS_LEN_DOORNO);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_DoorNo.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Floor
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_FLOOR, PTEIDNG_FIELD_ADDRESS_LEN_FLOOR);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Floor.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Side
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_SIDE, PTEIDNG_FIELD_ADDRESS_LEN_SIDE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Side.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Place
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_PLACE, PTEIDNG_FIELD_ADDRESS_LEN_PLACE);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Place.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Locality
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_LOCALITY, PTEIDNG_FIELD_ADDRESS_LEN_LOCALITY);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Locality.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Zip4
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_ZIP4, PTEIDNG_FIELD_ADDRESS_LEN_ZIP4);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Zip4.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Zip3
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_ZIP3, PTEIDNG_FIELD_ADDRESS_LEN_ZIP3);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_Zip3.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
             //Postal Locality
             pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_POSTALLOCALITY, PTEIDNG_FIELD_ADDRESS_LEN_POSTALLOCALITY);
-            pteidngAddressBuffer.TrimRight(' ');
+            pteidngAddressBuffer.TrimRight('\0');
             m_PostalLocality.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
@@ -1121 +1109 @@
             m_Generated_Address_Code.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
-            /* lmedinas: Address File caching */
-            /*ofstream myfile;
-            APL_Config conf_dir(CConfig::EIDMW_CONFIG_PARAM_GENERAL_PTEID_CACHEDIR);
-            std::string m_cachedirpath = conf_dir.getString();
-            std::string pteidfile = m_cachedirpath;
-            pteidfile.append("/pteidng-");
-            pteidfile.append(m_SerialNumber);
-            pteidfile.append("-");
-            pteidfile.append(PTEID_FILE_ADDRESS);
-            pteidfile.append(".bin");
-            myfile.open (pteidfile.c_str());
-            pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_FILE, PTEIDNG_FIELD_ID_LEN_FILE);
-            m_AddressFile.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
-            myfile << m_AddressFile;
-            myfile.close();*/
 }
 
@@ -1141 +1114 @@
 {
         CByteArray pteidngAddressBuffer;
-        char cBuffer[1200];
-        unsigned long ulLen=0;
-
-        CTLVBuffer oTLVBuffer;
-    oTLVBuffer.ParseTLV(m_data.GetBytes(), m_data.Size());
 
         //Foreign Country
         pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_COUNTRY_DESCRIPTION, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_COUNTRY_DESCRIPTION);
-        pteidngAddressBuffer.TrimRight(' ');
+        pteidngAddressBuffer.TrimRight('\0');
         m_Foreign_Country.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
         //Foreign Generic Address
         pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_ADDRESS, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_ADDRESS);
-        pteidngAddressBuffer.TrimRight(' ');
+        pteidngAddressBuffer.TrimRight('\0');
         m_Foreign_Generic_Address.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
         //Foreign City
         pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_CITY, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_CITY);
-        pteidngAddressBuffer.TrimRight(' ');
+        pteidngAddressBuffer.TrimRight('\0');
         m_Foreign_City.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
     //Foreign Region
     pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_REGION, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_REGION);
-    pteidngAddressBuffer.TrimRight(' ');
+    pteidngAddressBuffer.TrimRight('\0');
     m_Foreign_Region.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
     //Foreign Locality
     pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_LOCALITY, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_LOCALITY);
-    pteidngAddressBuffer.TrimRight(' ');
+    pteidngAddressBuffer.TrimRight('\0');
     m_Foreign_Locality.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
     //Foreign Postal Code
     pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_POSTAL_CODE, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_POSTAL_CODE);
-    pteidngAddressBuffer.TrimRight(' ');
+    pteidngAddressBuffer.TrimRight('\0');
     m_Foreign_Postal_Code.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
     //Foreign Generated Address Code
     pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_FOREIGN_ADDRESS_POS_GENADDRESS_NUM, PTEIDNG_FIELD_FOREIGN_ADDRESS_LEN_GENADDRESS_NUM);
-    pteidngAddressBuffer.TrimRight(' ');
+    pteidngAddressBuffer.TrimRight('\0');
     m_Generated_Address_Code.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
 
-    /* martinho - do not cache the address file
-    ofstream myfile;
-    APL_Config conf_dir(CConfig::EIDMW_CONFIG_PARAM_GENERAL_PTEID_CACHEDIR);
-    std::string m_cachedirpath = conf_dir.getString();
-    std::string pteidfile = m_cachedirpath;
-    pteidfile.append("/pteidng-");
-    pteidfile.append(m_SerialNumber);
-    pteidfile.append("-");
-    pteidfile.append(PTEID_FILE_ADDRESS);
-    pteidfile.append(".bin");
-    myfile.open (pteidfile.c_str());
-    pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ID_POS_FILE, PTEIDNG_FIELD_ID_LEN_FILE);
-    m_AddressFile.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
-    myfile << m_AddressFile;
-    myfile.close();
-        */
 }
 
 bool APL_EidFile_Address::MapFields()
 {
-        // MARTINHO: have we mapped the fields yet?
-        if (m_mappedFields)
-                return true;
-
-        CByteArray pteidngAddressBuffer;
-        char cBuffer[1200];
-        unsigned long ulLen=0;
-
-        CTLVBuffer oTLVBuffer;
-        oTLVBuffer.ParseTLV(m_data.GetBytes(), m_data.Size());
-
-        // Address Type
-        pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_TYPE, PTEIDNG_FIELD_ADDRESS_LEN_TYPE);
-        pteidngAddressBuffer.TrimRight(' ');
-        m_AddressType.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
-
-        // Country code
-        pteidngAddressBuffer = m_data.GetBytes(PTEIDNG_FIELD_ADDRESS_POS_COUNTRY, PTEIDNG_FIELD_ADDRESS_LEN_COUNTRY);
-        pteidngAddressBuffer.TrimRight('\0');
-        m_CountryCode.assign((char*)(pteidngAddressBuffer.GetBytes()), pteidngAddressBuffer.Size());
-
-        if (m_AddressType == m_FOREIGN)
-                ForeignerAddressFields();
-        else
-                AddressFields();
-
-        // MARTINHO: so we've mapped the fields no need to map them again
-        m_mappedFields = true;
-
+        // do nothing verify will load the data and then verify if sod check is active
         return true;
 }
@@ -1404 +1328 @@
 
 bool APL_EidFile_Address::isNationalAddress(){
-        return (m_AddressType.compare(m_NATIONAL));
+        return (m_AddressType.compare(m_NATIONAL)==0);
 }
 
@@ -1485 +1409 @@
 APL_EidFile_Sod::APL_EidFile_Sod(APL_EIDCard *card):APL_CardFile(card,PTEID_FILE_SOD,NULL)
 {
+
 }
 
@@ -1493 +1418 @@
 tCardFileStatus APL_EidFile_Sod::VerifyFile()
 {
-        // verify SOD file, signature, certificates
-
-        return CARDFILESTATUS_OK;
+        tCardFileStatus filestatus = CARDFILESTATUS_ERROR_SIGNATURE;
+
+        cout << "APL_EidFile_Sod::VerifyFile() - I" << endl;
+        if (m_isVerified) // no need to check again
+                return CARDFILESTATUS_OK;
+
+        if (!m_SODCheck) // check is not activated
+                return CARDFILESTATUS_OK;
+
+        APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
+
+        PKCS7 *p7 = NULL;
+
+        ERR_load_PKCS7_strings();
+        ERR_load_X509_strings();
+        OpenSSL_add_all_digests();
+
+        const unsigned char *temp = m_data.GetBytes();
+        long int len = m_data.Size();
+        temp+=4; //martinho: jump the response message template format 2" (DER type 77)
+
+        p7 = d2i_PKCS7(NULL, (const unsigned char **)&temp, len);
+
+        STACK_OF(X509) *pSigners = PKCS7_get0_signers(p7, NULL, 0);
+
+        X509_STORE *store = X509_STORE_new();
+
+        // martinho: load all certificates, let openssl do the job and find the needed ones...
+        for (int i = 0; i<pcard->getCertificates()->countAll(true);i++){
+                X509 *pX509 = NULL;
+                const unsigned char *p = pcard->getCertificates()->getCert(i,false)->getData().GetBytes();
+                pX509 = d2i_X509(&pX509, &p, pcard->getCertificates()->getCert(i,false)->getData().Size());
+                X509_STORE_add_cert(store, pX509);
+        }
+        BIO *Out = BIO_new(BIO_s_mem());
+
+        if (PKCS7_verify(p7,pSigners,store,NULL,Out,0)==1){
+                unsigned char *p;
+                long size;
+                size = BIO_get_mem_data(Out, &p);
+                m_encapsulatedContent.Append(p,size);
+
+                m_isVerified = true;
+                filestatus = CARDFILESTATUS_OK;
+        }
+
+        X509_STORE_free(store);
+        sk_X509_free(pSigners);
+        BIO_free_all(Out);
+        PKCS7_free(p7);
+
+        cout << "APL_EidFile_Sod::VerifyFile() - F" << endl;
+        return filestatus;
 }
 
 bool APL_EidFile_Sod::ShowData()
 {
-        APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
-
-        bool bAllowTest=pcard->getAllowTestCard();
-        bool bAllowBadDate=pcard->getAllowBadDate();
-
-        tCardFileStatus status=getStatus(true,&bAllowTest,&bAllowBadDate);
-        if(status==CARDFILESTATUS_OK)
-                return true;
-
-        //If the autorisation changed, we read the card again
-        if((status==CARDFILESTATUS_ERROR_TEST && pcard->getAllowTestCard())
-                || (status==CARDFILESTATUS_ERROR_DATE && pcard->getAllowBadDate()))
-
-                status=LoadData(true);
-
-        if(status==CARDFILESTATUS_OK)
-                return true;
-
-        return false;
+        APL_EIDCard *pcard=dynamic_cast<APL_EIDCard *>(m_card);
+
+        bool bAllowTest=pcard->getAllowTestCard();
+        bool bAllowBadDate=pcard->getAllowBadDate();
+
+        tCardFileStatus status=getStatus(true,&bAllowTest,&bAllowBadDate);
+        if(status==CARDFILESTATUS_OK)
+                return true;
+
+        //If the autorisation changed, we read the card again
+        if((status==CARDFILESTATUS_ERROR_TEST && pcard->getAllowTestCard())
+                        || (status==CARDFILESTATUS_ERROR_DATE && pcard->getAllowBadDate()))
+
+                status=LoadData(false);
+
+        if(status==CARDFILESTATUS_OK)
+                return true;
+
+        return false;
 }
 
 void APL_EidFile_Sod::EmptyFields()
 {
-        m_Sod.clear();
         m_mappedFields = false;
+        m_isVerified = false;
+        m_picHash.ClearContents();
+        m_pkHash.ClearContents();
+        m_idHash.ClearContents();
+        m_addressHash.ClearContents();
+        m_encapsulatedContent.ClearContents();
+}
+
+void APL_EidFile_Sod::doSODCheck(bool check){
+        m_SODCheck = check;
+        if (check) {
+                m_isVerified = false;
+                m_mappedFields = false;
+        }
 }
 
 bool APL_EidFile_Sod::MapFields()
 {
-        if (m_mappedFields)
+        if (m_mappedFields) // map only one time
                 return true;
 
-        CByteArray pteidngSodBuffer;
-    char cBuffer[1200];
-    unsigned long ulLen=0;
-
-    CTLVBuffer oTLVBuffer;
-    oTLVBuffer.ParseTLV(m_data.GetBytes(), m_data.Size());
-
-    //PersoData
-    pteidngSodBuffer = m_data.GetBytes(0, 50);
-    pteidngSodBuffer.TrimRight(' ');
-    m_Sod.assign((char*)(pteidngSodBuffer.GetBytes()), pteidngSodBuffer.Size());
-
-    m_mappedFields = true;
-
-    return true;
-}
+        if (!m_SODCheck) // map only if sod check is active
+                return true;
+
+        SODParser parser;
+
+        parser.ParseSodEncapsulatedContent(m_encapsulatedContent);
+
+        SODAttributes &attr = parser.getHashes();
+
+        m_idHash.Append(attr.hashes[0]);
+        m_addressHash.Append(attr.hashes[1]);
+        m_picHash.Append(attr.hashes[2]);
+        m_pkHash.Append(attr.hashes[3]);
+
+        m_mappedFields = true;
+
+        return true;
+}
+
+const CByteArray& APL_EidFile_Sod::getAddressHash(){
+        if(ShowData())
+                return m_addressHash;
+        return EmptyByteArray;
+}
+
+const CByteArray& APL_EidFile_Sod::getPictureHash(){
+        if(ShowData())
+                return m_picHash;
+        return EmptyByteArray;
+}
+
+const CByteArray& APL_EidFile_Sod::getCardPublicKeyHash(){
+        if(ShowData())
+                return m_pkHash;
+        return EmptyByteArray;
+}
+
+const CByteArray& APL_EidFile_Sod::getIdHash(){
+        if(ShowData())
+                return m_idHash;
+        return EmptyByteArray;
+}
+
 
 /*****************************************************************************************

middleware-offline/trunk/_src/eidmw/applayer/CardPteid.h

@@ -177 +177 @@
         virtual bool MapFields();
 
+        virtual void MapFieldsInternal();
+
+        virtual void PackIdData(CByteArray &cb);
+        virtual void PackPublicKeyData(CByteArray &cb);
+        virtual void PackPictureData(CByteArray &cb);
+
         /**
           * Empty all fields
@@ -218 +224 @@
         std::string m_SurnameMother;                                                    /**< Field SurnameMother */
         std::string m_AccidentalIndications;                                    /**< Field AccidentalIndications */
-        PhotoPteid* photo;                                                                              /**< object photo */
+        PhotoPteid* m_photo;                                                                            /**< object photo */
         std::string m_MRZ1;                                                                             /**< Field MRZ block 1 */
         std::string m_MRZ2;                                                                             /**< Field MRZ block 2 */
@@ -343 +349 @@
         virtual bool MapFields();
         virtual void EmptyFields();                                                                     /**< Empty all fields */
+        void PackAddressData(CByteArray &cb, bool isNational);
+        void MapFieldsInternal();
 
         /**
@@ -446 +454 @@
         tCardFileStatus VerifyFile();
 
+        const CByteArray& getAddressHash();
+
+        const CByteArray& getPictureHash();
+
+        const CByteArray& getCardPublicKeyHash();
+
+        const CByteArray& getIdHash();
+
+        void doSODCheck(bool check);
+
 protected:
         /**
@@ -465 +483 @@
         virtual bool MapFields();                                                                       /**< Nothing to do m_data contains the file */
         virtual void EmptyFields();                                                                     /**< Nothing to do m_data contains the file */
-        void doSODCheck(bool check) {}
 
         /**
@@ -472 +489 @@
         virtual bool ShowData();
 
-        std::string m_Sod;                                              /**< Field Sod */
-        std::string m_SodFile;                                                                                  /**< Whole Sod Field */
+        CByteArray m_idHash;
+        CByteArray m_addressHash;
+        CByteArray m_pkHash;
+        CByteArray m_picHash;
+        CByteArray m_encapsulatedContent;
 
 friend  APL_EidFile_Sod *APL_EIDCard::getFileSod();     /**< This method must access protected constructor */

middleware-offline/trunk/_src/eidmw/applayer/SigContainer.cpp

@@ -91 +91 @@
 
                 int n_files = mz_zip_reader_get_num_files(&zip_archive);
-                printf ("mz_zip_reader_get_num_files: %d\n", n_files);
                 tHashedFile **hashes = new tHashedFile*[n_files];
 
@@ -101 +100 @@
                         if (!mz_zip_reader_file_stat(&zip_archive, i, &file_stat))
                         {
-                                fprintf(stderr, "mz_zip_reader_file_stat() failed!\n");
+                                fprintf(stderr, "E: mz_zip_reader_file_stat() failed!\n");
                                 mz_zip_reader_end(&zip_archive);
                                 continue;
@@ -111 +110 @@
                                 if (!p)
                                 {
-                                        fprintf(stderr, "mz_zip_reader_extract_file_to_heap() failed!\n");
+                                        fprintf(stderr, "E: mz_zip_reader_extract_file_to_heap() failed!\n");
                                         mz_zip_reader_end(&zip_archive);
                                         continue;
@@ -146 +145 @@
                 mz_bool status;
 
-                MWLOG(LEV_DEBUG, MOD_APL, L"StoreSignatureToDisk() called with output_file = %S\n",output_file); 
+                MWLOG(LEV_DEBUG, MOD_APL, L"StoreSignatureToDisk() called with output_file = %s\n",output_file); 
 
                 //Truncate the output file first...
@@ -156 +155 @@
                         absolute_path = paths[i];       
                         ptr_content = readFile(absolute_path, &file_size);
-                        MWLOG(LEV_DEBUG, MOD_APL, L"Compressing %d bytes from file %S\n", file_size, absolute_path);
+                        MWLOG(LEV_DEBUG, MOD_APL, L"Compressing %d bytes from file %s\n", file_size, absolute_path);
 
                         zip_entry_name = Basename((char *)absolute_path);
@@ -165 +164 @@
                         latin1_to_utf8((unsigned char *)zip_entry_name, (unsigned char *)utf8_filename);
                         zip_entry_name = utf8_filename;
-                        MWLOG (LEV_DEBUG, MOD_APL, L"Compressing filename (after conversion): %S\n", zip_entry_name);
+                        MWLOG (LEV_DEBUG, MOD_APL, L"Compressing filename (after conversion): %s\n", zip_entry_name);
 #endif
 
@@ -172 +171 @@
                         if (!status)
                         {
-                                MWLOG(LEV_ERROR, MOD_APL, L"mz_zip_add_mem_to_archive_file_in_place failed with argument %S",
+                                MWLOG (LEV_ERROR, MOD_APL, L"mz_zip_add_mem_to_archive_file_in_place failed with argument %s",
                                                 zip_entry_name);
                                 return;

middleware-offline/trunk/_src/eidmw/applayer/XadesSignature.cpp

@@ -12 +12 @@
 
 #include "APLCard.h"
+#include "APLConfig.h"
 
 #include "CardPteidDef.h"
@@ -56 +57 @@
 //OpenSSL
 #include <openssl/sha.h>
+#include <openssl/evp.h>
 
 //stat
@@ -81 +83 @@
 {
 
+        CByteArray XadesSignature::mp_timestamp_data = CByteArray();
         CByteArray XadesSignature::HashFile(const char *file_path)
         {
@@ -160 +163 @@
         }
         
-        void XadesSignature::generate_asn1_request_struct(char *sha_1)
+        void XadesSignature::generate_asn1_request_struct(unsigned char *sha_1)
         {
 
@@ -188 +191 @@
 
         */
-        void XadesSignature::addSignatureProperties(DSIGSignature *sig)
+        //Returns the newly created timestamp node
+        DOMNode *XadesSignature::addSignatureProperties(DSIGSignature *sig)
         {
                 XMLCh *prefix = XMLString::transcode("etsi");
@@ -212 +216 @@
                 ((DOMElement *)n4)->setAttributeNS(NULL, s_Id, XMLString::transcode("SignedProperties"));
                 n4->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL)); //Pretty print
-
+                makeQName(str, prefix, "SignatureTimeStamp");
+                DOMNode * n5 = doc->createElementNS(xades_namespace, str.rawXMLChBuffer());
+                makeQName(str, prefix, "EncapsulatedTimeStamp");
+                DOMNode * n6 = doc->createElementNS(xades_namespace, str.rawXMLChBuffer());
                 n1->appendChild(n2);
                 n1->appendChild(n4);
                 n2->appendChild(n3);
+                n3->appendChild(n5);
+                n5->appendChild(n6);
         
                 obj1->appendChild(n1);
 
-        }
-
-        CByteArray XadesSignature::timestamp_data(const unsigned char *input, unsigned int data_len)
+                return n6;
+
+        }
+        
+        /*
+         * timestamp parameter is the base64-encoded string version of the timestamp
+         *
+         */
+        void XadesSignature::addTimestampNode (XERCES_NS DOMNode *node, unsigned char *timestamp)
+        {
+                XERCES_NS DOMDocument *doc = node->getOwnerDocument();
+
+                node->appendChild(doc->createTextNode(
+                                        XMLString::transcode((const char*)timestamp)));
+
+        }
+
+        unsigned char* base64Encode(const unsigned char *array, int len)
+        {
+                EVP_ENCODE_CTX ectx;
+                unsigned char* out = new unsigned char[len*2];
+                int outlen = 0;
+
+                EVP_EncodeInit( &ectx );
+                EVP_EncodeUpdate( &ectx, out, &outlen, array, len );
+                //This null-terminates the out string
+                EVP_EncodeFinal( &ectx, out+outlen, &outlen );
+
+                return out;
+
+        }
+
+        void XadesSignature::timestamp_data(const unsigned char *input, unsigned int data_len)
         {
 
@@ -228 +267 @@
                 char error_buf[CURL_ERROR_SIZE];
 
+                //Get Timestamping server URL from config
+                APL_Config tsa_url(CConfig::EIDMW_CONFIG_PARAM_XSIGN_TSAURL);
+                const char * TSA_URL = tsa_url.getString();
+
                 curl = curl_easy_init();
 
@@ -243 +286 @@
                         curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, data_len);
 
-                        curl_easy_setopt(curl, CURLOPT_URL, TIMESTAMPING_HOST);
+                        curl_easy_setopt(curl, CURLOPT_URL, TSA_URL);
+
+                        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 15L);
 
                         /* Now specify the POST data */ 
@@ -260 +305 @@
                                 MWLOG(LEV_ERROR, MOD_APL, L"Timestamping error in HTTP POST request. LibcURL returned %s\n", 
                                                 (char *)error_buf);
-                                throw CMWEXCEPTION(EIDMW_ERR_CHECK);
                         }
 
@@ -270 +314 @@
                 }
 
-                return CByteArray(mp_timestamp_data);
         }
 
@@ -529 +572 @@
 }
 
-CByteArray &XadesSignature::SignXades(const char ** paths, unsigned int n_paths)
+CByteArray &XadesSignature::SignXades(const char ** paths, unsigned int n_paths, bool do_timestamping)
 {
 
@@ -546 +589 @@
 
         XMLByte toFill[35 * sizeof(XMLByte)]; //SHA-1 Hash prepended with Algorithm ID as by PKCS#1 standard
+        unsigned char signature_hash[SHA1_LEN];
 
         DOMImplementation *impl = 
@@ -577 +621 @@
                         //Create a reference to the external file
                         DSIGReference * ref = sig->createReference(createURI(path));
-                        MWLOG(LEV_DEBUG, MOD_APL, L"SignXades(): Hashing file %S", path);
+                        MWLOG(LEV_DEBUG, MOD_APL, L"SignXades(): Hashing file %s", path);
                         sha1_hash = HashFile(path);
 
@@ -602 +646 @@
                 loadCert (certData, pub_key);
 
-                //Access pteid card to sign the XML Data
-                //This code will be eventually integrated in applayer
-                // so this connection to the card will be completely different
-
-                // Create KeyInfo element
 
                 keyInfoX509 = sig->appendX509Data();
@@ -627 +666 @@
                 sig->signExternal((XMLByte *)(rsa_signature.GetBytes()), PTEID_SIGNATURE_LENGTH); //RSA Signature with modlength=1024 bits
                 
-                addSignatureProperties(sig);
-                
+                DOMNode * timestamp_node = addSignatureProperties(sig);
+
+                if (do_timestamping)
+                {
+
+                        //Hash the signature value, generate the ASN.1 encoded request 
+                        //and then send it to the timestamp server
+                        SHA1 (rsa_signature.GetBytes(), PTEID_SIGNATURE_LENGTH, signature_hash);
+
+                        generate_asn1_request_struct(signature_hash);
+
+                        timestamp_data(timestamp_asn1_request, ASN1_LEN);
+
+                        CByteArray *timestamp_blob = &XadesSignature::mp_timestamp_data;
+
+                        if (timestamp_blob->Size() == 0)
+                                MWLOG(LEV_ERROR, MOD_APL, L"An error occurred in timestamp_data."
+                                                "It's possible that the timestamp service is down ");
+                        else
+                        {
+                                unsigned char * base64str = base64Encode(timestamp_blob->GetBytes(), timestamp_blob->Size());
+                                addTimestampNode(timestamp_node, base64str);
+                        }
+                }
         }
         catch (XSECCryptoException &e)

middleware-offline/trunk/_src/eidmw/applayer/XadesSignature.h

@@ -16 +16 @@
 #define ASN1_LEN 43
 #define SHA1_OFFSET 20
-
-#define TIMESTAMPING_HOST "http://ts.cartaodecidadao.pt/tsa/server"
 
 #define XERCES_NS XERCES_CPP_NAMESPACE_QUALIFIER
@@ -54 +52 @@
 
                 CByteArray &SignXades(CByteArray ba, const char *URL);
-                CByteArray &SignXadesT(CByteArray ba, const char *URL);
-                CByteArray &SignXades(const char ** paths, unsigned int n_paths);
-                CByteArray &SignXadesT(const char ** paths, unsigned int n_paths);
+                CByteArray &SignXades(const char ** paths, unsigned int n_paths, bool do_timestamp);
 
                 static bool checkExternalRefs(DSIGReferenceList *refs, tHashedFile **hashes);
@@ -65 +61 @@
                 
                 CByteArray HashFile(const char *file_path);
-                void addSignatureProperties(DSIGSignature *sig);
+                DOMNode * addSignatureProperties(DSIGSignature *sig);
                 CByteArray *WriteToByteArray(XERCES_NS DOMDocument *doc); 
                 //Utility methods for signature
@@ -72 +68 @@
                 int appendOID(XMLByte *toFill);
 
-                void addTimestampNode(DSIGSignature *sig);
+                void addTimestampNode(XERCES_NS DOMNode *node, unsigned char *timestamp);
                 XMLCh* createURI(const char *path);
 
 
                 //Utility methods for timestamping
-                size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void * stream); 
-                CByteArray timestamp_data(const unsigned char *input, unsigned int data_len);
-                void generate_asn1_request_struct(char *sha_1);
+                
+                //Curl write_function callback: it writes the data to the static array mp_timestamp_data
+                static size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void * stream); 
+
+                void timestamp_data(const unsigned char *input, unsigned int data_len);
+                void generate_asn1_request_struct(unsigned char *sha_1);
 
                 static void initXerces();
@@ -86 +85 @@
                 X509 * mp_cert;
                 APL_Card *mp_card;
-                CByteArray mp_timestamp_data;
+                static CByteArray mp_timestamp_data;
 
 

middleware-offline/trunk/_src/eidmw/applayer/applayer.pro

@@ -85 +85 @@
         APLPublicKey.h \
         SigContainer.h \
-        XadesSignature.h
+        XadesSignature.h \
+        SODParser.h
 
 
@@ -110 +111 @@
     APLPublicKey.cpp \
     SigContainer.cpp \
-    XadesSignature.cpp
+    XadesSignature.cpp \
+    SODParser.cpp
     
     

middleware-offline/trunk/_src/eidmw/applayer/cryptoFramework.cpp

@@ -580 +580 @@
         return VerifyHash(data,hash,EVP_sha1());
 }
+
+bool APL_CryptoFwk::VerifyHashSha256(const CByteArray &data, const CByteArray &hash)
+{
+        //Check the hash with sha256 algorithm
+        return VerifyHash(data,hash,EVP_sha256());
+}
+
 
 bool APL_CryptoFwk::VerifyHash(const CByteArray &data, const CByteArray &hash, const EVP_MD *algorithm)

middleware-offline/trunk/_src/eidmw/applayer/cryptoFramework.h

@@ -66 +66 @@
 enum FWK_HashAlgo {
         FWK_ALGO_MD5,      // 16-byte hash
-        FWK_ALGO_SHA1     // 20-byte hash
+        FWK_ALGO_SHA1,     // 20-byte hash
+        FWK_ALGO_SHA256
 };
 
@@ -165 +166 @@
 
         /**
+         * Verify if the data has the correct hash (sha256 algorithm)
+         */
+        bool VerifyHashSha256(const CByteArray &data, const CByteArray &hash);
+
+        /**
           * Get the hash of the data
           */

middleware-offline/trunk/_src/eidmw/common/Config.h

@@ -193 +193 @@
 #define EIDMW_CNF_XSIGN_TIMEOUT                 L"timeout"                                      //number; 
 
+#define EIDMW_CNF_SECTION_AUTOUPDATES       L"autoupdates"            //section with the autoupdates parameters
+#define EIDMW_CNF_AUTOUPDATES_URL      L"serverurl"       //string
 
 namespace eIDMW
@@ -257 +259 @@
     static void           SetLong(  tLocation location, const std::wstring &csName, const std::wstring &czSection, long lValue);
 
-        static void           DelString(tLocation location, const struct Param_Str param);
+    static void           DelString(tLocation location, const struct Param_Str param);
     static void           DelString(tLocation location, const std::wstring &csName, const std::wstring &czSection);
     static void           DelLong(  tLocation location, const struct Param_Num param);
@@ -304 +306 @@
     static const struct Param_Num EIDMW_CONFIG_PARAM_PROXY_PORT;
     static const struct Param_Str EIDMW_CONFIG_PARAM_PROXY_PACFILE;
-        static const struct Param_Num EIDMW_CONFIG_PARAM_PROXY_CONNECT_TIMEOUT;
+    static const struct Param_Num EIDMW_CONFIG_PARAM_PROXY_CONNECT_TIMEOUT;
 
     //SECURITY
     static const struct Param_Num EIDMW_CONFIG_PARAM_SECURITY_SINGLESIGNON;
 
-        //GUI
+    //GUI
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_STARTWIN;
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_STARTMINI;
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_SHOWPIC;
-        static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_SHOWNOTIFICATION;
+    static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_SHOWNOTIFICATION;
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_SHOWTBAR;
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_VIRTUALKBD;
@@ -320 +322 @@
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_REGCERTIF;
     static const struct Param_Num EIDMW_CONFIG_PARAM_GUITOOL_REMOVECERTIF;
-        static const struct Param_Str EIDMW_CONFIG_PARAM_GUITOOL_FILESAVE;
-
-        //XSIGN
+    static const struct Param_Str EIDMW_CONFIG_PARAM_GUITOOL_FILESAVE;
+
+    //XSIGN
     static const struct Param_Str EIDMW_CONFIG_PARAM_XSIGN_TSAURL;
     static const struct Param_Num EIDMW_CONFIG_PARAM_XSIGN_ONLINE;
     static const struct Param_Str EIDMW_CONFIG_PARAM_XSIGN_WORKINGDIR;
     static const struct Param_Num EIDMW_CONFIG_PARAM_XSIGN_TIMEOUT;
+
+    //AutoUpdates
+    static const struct Param_Str EIDMW_CONFIG_PARAM_AUTOUPDATES_URL;
 
 private:

middleware-offline/trunk/_src/eidmw/common/ConfigCommon.cpp

@@ -30 +30 @@
   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CACHEDIR          =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_CACHEDIR,     L"$home" WDIRSEP L".eidmwcache"};
   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_PTEID_CACHEDIR =  {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_CACHEDIR,     L"$home" WDIRSEP L".pteid-ng"};
-  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR         =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_INSTALLDIR,   L"$home" WDIRSEP L"eidstore"};
+#ifdef WIN32
+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR         =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_INSTALLDIR,   L"$home" WDIRSEP L"eidstore" WDIRSEP};
+#elif defined __APPLE__
+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR         =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_INSTALLDIR,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs" WDIRSEP};
+#else
+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR         =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_INSTALLDIR,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs" WDIRSEP};
+#endif
   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_LANGUAGE          =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_LANGUAGE,             L"en"};
   const struct CConfig::Param_Num CConfig::EIDMW_CONFIG_PARAM_GENERAL_CARDTXDELAY       =       {EIDMW_CNF_SECTION_GENERAL,     EIDMW_CNF_GENERAL_CARDTXDELAY,  3};
@@ -90 +96 @@
   const struct CConfig::Param_Num CConfig::EIDMW_CONFIG_PARAM_XSIGN_TIMEOUT             =       {EIDMW_CNF_SECTION_XSIGN,       EIDMW_CNF_XSIGN_TIMEOUT,        30};
 
+//AutoUpdates
+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_AUTOUPDATES_URL      =       {EIDMW_CNF_SECTION_AUTOUPDATES, EIDMW_CNF_AUTOUPDATES_URL,          L""};
+
 } // namespace eidMW

middleware-offline/trunk/_src/eidmw/common/eidErrors.h

@@ -273 +273 @@
 
 
+//SOD related errors
+
+#define EIDMW_SOD_UNEXPECTED_VALUE                                      0xe1d00c01
+#define EIDMW_SOD_UNEXPECTED_ASN1_TAG                           0xe1d00c02
+#define EIDMW_SOD_UNEXPECTED_ALGO_OID                           0xe1d00c03
+#define EIDMW_SOD_ERR_HASH_NO_MATCH_ID                          0xe1d00c04
+#define EIDMW_SOD_ERR_HASH_NO_MATCH_ADDRESS                     0xe1d00c05
+#define EIDMW_SOD_ERR_HASH_NO_MATCH_PICTURE                     0xe1d00c06
+#define EIDMW_SOD_ERR_HASH_NO_MATCH_PUBLIC_KEY          0xe1d00c07
+
 // Errors in system calls
 
 /** a system call returned an error */
-#define EIDMW_ERR_SYSTEM                      0xe1d00c01
+#define EIDMW_ERR_SYSTEM                      0xe1d00d01
 
 /** a signal function returned an error */
-#define EIDMW_ERR_SIGNAL                     0xe1d00c02
+#define EIDMW_ERR_SIGNAL                     0xe1d00d02

middleware-offline/trunk/_src/eidmw/eidgui/AutoUpdates.cpp

@@ -44 +44 @@
 using namespace eIDMW;
 
+std::string serverurl = "http://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/builds/lastversion/";
+std::string remoteversion = "http://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/builds/lastversion/version.txt";
+
 std::string ddtitle ("Cartão de Cidadão");
-std::string serverurl = "http://people.caixamagica.pt/lmedinas/autoupdates/";
-std::string remoteversion = "http://people.caixamagica.pt/lmedinas/autoupdates/version.txt";
 
 AutoUpdates::AutoUpdates(QWidget *parent)
@@ -335 +336 @@
         std::string downloadurl;
         std::string pkgname;
-        downloadurl.append(serverurl);
+
+    eIDMW::PTEID_Config config(eIDMW::PTEID_PARAM_AUTOUPDATES_URL);
+    std::string configurl = config.getString();
+
+    if (configurl.empty())
+        downloadurl.append(serverurl);
+    else
+        downloadurl.append(configurl);
 
 #ifdef WIN32
@@ -346 +354 @@
                 httpWin.exec();
         } else {
-                pkgname.append("PteidMW35-Basic-en.msi");
+        pkgname.append("PteidMW35x86_64-Basic-en.msi");
                 downloadurl.append(pkgname);
                 HttpWindow httpWin(downloadurl, distro);
@@ -362 +370 @@
         }
 
+    //Name of the deb/rpm the rest of the appends will be distro specific
         pkgname.append("pteid-mw");
 
@@ -368 +377 @@
                 if (distro == "debian")
                 {
-                        pkgname.append("_1.0.1svn1522-1");
+            pkgname.append("_debian");
                         pkgname.append("_amd64.deb");
                         downloadurl.append(pkgname);
@@ -376 +385 @@
                         //delete httpWin;
                 }
+        if (distro == "Ubuntu" || distro == "CaixaMagica")
+        {
+            pkgname.append("_ubuntu");
+            pkgname.append("_amd64.deb");
+            downloadurl.append(pkgname);
+            HttpWindow httpWin(downloadurl, distro);
+            httpWin.show();
+            httpWin.exec();
+            //delete httpWin;
+        }
                 else if (distro == "fedora")
                 {
-                        pkgname.append("-1.0.1.1522-2.1");
+            pkgname.append("-fedora");
                         pkgname.append(".x86_64.rpm");
                         downloadurl.append(pkgname);
@@ -387 +406 @@
                 else if (distro == "suse")
                 {
-                        pkgname.append("-1.0.1.1522-2.1");
+                pkgname.append("-suse");
                         pkgname.append(".x86_64.rpm");
                         downloadurl.append(pkgname);
@@ -394 +413 @@
                         httpWin.exec();
                 }
+        else if (distro == "mandriva")
+        {
+                pkgname.append("-mandriva");
+                pkgname.append(".x86_64.rpm");
+                downloadurl.append(pkgname);
+                HttpWindow httpWin(downloadurl, distro);
+                httpWin.show();
+                httpWin.exec();
+        }
 
         } else {
@@ -399 +427 @@
                 if (distro == "debian")
                 {
-                        pkgname.append("_1.0.1svn1522-1");
+            pkgname.append("_debian");
                         pkgname.append("_i386.deb");
                         downloadurl.append(pkgname);
@@ -406 +434 @@
                         httpWin.exec();
                 }
+        if (distro == "Ubuntu" || distro == "CaixaMagica")
+        {
+            pkgname.append("_ubuntu");
+            pkgname.append("_amd64.deb");
+            downloadurl.append(pkgname);
+            HttpWindow httpWin(downloadurl, distro);
+            httpWin.show();
+            httpWin.exec();
+            //delete httpWin;
+        }
                 else if (distro == "fedora")
                 {
-                        pkgname.append("-1.0.1.1522-2.1");
+            pkgname.append("-fedora");
                         pkgname.append(".i386.rpm");
                         downloadurl.append(pkgname);
@@ -417 +455 @@
                 else if (distro == "suse")
                 {
-                        pkgname.append("-1.0.1.1522-2.1");
+                pkgname.append("-suse");
                         pkgname.append(".i586.rpm");
                         downloadurl.append(pkgname);
@@ -424 +462 @@
                         httpWin.exec();
                 }
+        else if (distro == "mandriva")
+        {
+                pkgname.append("-mandriva");
+                pkgname.append(".i586.rpm");
+                downloadurl.append(pkgname);
+                HttpWindow httpWin(downloadurl, distro);
+                httpWin.show();
+                httpWin.exec();
+        }
         }
 #endif

middleware-offline/trunk/_src/eidmw/eidgui/dlgPrint.ui

@@ -12 +12 @@
   </property>
   <property name="windowTitle">
-   <string>Print</string>
+   <string>Export PDF / Print</string>
   </property>
   <property name="windowIcon">
@@ -37 +37 @@
        <rect>
         <x>20</x>
-        <y>30</y>
+        <y>50</y>
         <width>140</width>
         <height>20</height>
@@ -72 +72 @@
        <rect>
         <x>20</x>
-        <y>50</y>
+        <y>30</y>
         <width>154</width>
         <height>20</height>
@@ -128 +128 @@
       <property name="geometry">
        <rect>
-        <x>250</x>
+        <x>60</x>
         <y>120</y>
         <width>81</width>
@@ -154 +154 @@
       <property name="geometry">
        <rect>
-        <x>50</x>
+        <x>240</x>
         <y>120</y>
         <width>91</width>

middleware-offline/trunk/_src/eidmw/eidgui/dlgSignature.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>315</height>
+    <width>483</width>
+    <height>292</height>
    </rect>
   </property>
-   <property name="windowTitle">
-   <string>Signature</string>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Assinatura de Ficheiros (XADES)</string>
   </property>
   <property name="windowIcon">
@@ -21 +27 @@
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <item row="1" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_3">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbCancel">
-         <property name="text">
-          <string>Cancel</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbSign">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Sign</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QLabel" name="labelHeader">
-       <property name="text">
-        <string>Signature</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListView" name="listView"/>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pbAddFiles">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Add Files...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
+  <widget class="QPushButton" name="pbAddFiles">
+   <property name="geometry">
+    <rect>
+     <x>340</x>
+     <y>220</y>
+     <width>141</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>Adicionar Ficheiros</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelHeader">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>351</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Lista de Ficheiros a assinar</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pbCancel">
+   <property name="geometry">
+    <rect>
+     <x>300</x>
+     <y>260</y>
+     <width>85</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Cancelar</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pbSign">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>395</x>
+     <y>260</y>
+     <width>85</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Assinar</string>
+   </property>
+  </widget>
+  <widget class="QListView" name="listView">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>30</y>
+     <width>471</width>
+     <height>191</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QCheckBox" name="checkBox">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>230</y>
+     <width>251</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Adicionar TimeStamp (XADES-T)</string>
+   </property>
+  </widget>
  </widget>
  <resources/>

middleware-offline/trunk/_src/eidmw/eidgui/dlgVerifySignature.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>431</width>
-    <height>222</height>
+    <width>321</width>
+    <height>108</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string> Verify Signature</string>
+   <string>Validação de Assinaturas</string>
   </property>
   <property name="windowIcon">
@@ -21 +21 @@
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <item row="1" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_3">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="sizeConstraint">
-        <enum>QLayout::SetMinimumSize</enum>
-       </property>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbCancel">
-         <property name="text">
-          <string>Cancel</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbOpenSign">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="text">
-          <string>Open Signature</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QLabel" name="labelHeader">
-       <property name="text">
-        <string>Verify Signature</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
+  <widget class="QLabel" name="labelHeader">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>401</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Selecione o ficheiro de Assinaturas a validar:</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pbCancel">
+   <property name="geometry">
+    <rect>
+     <x>60</x>
+     <y>70</y>
+     <width>85</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Fechar</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pbOpenSign">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>150</x>
+     <y>70</y>
+     <width>161</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Selecionar Assinatura</string>
+   </property>
+  </widget>
  </widget>
  <resources/>

middleware-offline/trunk/_src/eidmw/eidgui/dlgprint.cpp

@@ -252 +252 @@
                 else
                 {
-                        std::cout << "no card" << std::endl;
                         QString msg(tr("No card present"));
                         QMessageBox::information( this, caption,  msg, QMessageBox::Ok );
@@ -261 +260 @@
         {
                 QString msg(tr("General exception"));
-                //ShowPTEIDError( e.GetError(), msg );
+        PTEID_LOG(PTEID_LOG_LEVEL_DEBUG, "eidgui", "loadCard on dlgprint failed %s", e.GetError());
                 return false;
         }
@@ -267 +266 @@
         {
                 QString msg(tr("Unknown exception"));
-                //ShowPTEIDError( 0, msg );
                 return false;
         }

middleware-offline/trunk/_src/eidmw/eidgui/dlgsignature.cpp

@@ -238 +238 @@
             PTEID_EIDCard*      Card = dynamic_cast<PTEID_EIDCard*>(m_CI_Data.m_pCard);
             PTEID_ByteArray SignXades;
-            SignXades = Card->SignXades(paths, n_paths, output_path);
+            SignXades = Card->SignXadesT(paths, n_paths, output_path);
         
     }

middleware-offline/trunk/_src/eidmw/eidgui/eidmw_nl.ts

@@ -25 +25 @@
     </message>
     <message>
+        <location filename="mainwnd.ui" line="23"/>
+        <source>Portuguese ID Card Management</source>
+        <translation>Aplicação Oficial do Cartão de Cidadão</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1629"/>
+        <source>Additional Data</source>
+        <translation>Outros Dados</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1608"/>
+        <source>Identity</source>
+        <translation>Identidade</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1713"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1692"/>
+        <source>PIN Codes</source>
+        <translation>Códigos PIN</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1775"/>
+        <location filename="mainwnd.ui" line="2086"/>
+        <source>Tools</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.ui" line="1984"/>
+        <location filename="mainwnd.ui" line="1749"/>
+        <location filename="mainwnd.ui" line="2341"/>
+        <source>Card</source>
+        <translation>Cartão</translation>
+    </message>
+    
+    <message>
         <location filename="mainwnd.ui" line="404"/>
         <source>Kaartnr. / &lt;i&gt;Card No&lt;/i&gt;</source>
@@ -251 +290 @@
         <source>Reload eID</source>
         <translation>(Re)Ler Cartão</translation>
-    </message>
-    <message>
-        <location filename="mainwnd.cpp" line="2339"/>
-        <location filename="mainwnd.cpp" line="2565"/>
-        <source>Save eID</source>
-        <translation>Guardar eID</translation>
-    </message>
-    <message>
-        <location filename="mainwnd.ui" line="2862"/>
-        <source>Save eID as...</source>
-        <translation>Guardar eID como</translation>
-    </message>
-    <message>
-        <location filename="mainwnd.cpp" line="2200"/>
-        <location filename="mainwnd.cpp" line="2236"/>
-        <source>Open eID</source>
-        <translation>Abrir eID</translation>
     </message>
     <message>
@@ -591 +613 @@
     </message>
     <message>
-        <location filename="mainwnd.cpp" line="2137"/>
-        <location filename="mainwnd.cpp" line="2404"/>
-        <location filename="mainwnd.cpp" line="2523"/>
-        <location filename="mainwnd.cpp" line="2799"/>
-        <location filename="mainwnd.cpp" line="2885"/>
+        <location filename="mainwnd.cpp" line="1790"/>
+        <location filename="mainwnd.cpp" line="1942"/>
+        <location filename="mainwnd.cpp" line="2090"/>
+        <location filename="mainwnd.cpp" line="2242"/>
+        <location filename="mainwnd.cpp" line="2504"/>
         <source>No card present</source>
         <translation>Cartão não encontrado</translation>
@@ -773 +795 @@
     </message>
     <message>
-        <location filename="mainwnd.cpp" line="1171"/>
+        <location filename="mainwnd.cpp" line="870"/>
         <source>Register certificate</source>
-        <translation>Registreer certificaat</translation>
-    </message>
-    <message>
-        <location filename="mainwnd.cpp" line="1172"/>
+        <translation>Registar Certificados</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.cpp" line="871"/>
         <source>Registration of certificate </source>
-        <translation>Registratie van certificaat </translation>
-    </message>
-    <message>
-        <location filename="mainwnd.cpp" line="1175"/>
+        <translation>Registo de certificados </translation>
+    </message>
+    <message>
+        <location filename="mainwnd.cpp" line="874"/>
         <source>successful</source>
-        <translation>gelukt</translation>
+        <translation>bem sucedido</translation>
     </message>
     <message>
         <location filename="mainwnd.cpp" line="1179"/>
-        <location filename="mainwnd.cpp" line="2858"/>
+        <location filename="mainwnd.cpp" line="878"/>
         <source>failed</source>
-        <translation>mislukt</translation>
+        <translation>falhou</translation>
     </message>
     <message>
@@ -869 +891 @@
     </message>
     <message>
-        <location filename="mainwnd.cpp" line="2868"/>
+        <location filename="mainwnd.cpp" line="2488"/>
+        <location filename="mainwnd.cpp" line="2730"/>
         <source>
 ( Number of tries left: </source>
         <translation>
-( Aantal pogingen over: </translation>
+( Número de tentativas restantes: </translation>
     </message>
     <message>
@@ -1021 +1044 @@
     </message>
     <message>
-        <location filename="mainwnd.cpp" line="985"/>
+        <location filename="mainwnd.cpp" line="684"/>
         <source>eID is still running</source>
-        <translation>eID is nog steeds aktief</translation>
-    </message>
-    <message>
-        <location filename="mainwnd.cpp" line="986"/>
+        <translation>A aplicação continua em execução</translation>
+    </message>
+    <message>
+        <location filename="mainwnd.cpp" line="685"/>
         <source>The application will continue to run. To stop this application, select &apos;Exit&apos; from the menu.</source>
-        <translation>Het programma blijft verder werken. Om de applicatie te stoppen, kies &apos;Afsluiten&apos; van het menu.</translation>
+        <translation>Para fechar a aplicação selecione a opção sair.</translation>
     </message>
     <message>
@@ -1208 +1231 @@
     </message>
     <message>
-        <location filename="mainwnd.cpp" line="2174"/>
-        <source>Error loading card data</source>
+        <location filename="mainwnd.cpp" line="1827"/>
+        <source>Erro ao ler os dados do cartão</source>
         <translation></translation>
     </message>
@@ -1539 +1562 @@
     </message>
     <message>
+        <location filename="dlgPrint.ui" line="14"/>
+        <source>Export PDF / Print</source>
+        <translation>Exportação PDF / Impressão</translation>
+    </message>
+    <message>
         <location filename="dlgPrint.ui" line="57"/>
         <source>Cancel</source>

middleware-offline/trunk/_src/eidmw/eidgui/httpwindow.cpp

@@ -231 +231 @@
 
         std::string winpath;
-        winpath.append("C:\\Windows\\system32\\msiexec.exe /i ");
+    winpath.append("C:\\Windows\\system32\\msiexec.exe /i");
         //TODO: Verificar a path do msi em Windows
         //C:\\Users\\Luis\\AppData\\Local\\Temp\\PteidMW35-Basic-en.msi
     QString s = QDir::toNativeSeparators(QString::fromStdString(pkgpath));
     winpath.append(s.toStdString());
+    winpath.append(" /L*v ");
+    winpath.append(QDir::tempPath().toStdString());
+    winpath.append("\PTeID-MSI.log");
         CreateProcess(NULL, LPTSTR(winpath.c_str()), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
         exit(0);

middleware-offline/trunk/_src/eidmw/eidgui/mainwnd.cpp

@@ -1684 +1684 @@
         // if we load a new card, clear the certificate contexts we kept
         //----------------------------------------------------------------
-        std::cout << " loadCardData( void )" << std::endl;
         try
         {
@@ -1740 +1739 @@
                                         catch (PTEID_ExCardBadType const& e)
                                         {
-                                                std::cout << "ERROR" << e.GetError()<< std::endl;
                                                 QString errcode;
+                        PTEID_LOG(PTEID_LOG_LEVEL_DEBUG, "eidgui", "loadCardData failed %s", e.GetError());
                                                 errcode = errcode.setNum(e.GetError());
                                         }

middleware-offline/trunk/_src/eidmw/eidgui/mainwnd.ui

@@ -21 +21 @@
   </property>
   <property name="windowTitle">
-   <string>PTeID-NG</string>
+   <string>Portuguese ID Card Management</string>
   </property>
   <property name="autoFillBackground">

middleware-offline/trunk/_src/eidmw/eidlib/eidlib.i

@@ -476 +476 @@
 ///////////////////////////////////////// PTEID_Card &PTEID_ReaderContext::getCard() /////////////////////////////////////////////
 %warnfilter(844) eIDMW::PTEID_ReaderContext::getCard;
-%typemap(csout) eIDMW::PTEID_Card &eIDMW::PTEID_ReaderContext::getCard() 
-{ 
-        PTEID_CardType cardType=getCardType();
-
-        switch(cardType)
-        {
-        case PTEID_CardType.PTEID_CARDTYPE_EID:
-                return getEIDCard();            
-
-    default:                                                                            
-                throw new PTEID_ExCardTypeUnknown();
-        }
-}
-
-///////////////////////////////////////// PTEID_EIDCard &PTEID_ReaderContext::getEIDCard() /////////////////////////////////////////////
-%typemap(csout, excode=CSHARP_CODE_THROW) eIDMW::PTEID_EIDCard &eIDMW::PTEID_ReaderContext::getEIDCard()
-{ 
-        PTEID_CardType cardType=getCardType();
-
-        switch(cardType)
-        {
-        case PTEID_CardType.PTEID_CARDTYPE_EID:                 
-                PTEID_EIDCard ret = new PTEID_EIDCard($imcall, false);  
-                $excode
-                return ret;
-
-    default:                                                                            
-                throw new PTEID_ExCardBadType();
-        }
-}
 
 ///////////////////////////////////////// PTEID_XMLDoc& PTEID_EIDCard::getDocument(PTEID_DocumentType type) /////////////////////////////////////////////
@@ -535 +505 @@
 # no need to add a static block on every project that uses the java wrapper
 # the lib must be in the java library path
-%pragma(java) jniclasscode=%{
-  static {
-    try {
-        System.loadLibrary("pteidlibJava_Wrapper");
-    } catch (UnsatisfiedLinkError e) {
-      System.err.println("Native code library failed to load. \n" + e);
-      System.exit(1);
-    }
-  }
-%}
 
 ///////////////////////////////////////// ByteArray /////////////////////////////////////////////

middleware-offline/trunk/_src/eidmw/eidlib/eidlibCard.cpp

@@ -1616 +1616 @@
 
 PTEIDSDK_API long PTEID_SetSODChecking(int bDoCheck){
-        if (readerContext!=NULL){
-
-        }
+        if (readerContext!=NULL)
+                readerContext->getEIDCard().doSODCheck(bDoCheck!=0);
 
         return 0;

middleware-offline/trunk/_src/eidmw/eidlib/eidlibException.cpp

@@ -82 +82 @@
         case EIDMW_ERR_NOT_ALLOW_BY_USER:
                 throw PTEID_ExNotAllowByUser();
+        case EIDMW_SOD_UNEXPECTED_VALUE:
+        case EIDMW_SOD_UNEXPECTED_ASN1_TAG:
+        case EIDMW_SOD_UNEXPECTED_ALGO_OID:
+        case EIDMW_SOD_ERR_HASH_NO_MATCH_ID:
+        case EIDMW_SOD_ERR_HASH_NO_MATCH_ADDRESS:
+        case EIDMW_SOD_ERR_HASH_NO_MATCH_PICTURE:
+        case EIDMW_SOD_ERR_HASH_NO_MATCH_PUBLIC_KEY:
+                throw PTEID_ExSOD(e.GetError());
 
         case EIDMW_ERR_CARD:
@@ -298 +306 @@
 {
 }
-}
+
+/*****************************************************************************************
+---------------------------- PTEID_ExUnexpectedValue --------------------------------------
+*****************************************************************************************/
+PTEID_ExSOD::PTEID_ExSOD(long lError):PTEID_Exception(lError)
+{
+}
+
+PTEID_ExSOD::~PTEID_ExSOD()
+{
+}
+}

middleware-offline/trunk/_src/eidmw/eidlib/eidlibException.h

@@ -291 +291 @@
         PTEIDSDK_API virtual ~PTEID_ExUserMustAnswer();         /**< Destructor */
 };
+
+/******************************************************************************//**
+ * Exception class SOD error error codes:
+ *
+ *      EIDMW_SOD_UNEXPECTED_VALUE
+ *              EIDMW_SOD_UNEXPECTED_ASN1_TAG
+ *              EIDMW_SOD_UNEXPECTED_ALGO_OID
+ *              EIDMW_SOD_ERR_HASH_NO_MATCH_ID
+ *              EIDMW_SOD_ERR_HASH_NO_MATCH_ADDRESS
+ *              EIDMW_SOD_ERR_HASH_NO_MATCH_PICTURE
+ *              EIDMW_SOD_ERR_HASH_NO_MATCH_PUBLIC_KEY
+ *
+ *      Throw when the SOD is not correct
+ *********************************************************************************/
+class PTEID_ExSOD: public PTEID_Exception
+{
+public:
+        PTEIDSDK_API PTEID_ExSOD(long lError);                          /**< Constructor */
+        PTEIDSDK_API virtual ~PTEID_ExSOD();                            /**< Destructor */
+};
 }
 

middleware-offline/trunk/_src/eidmw/eidlib/eidlibReader.cpp

@@ -884 +884 @@
                 m_impl=new APL_Config(CConfig::EIDMW_CONFIG_PARAM_XSIGN_TIMEOUT);                       break;
 
+        //AUTOUPDATES
+        case PTEID_PARAM_AUTOUPDATES_URL:
+        m_impl=new APL_Config(CConfig::EIDMW_CONFIG_PARAM_AUTOUPDATES_URL);         break;
+
         default:
                 throw PTEID_ExParamRange();

middleware-offline/trunk/_src/eidmw/eidlib/eidlibdefines.h

@@ -181 +181 @@
         PTEID_PARAM_PROXY_CONNECT_TIMEOUT,      //number
 
+        //AUTOUPDATES
+    PTEID_PARAM_AUTOUPDATES_URL      //string
+
 };
 

middleware-offline/trunk/_src/eidmw/install/pteid.conf.3.5

@@ +1 @@
+#PTEID-MW Configure File
+#Make sure you add more lines to the end to avoid line removal.
+
 [crl]
 crl_cachedir=/usr/share/pteid/crl

middleware-offline/trunk/_src/eidmw/mdw_online_patches/apply_patches.sh

@@ -2 +2 @@
 
 #patch -p0 -i build_on_glibc_2.14.patch
-patch -p0 -i dont_ask_for_pin_on_sign.patch
+#patch -p0 -i dont_ask_for_pin_on_sign.patch
 patch -p0 -i use_rpath_origin.patch

middleware-offline/trunk/_src/eidmw/misc/Wix_MW35/MW35Wix/Product.wxs

@@ -502 +502 @@
       <Component Id="PinpadLib" Guid="{9ADA6D75-5DCC-467E-A0CE-B84A482B2115}" SharedDllRefCount="yes">
        <File Id="pteidpp2gempc.dll" Name="pteidpp2-gempc.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-gempc.dll" />
+       <File Id="pteidpp2-acr83-plugin.dll" Name="pteidpp2-acr83-plugin.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-acr83-plugin.dll" />
       </Component>
     </DirectoryRef>

middleware-offline/trunk/_src/eidmw/pkcs11/asn1.h

@@ -131 +131 @@
 
 #define OID_RSA_ENCRYPTION      "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x01"
+#define OID_SHA256_ALGORITHM    "\x60\x86\x48\x01\x65\x03\x04\x02\x01"
 #define ASNPATH_FIRST           "\x01"
 

middleware-offline/trunk/_src/eidmw/pteidlinuxversion.pl

@@ -55 +55 @@
             $distro               = "mandriva";
         }
+        #Support for Ubuntu/Caixamagica
+        elsif (-e "/etc/lsb-release")
+        {
+            my $tmp = `cat /etc/lsb-release`;
+            my @values = ($tmp =~ m/=(\S+)/g);
+            join(',', @values), "\n";
+
+            if ($values[0] =~ m/CaixaMagica/ || $values[0] =~ m/Ubuntu/ || $values[0] =~ m/Debian/)
+            {
+                $values[0] =~ s/"//g;
+                $distro = @values[0];
+                $distribution_version = @values[1];
+            } else {
+                $distro = "unsupported";
+            }
+        }
         elsif (-e "/etc/debian_version")
         {