Fix compatibility with Firefox 47

IB-4406
open-eid · Jun 15, 2016 · b3e6aa7 · b3e6aa7
1 parent 96103dd
commit b3e6aa7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ deploy:
   provider: releases
   api_key:
     secure: hwaRWJU65JSKQLOlm7hi2hgbpMLh0C248AGlT1JEczM2tbS4pZt1HdkGPy9gMvgd0ohzkEPkzxt2F8DJ7OTMMGiVIDuvFoji9QsGHNFKx38bm8ZwgA/vjX0mbNDHwUIm5cIzAfGZyY7U7Ty91rJOJGhbeVw8PRo9D4+pGHkQ/H4=
-  file: firefox-pkcs11-loader_${VERSION}.0.xpi
+  file: firefox-pkcs11-loader_${VERSION}.xpi
   skip_cleanup: true
   on:
     tags: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-set(BUILD_VER 0)
-if($ENV{BUILD_NUMBER})
-    set(BUILD_VER $ENV{BUILD_NUMBER})
-endif()
-project(firefox-pkcs11-loader VERSION 3.11.0.${BUILD_VER} LANGUAGES NONE)
+project(firefox-pkcs11-loader VERSION 3.12.0 LANGUAGES NONE)
 
 set(FF_MAX_VERSION "*" CACHE STRING "Firefox max version")
 set(UUID "{aa84ce40-4253-a00a-8cd6-0800200f9a66}" CACHE STRING "Extension UUID")

diff --git a/chrome/content/pkcs11-loader.js b/chrome/content/pkcs11-loader.js
@@ -24,8 +24,7 @@
   var pkcs11db = Cc["@mozilla.org/security/pkcs11moduledb;1"].createInstance(Ci.nsIPKCS11ModuleDB);
   var pkcs11 = Cc["@mozilla.org/security/pkcs11;1"].getService(Ci.nsIPKCS11);
   var httpHandler = Cc["@mozilla.org/network/protocol;1?name=http"].getService(Ci.nsIHttpProtocolHandler);
-  //var bits = (httpHandler.oscpu.indexOf(" x86_64") < 0 && httpHandler.oscpu.indexOf(" x64") < 0) ? 32 : 64;
-  var log = function(message) { Application.console.log(message); }
+  var log = function(message) { console.log(message); }
 
   log("Loading extension " + EstEidModName);