From 36acf11e5f48dc5537a786125766f0918725b64c Mon Sep 17 00:00:00 2001 From: Margaret Wasserman Date: Fri, 29 May 2015 16:17:22 -0400 Subject: [PATCH] Change gssEAP to gss in navigator.gss(Eap).js and make corresponding changes. Change default mechanism OID to eap-aes128. --- browsers/chrome/CMakeLists.txt | 2 +- browsers/common/contentscript.js | 4 ++-- browsers/common/{navigator.gssEap.js => navigator.gss.js} | 4 ++-- browsers/firefox/CMakeLists.txt | 2 +- browsers/test/test.html | 8 ++++---- json_gssapi/src/commands/GSSAcquireCred.cpp | 3 ++- json_gssapi/src/commands/GSSInitSecContext.h | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) rename browsers/common/{navigator.gssEap.js => navigator.gss.js} (99%) diff --git a/browsers/chrome/CMakeLists.txt b/browsers/chrome/CMakeLists.txt index 31357e9..a5e42f2 100644 --- a/browsers/chrome/CMakeLists.txt +++ b/browsers/chrome/CMakeLists.txt @@ -13,7 +13,7 @@ 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.gss.js gssweb/navigator.gss.js ${COPY_CRX_PEM} ${BUILD_CRX} ) diff --git a/browsers/common/contentscript.js b/browsers/common/contentscript.js index d12731e..b425ad3 100644 --- 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 --- 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 f034f76..7d3e32d 100644 --- a/browsers/firefox/CMakeLists.txt +++ b/browsers/firefox/CMakeLists.txt @@ -4,7 +4,7 @@ add_custom_target( gssweb.xpi ALL COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/package.json package.json COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/chrome.manifest chrome.manifest COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/main.js lib/main.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.gss.js chrome/content/navigator.gss.js COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/contentscript.js data/contentscript.js COMMAND cfx xpi ) diff --git a/browsers/test/test.html b/browsers/test/test.html index 7896845..cf1d6ef 100644 --- 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 --- 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 --- 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; } -- 2.1.4