Changeset 66

Show
Ignore:
Timestamp:
02/23/12 05:17:17 (9 years ago)
Author:
vsilva
Message:

Fix signature 64bits, create windows msi 64

Location:
middleware-offline/trunk/_src/eidmw
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • middleware-offline/trunk/_src/eidmw/applayer/miniz.c

    r35 r66  
    179179 
    180180// For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. 
    181 typedef unsigned long mz_ulong; 
     181typedef unsigned int mz_ulong; 
    182182 
    183183// Heap allocation callbacks. 
  • middleware-offline/trunk/_src/eidmw/cardlayerTool/dumpcontents.cpp

    r34 r66  
    144144static long DumpPteidContents(CReader &oReader) 
    145145{ 
    146         printf("Type: BE eID\n"); 
     146        printf("Type: PT eID\n"); 
    147147        printf("Version: %0x\n", oReader.GetInfo().GetByte(21)); 
    148148 
  • middleware-offline/trunk/_src/eidmw/eidlib/eidlibCard.cpp

    r41 r66  
    15191519PTEIDSDK_API long PTEID_UnblockPIN_Ext(unsigned char PinId,     char *pszPuk, char *pszNewPin, long *triesLeft, unsigned long ulFlags){ 
    15201520        if (readerContext!=NULL){ 
    1521  
    1522         } 
    1523  
    1524         return 0; 
     1521                return PTEID_UnblockPIN(PinId,  pszPuk,pszNewPin,triesLeft); 
     1522        } 
     1523 
     1524        return -1; 
    15251525} 
    15261526 
     
    16221622} 
    16231623 
    1624 PTEIDSDK_API long PTEID_SetSODCAs( PTEID_Certifs *Certifs){ 
    1625         if (readerContext!=NULL){ 
    1626  
     1624PTEIDSDK_API long PTEID_SetSODCAs(PTEID_Certifs *Certifs){ 
     1625        if (readerContext!=NULL){ 
     1626                for(int i=0;i<Certifs->certificatesLength;i++){ 
     1627                        PTEID_ByteArray *pba = new PTEID_ByteArray(Certifs->certificates[i].certif,Certifs->certificates[i].certifLength); 
     1628                        readerContext->getEIDCard().getCertificates().addCertificate(*pba); 
     1629                        delete pba; 
     1630                } 
    16271631        } 
    16281632 
  • middleware-offline/trunk/_src/eidmw/eidlibJava_Wrapper/GeneratedFiles/pteid.java

    r59 r66  
    298298        PTEID_ulwrapper ul = new PTEID_ulwrapper(-1); 
    299299 
    300         // martinho: artista 
     300                // martinho: artista 
    301301        long pinId = b & 0x00000000000000FF; 
    302302         
     
    324324     
    325325    public static int UnblockPIN_Ext(byte b, String string, String string1, int i) throws PteidException{ 
    326         return 0; 
     326        return UnblockPIN(b,string, string1); 
    327327    } 
    328328     
     
    433433     
    434434    public static void SetSODChecking(boolean bln) throws PteidException { 
    435     } 
     435        if (readerContext != null) { 
     436            try { 
     437                readerContext.getEIDCard().doSODCheck(bln); 
     438            } catch (Exception ex) { 
     439                throw new PteidException(); 
     440            } 
     441        } 
     442    } 
     443 
    436444 
    437445    public static void SetSODCAs(PTEID_Certif[] pteidcs) throws PteidException { 
     446        if (readerContext != null) { 
     447            try { 
     448                for (PTEID_Certif pcert : pteidcs) { 
     449                    PTEID_ByteArray pba = new PTEID_ByteArray(pcert.certif, pcert.certif.length); 
     450                    readerContext.getEIDCard().getCertificates().addCertificate(pba); 
     451                } 
     452            } catch (Exception ex) { 
     453                throw new PteidException(); 
     454            } 
     455        } 
    438456    } 
    439457