Changeset 66

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:

• applayer/miniz.c (modified) (1 diff)
• cardlayerTool/dumpcontents.cpp (modified) (1 diff)
• eidlib/eidlibCard.cpp (modified) (2 diffs)
• eidlibJava_Wrapper/GeneratedFiles/pteid.java (modified) (3 diffs)

middleware-offline/trunk/_src/eidmw/applayer/miniz.c

@@ -179 +179 @@
 
 // For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members.
-typedef unsigned long mz_ulong;
+typedef unsigned int mz_ulong;
 
 // Heap allocation callbacks.

middleware-offline/trunk/_src/eidmw/cardlayerTool/dumpcontents.cpp

@@ -144 +144 @@
 static long DumpPteidContents(CReader &oReader)
 {
-        printf("Type: BE eID\n");
+        printf("Type: PT eID\n");
         printf("Version: %0x\n", oReader.GetInfo().GetByte(21));
 

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

@@ -1519 +1519 @@
 PTEIDSDK_API long PTEID_UnblockPIN_Ext(unsigned char PinId,     char *pszPuk, char *pszNewPin, long *triesLeft, unsigned long ulFlags){
         if (readerContext!=NULL){
-
-        }
-
-        return 0;
+                return PTEID_UnblockPIN(PinId,  pszPuk,pszNewPin,triesLeft);
+        }
+
+        return -1;
 }
 
@@ -1622 +1622 @@
 }
 
-PTEIDSDK_API long PTEID_SetSODCAs( PTEID_Certifs *Certifs){
-        if (readerContext!=NULL){
-
+PTEIDSDK_API long PTEID_SetSODCAs(PTEID_Certifs *Certifs){
+        if (readerContext!=NULL){
+                for(int i=0;i<Certifs->certificatesLength;i++){
+                        PTEID_ByteArray *pba = new PTEID_ByteArray(Certifs->certificates[i].certif,Certifs->certificates[i].certifLength);
+                        readerContext->getEIDCard().getCertificates().addCertificate(*pba);
+                        delete pba;
+                }
         }
 

middleware-offline/trunk/_src/eidmw/eidlibJava_Wrapper/GeneratedFiles/pteid.java

@@ -298 +298 @@
         PTEID_ulwrapper ul = new PTEID_ulwrapper(-1);
 
-        // martinho: artista
+                // martinho: artista
         long pinId = b & 0x00000000000000FF;
         
@@ -324 +324 @@
     
     public static int UnblockPIN_Ext(byte b, String string, String string1, int i) throws PteidException{
-        return 0;
+        return UnblockPIN(b,string, string1);
     }
     
@@ -433 +433 @@
     
     public static void SetSODChecking(boolean bln) throws PteidException {
-    }
+        if (readerContext != null) {
+            try {
+                readerContext.getEIDCard().doSODCheck(bln);
+            } catch (Exception ex) {
+                throw new PteidException();
+            }
+        }
+    }
+
 
     public static void SetSODCAs(PTEID_Certif[] pteidcs) throws PteidException {
+        if (readerContext != null) {
+            try {
+                for (PTEID_Certif pcert : pteidcs) {
+                    PTEID_ByteArray pba = new PTEID_ByteArray(pcert.certif, pcert.certif.length);
+                    readerContext.getEIDCard().getCertificates().addCertificate(pba);
+                }
+            } catch (Exception ex) {
+                throw new PteidException();
+            }
+        }
     }