Revert "Remove PKCS11 module from Firefox"

This reverts commit 4118e4c.

Signed-off-by: Raul Metsma <[email protected]>

install/web-eid.wxs

@@ -113,17 +113,11 @@
             <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.json"
               Key="SOFTWARE\Google\Chrome\NativeMessagingHosts\eu.webeid"/>
           </Component>
-          <Component Id="Firefox" Transitive="yes" Guid="f60c4395-0952-4bc4-a09e-661341c19d2c">
+          <Component Id="Firefox" Transitive="yes">
             <Condition><![CDATA[(FIREFOXINSTALL = 1)]]></Condition>
             <File Source="$(var.jsonfirefox)"/>
-            <File Source="$(var.install_path)\onepinopenscpkcs11-win.json" Name="onepinopenscpkcs11.json"/>
-            <File Source="$(var.install_path)\idemiaawppkcs11-win.json" Name="idemiaawppkcs11.json"/>
             <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.firefox.json"
               Key="SOFTWARE\Mozilla\NativeMessagingHosts\eu.webeid" />
-            <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]onepinopenscpkcs11.json"
-              Key="Software\Mozilla\PKCS11Modules\onepinopenscpkcs11" />
-            <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]idemiaawppkcs11.json"
-              Key="Software\Mozilla\PKCS11Modules\idemiaawppkcs11" />
           </Component>
 <?ifdef var.qt_path ?>
           <Directory Id="platforms" Name="platforms" FileSource="$(var.qt_path)\..\plugins\platforms">

src/app/CMakeLists.txt

@@ -36,7 +36,6 @@ if(WIN32)
         -dqt_suffix="$<$<CONFIG:Debug>:d>"
         -djson=${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
         -djsonfirefox=${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.firefox.json
-        -dinstall_path=${CMAKE_SOURCE_DIR}/install
         -dFIREFOX_URL="${FIREFOX_URL}"
         -dFIREFOX_UUID="${FIREFOX_UUID}"
         -dapp_path=$<TARGET_FILE:web-eid>
@@ -93,10 +92,6 @@ elseif(APPLE)
         DESTINATION "/Library/Google/Chrome/NativeMessagingHosts")
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.firefox.json COMPONENT firefox
         DESTINATION "/Library/Application Support/Mozilla/NativeMessagingHosts" RENAME eu.webeid.json)
-    install(FILES ${CMAKE_SOURCE_DIR}/install/onepinopenscpkcs11-mac.json COMPONENT firefox
-        DESTINATION "/Library/Application Support/Mozilla/PKCS11Modules" RENAME onepinopenscpkcs11.json)
-    install(FILES ${CMAKE_SOURCE_DIR}/install/idemiaawppkcs11-mac.json COMPONENT firefox
-        DESTINATION "/Library/Application Support/Mozilla/PKCS11Modules" RENAME idemiaawppkcs11.json)
     install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json COMPONENT chrome
         DESTINATION "/Library/Application Support/Google/Chrome/External Extensions")
     add_custom_target(macdeployqt DEPENDS web-eid