Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb

Conflicts:
	browsers/chrome/CMakeLists.txt
	browsers/firefox/CMakeLists.txt

diff --git a/browsers/chrome/CMakeLists.txt b/browsers/chrome/CMakeLists.txt
index 4e5bb73..c438219 100644 (file)
--- a/browsers/chrome/CMakeLists.txt
+++ b/browsers/chrome/CMakeLists.txt
@@ -12,6 +12,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.gssEap.js
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js gssweb/navigator.gss.js
   ${BUILD_CRX}
 )

diff --git a/browsers/chrome/host/com.painlesssecurity.jsongss.json b/browsers/chrome/host/com.painlesssecurity.jsongss.json
index 221e19b..7fd7122 100644 (file)
--- a/browsers/chrome/host/com.painlesssecurity.jsongss.json
+++ b/browsers/chrome/host/com.painlesssecurity.jsongss.json
@@ -1,7 +1,7 @@
 {
   "name": "com.painlesssecurity.jsongss",
   "description": "GSSAPI Extension",
-  "path": "/home/mark/projects/gssweb.git/json_gssapi/debug/json_gssapi",
+  "path": "/home/margaret/moonshot/gssweb/json_gssapi/build/json_gssapi",
   "type": "stdio",
   "allowed_origins": [
     "chrome-extension://bhaockekcfjjdmbalaanalballokgedd/"

diff --git a/browsers/common/contentscript.js b/browsers/common/contentscript.js
index d12731e..b425ad3 100644 (file)
--- a/browsers/common/contentscript.js
+++ b/browsers/common/contentscript.js
@@ -49,12 +49,12 @@ if ("undefined" != typeof(chrome) &&
 {
   // Running in chrome
   browser = "Chrome"; 
-  gss_script_name = chrome.extension.getURL('navigator.gssEap.js');
+  gss_script_name = chrome.extension.getURL('navigator.gss.js');
   port = chrome.runtime.connect({name: "com.painlesssecurity.gssweb"});
 } else {
   // Firefox
   browser = "Firefox";
-  gss_script_name = 'chrome://gssweb/content/navigator.gssEap.js';
+  gss_script_name = 'chrome://gssweb/content/navigator.gss.js';
 }
 
 addScript( gss_script_name );

diff --git a/browsers/common/navigator.gssEap.js b/browsers/common/navigator.gss.js
similarity index 99%
rename from browsers/common/navigator.gssEap.js
rename to browsers/common/navigator.gss.js
index 93f7496..bb04d98 100644 (file)
--- a/browsers/common/navigator.gssEap.js
+++ b/browsers/common/navigator.gss.js
@@ -32,7 +32,7 @@
  *
  */
 
-console.log('Loading navigator.gssEap.js - #1');
+console.log('Loading navigator.gss.js - #1');
 
 navigator.generateNonce = function() {
   // TODO: Make sure that we don't have a collision!
@@ -308,4 +308,4 @@ var GSSEap = (function ()
 })();
 
 
-navigator.gssEap = GSSEap;
+navigator.gss = GSSEap;

diff --git a/browsers/firefox/CMakeLists.txt b/browsers/firefox/CMakeLists.txt
index d43d98a..a518379 100644 (file)
--- a/browsers/firefox/CMakeLists.txt
+++ b/browsers/firefox/CMakeLists.txt
@@ -8,7 +8,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.gssEap.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}/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
 )

diff --git a/browsers/test/test.html b/browsers/test/test.html
index 7896845..cf1d6ef 100644 (file)
--- a/browsers/test/test.html
+++ b/browsers/test/test.html
@@ -179,7 +179,7 @@
       }
 
       function doImportName() {
-        gss = gss || new navigator.gssEap({
+        gss = gss || new navigator.gss({
           appTag: "TestApp"
         });
         gss.error = function(major, minor, errMsg, appTag) 
@@ -204,7 +204,7 @@
       } // doImportName
 
       function doDisplayName() {
-        gss = gss || new navigator.gssEap({
+        gss = gss || new navigator.gss({
           appTag: "TestApp"
         });
         gss.error = function(major, minor, errMsg, appTag) 
@@ -236,7 +236,7 @@
 
 
       function doAcquireCred() {
-        gss = gss || new navigator.gssEap({
+        gss = gss || new navigator.gss({
           appTag: "TestApp"
         });
         gss.error = function(major, minor, errMsg, appTag) 
@@ -268,7 +268,7 @@
        *  Call the init_sec_context routine
        ********************************************************/
       function doInitSecContext() {
-        gss = gss || new navigator.gssEap({
+        gss = gss || new navigator.gss({
           appTag: "TestApp",
         });
         gss.error = function(major, minor, errMsg, appTag) 

diff --git a/json_gssapi/src/commands/GSSAcquireCred.cpp b/json_gssapi/src/commands/GSSAcquireCred.cpp
index c80db63..086a4a2 100644 (file)
--- a/json_gssapi/src/commands/GSSAcquireCred.cpp
+++ b/json_gssapi/src/commands/GSSAcquireCred.cpp
@@ -41,7 +41,8 @@
 GSSAcquireCred::GSSAcquireCred(gss_acq_cred_type fn) : function(fn)
 {
   desired_name = GSS_C_NO_NAME;
-  desiredMechs.addOID( GSSOID((char *)"{ 1 3 6 1 5 5 15 1 1 18 }") );
+  // Use OID for eap-aes128 by default
+  desiredMechs.addOID( GSSOID((char *)"{ 1 3 6 1 5 5 15 1 1 17 }") );
 }
 
 GSSAcquireCred::GSSAcquireCred ( const GSSAcquireCred& other )

diff --git a/json_gssapi/src/commands/GSSInitSecContext.h b/json_gssapi/src/commands/GSSInitSecContext.h
index a3454e3..4761b1b 100644 (file)
--- a/json_gssapi/src/commands/GSSInitSecContext.h
+++ b/json_gssapi/src/commands/GSSInitSecContext.h
@@ -81,7 +81,7 @@ public:
     bool loadParameters(JSONObject *params);
     bool zeroOut(bool initialized = true);
     
-    // MRW -- make more accessors, make vars w/accessors private
+    // MRW -- make more accessors, make vars w/accessors private, or get rid of them?
     // accessors
     OM_uint32 getReqFlags() { return req_flags; }
     OM_uint32 getTimeReq() { return time_req; }

diff --git a/navigator.gssweb.js b/navigator.gssweb.js
index cd17389..61a61ed 100644 (file)
--- a/navigator.gssweb.js
+++ b/navigator.gssweb.js
@@ -1,3 +1,36 @@
+/*
+ * Copyright (c) 2015, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 console.log("Loading navigator.gssweb.js - #4");