Changeset 63

Timestamp:

02/22/12 00:32:32 (9 years ago)

Author:

vsilva

Message:

Fix SDK show window parameter, improve xades sdk

Location:

middleware-offline/trunk/_src

Files:

• ThirdParty/libcurl-7.24/bin/libcurl.dll (added)
• ThirdParty/libcurl-7.24/include/curl (added)
• ThirdParty/libcurl-7.24/lib/libcurl.exp (added)
• ThirdParty/libcurl-7.24/lib/libcurl.lib (added)
• eidmw/eidgui/AutoUpdates.cpp (modified) (1 diff)
• eidmw/eidgui/dlgsignature.cpp (modified) (7 diffs)
• eidmw/eidgui/dlgsignature.h (modified) (1 diff)
• eidmw/eidlib/eidlib.h (modified) (1 diff)
• eidmw/eidlib/eidlib.i (modified) (1 diff)
• eidmw/eidlib/eidlibxades.cpp (modified) (1 diff)
• eidmw/eidlibJava_Wrapper/create_java_files.sh (modified) (1 diff)
• eidmw/mdw_online_patches/apply_patches.sh (modified) (1 diff)

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

@@ -347 +347 @@
 
 #ifdef WIN32
-        if (arch == "x86_64")
+        if (arch == "i386")
         {
                 pkgname.append("PteidMW35-Basic-en.msi");

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

@@ -57 +57 @@
                         this->resize(thiswidth,height-20); //make sure the window fits
                 }
+                
+                /* QVBoxLayout *layout = new QVBoxLayout;
+        this->setLayout(layout);
+
+                this->layout()->setSizeConstraint(QLayout::SetFixedSize);
+                this->setSizeGripEnabled(false); */
 
         }
@@ -127 +133 @@
         QMenu *myMenu = new QMenu(ui.listView);
         //myMenu->addAction("Remove Item");
-        QAction *_open = new QAction("Remove", this);
-        myMenu->addAction(_open);
-        connect( _open, SIGNAL( triggered() ), this, SLOT( RemoveFromView() ) );
+        QAction *_remove = new QAction("Remove", this);
+        myMenu->addAction(_remove);
+        connect( _remove, SIGNAL( triggered() ), this, SLOT( RemoveFromView() ) );
         QAction* selectedItem = myMenu->exec(globalPos);
