From 2fc957b5c506b671bb762525af2b5ea6b964ff07 Mon Sep 17 00:00:00 2001
From: Mark Donnelly <mark@painless-security.com>
Date: Thu, 9 Jul 2015 14:23:07 -0400
Subject: [PATCH] Rename gssEap to gss

* Rename the GSSEap functions to GSS
* Renanme navigator.gssEap.js to navigator.gss.js
---
 browsers/chrome/CMakeLists.txt                         |  2 +-
 browsers/chrome/gssweb/manifest.json                   |  2 +-
 .../common/{navigator.gssEap.js => navigator.gss.js}   | 18 +++++++++---------
 browsers/firefox/CMakeLists.txt                        |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename browsers/common/{navigator.gssEap.js => navigator.gss.js} (96%)

diff --git a/browsers/chrome/CMakeLists.txt b/browsers/chrome/CMakeLists.txt
index 8a30cd5..a4f6bc4 100644
--- a/browsers/chrome/CMakeLists.txt
+++ b/browsers/chrome/CMakeLists.txt
@@ -43,6 +43,6 @@ add_custom_target( gssweb.crx ALL
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gssweb/background.js gssweb/background.js
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/contentscript.js gssweb/contentscript.js
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gssweb/manifest.json gssweb/manifest.json
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js gssweb/navigator.gss.js
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gss.js gssweb/navigator.gss.js
   ${BUILD_CRX}
 )
diff --git a/browsers/chrome/gssweb/manifest.json b/browsers/chrome/gssweb/manifest.json
index 81bce93..e7c8987 100644
--- a/browsers/chrome/gssweb/manifest.json
+++ b/browsers/chrome/gssweb/manifest.json
@@ -22,6 +22,6 @@
    "permissions": [ "nativeMessaging" ],
    "version": "1.0",
    "web_accessible_resources": [
-      "navigator.gssEap.js"
+      "navigator.gss.js"
    ]
 }
diff --git a/browsers/common/navigator.gssEap.js b/browsers/common/navigator.gss.js
similarity index 96%
rename from browsers/common/navigator.gssEap.js
rename to browsers/common/navigator.gss.js
index bb04d98..f23915d 100644
--- a/browsers/common/navigator.gssEap.js
+++ b/browsers/common/navigator.gss.js
@@ -44,9 +44,9 @@ navigator.generateNonce = function() {
 
 /* This file gets injected into the web page verbatim */
 
-var GSSEap = (function () 
+var GSS = (function () 
   {
-    function GSSEap(config)
+    function GSS(config)
     {
         // Public attributes
         this.version = "0.0.1";
@@ -64,7 +64,7 @@ var GSSEap = (function ()
             this.dispatch_responses.bind(this)
         );
     }
-    GSSEap.prototype.dispatch_responses = function (event) 
+    GSS.prototype.dispatch_responses = function (event) 
     {
         var method;
         var nonce;
@@ -127,7 +127,7 @@ var GSSEap = (function ()
     };
 
 
-    GSSEap.prototype.init_sec_context = function (params) 
+    GSS.prototype.init_sec_context = function (params) 
     {
         /* variables */
         // internal variables
@@ -192,7 +192,7 @@ var GSSEap = (function ()
         
     };
 
-    GSSEap.prototype.display_name = function(params)
+    GSS.prototype.display_name = function(params)
     {
         /* Variables */
         // required parameters
@@ -236,7 +236,7 @@ var GSSEap = (function ()
         
     }
 
-    GSSEap.prototype.import_name = function (params) 
+    GSS.prototype.import_name = function (params) 
     {
         /* variables */
         // internal variables
@@ -292,7 +292,7 @@ var GSSEap = (function ()
         
     };
 
-    GSSEap.prototype.gss_error = function (major) 
+    GSS.prototype.gss_error = function (major) 
     {
         var callingMask;
         var routineMask;
@@ -304,8 +304,8 @@ var GSSEap = (function ()
 
         return (0 != (major & mask));
     };
-    return GSSEap;
+    return GSS;
 })();
 
 
-navigator.gss = GSSEap;
+navigator.gss = GSS;
diff --git a/browsers/firefox/CMakeLists.txt b/browsers/firefox/CMakeLists.txt
index 109e3a2..670572e 100644
--- a/browsers/firefox/CMakeLists.txt
+++ b/browsers/firefox/CMakeLists.txt
@@ -39,7 +39,7 @@ add_custom_target( gssweb.xpi ALL
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/harness-options.json harness-options.json
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/bootstrap.js bootstrap.js
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/defaults/preferences/prefs.js defaults/preferences/prefs.js
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js chrome/content/navigator.gss.js
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gss.js chrome/content/navigator.gss.js
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/chrome.manifest chrome.manifest
-  COMMAND zip gssweb.xpi locales.json resources/gssweb/lib/main.js ./resources/gssweb/data/contentscript.js ./install.rdf ./harness-options.json ./bootstrap.js ./defaults/preferences/prefs.js ./chrome/content/navigator.gssEap.js ./chrome.manifest
+  COMMAND zip gssweb.xpi locales.json resources/gssweb/lib/main.js ./resources/gssweb/data/contentscript.js ./install.rdf ./harness-options.json ./bootstrap.js ./defaults/preferences/prefs.js ./chrome/content/navigator.gss.js ./chrome.manifest
 )
-- 
2.1.4