-
 
         /*if (selectedItem)
@@ -197 +202 @@
             connect(&this->FutureWatcher, SIGNAL(finished()), pdialog, SLOT(cancel()));
 
-            int outp_len = native_path.size();
+                //Get the Xades-T checkbox value
+                QCheckBox *xades_t = ui.checkBox;
+                bool is_xades_t = xades_t->checkState() == Qt::Checked;
             
 
@@ -205 +212 @@
                 strcpy(output_file,(char*)native_path.toStdString().c_str());
 #else
+                int outp_len = native_path.size(); 
                 output_file =  new char[outp_len*2];
             strncpy(output_file, native_path.toUtf8().constData(), outp_len*2);
 #endif      
             PTEID_LOG(PTEID_LOG_LEVEL_DEBUG, "eidgui", "Save to file %s", output_file);
-            QFuture<void> future = QtConcurrent::run(this, &dlgSignature::runsign, files_to_sign, i, output_file);
+            QFuture<void> future = QtConcurrent::run(this, &dlgSignature::runsign, files_to_sign, i, output_file, is_xades_t);
             this->FutureWatcher.setFuture(future);
 
@@ -227 +235 @@
 }
 
-void dlgSignature::runsign(const char ** paths, unsigned int n_paths, const char *output_path)
-{
-    unsigned long       ReaderStartIdx = 1;
-    bool                bRefresh = false;
-    //unsigned long     ReaderEndIdx   = ReaderSet.readerCount(bRefresh);
-    unsigned long       ReaderIdx          = 0;
+void dlgSignature::runsign(const char ** paths, unsigned int n_paths, const char *output_path, bool timestamp)
+{
 
     try
@@ -238 +242 @@
             PTEID_EIDCard*      Card = dynamic_cast<PTEID_EIDCard*>(m_CI_Data.m_pCard);
             PTEID_ByteArray SignXades;
-            SignXades = Card->SignXadesT(paths, n_paths, output_path);
+                        if (timestamp)
+                                SignXades = Card->SignXadesT(paths, n_paths, output_path);
+                        else
+                                SignXades = Card->SignXades(paths, n_paths, output_path);
         
     }
@@ -247 +254 @@
     }
 
-    //pdialog->close();
-
     return;
 }

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

@@ -53 +53 @@
 
     void SignListView (QStringList list);
-    void runsign(const char ** paths, unsigned int n_paths, const char *output_path);
+    void runsign(const char ** paths, unsigned int n_paths, const char *output_path, bool timestamp);
 
 };

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

@@ -776 +776 @@
         public:
         PTEIDSDK_API static bool VerifySignature(const char *container, char * error_buffer, unsigned long *error_size);
+        PTEIDSDK_API static bool VerifySignature(const char *container, char * error_buffer, unsigned long &error_size);
 
 };

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

@@ -530 +530 @@
 
 %typemap(javain) const unsigned char* "$javainput"
+
+%ignore eIDMW::PTEID_SigVerifier::VerifySignature(const char *container, char * error_buffer, unsigned long *error_size);
+
+%typemap(javaout) bool eIDMW::PTEID_SigVerifier::VerifySignature(const char *container, char * error_buffer, unsigned long &error_size)
+{
+
+          long          error_size_internal  = pteidlibJava_WrapperJNI.new_ulongp();
+          boolean       retval     = pteidlibJava_WrapperJNI.PTEID_SigVerifier_VerifySignature(container, error_buffer, error_size_internal);
+          
+          error_size.m_long = pteidlibJava_WrapperJNI.ulongp_value(error_size_internal);
+          pteidlibJava_WrapperJNI.delete_ulongp(error_size_internal);
+          return retval;
+}
+
+%typemap(in) const char * const * (jint size) {
+
+    int i = 0;
+    size = jenv->GetArrayLength($input);
+    $1 = (char **) malloc((size+1)*sizeof(char *));
+    /* make a copy of each string */
+    for (i = 0; i<size; i++) {
+        jstring j_string = (jstring)jenv->GetObjectArrayElement($input, i);
+        const char * c_string = jenv->GetStringUTFChars( j_string, 0);
+        $1[i] = (char*) malloc((strlen(c_string)+1)*sizeof(char));
+        strcpy($1[i], c_string);
+        jenv->ReleaseStringUTFChars(j_string, c_string);
+        jenv->DeleteLocalRef(j_string);
+    }
+    $1[i] = 0;
+
+}
 
 //------------------------------------------------

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

@@ -33 +33 @@
 }
 
+bool PTEID_SigVerifier::VerifySignature(const char *container_path, char * error_buffer, unsigned long &error_size)
+{
+        bool res = false;
+
+        res = APLVerifySignature(container_path, error_buffer, &error_size);
+        return res;
+
+}
 
 PTEID_ByteArray PTEID_EIDCard::SignXades(const char * const* paths, unsigned int n_paths, const char *output_path)

middleware-offline/trunk/_src/eidmw/eidlibJava_Wrapper/create_java_files.sh

@@ -1 @@
-swig -c++ -java -package be.portugal.eid -o ./GeneratedFiles/eidlibJava_Wrapper.cpp -outdir ./GeneratedFiles ../eidlib/eidlib.i 
+swig -c++ -java -package pt.gov.cartaodecidadao -o ./GeneratedFiles/eidlibJava_Wrapper.cpp -outdir ./GeneratedFiles ../eidlib/eidlib.i 

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