@@ -466,21 +466,3 @@ function authS3(channel, resource) { channel.setRequestHeader("Authorization", authString, false); } } - -function hmacSHA1(data, secret) { - var uconv = CC["@mozilla.org/intl/scriptableunicodeconverter"] - .createInstance(CI.nsIScriptableUnicodeConverter); - uconv.charset = "utf-8"; - - var dataarray = uconv.convertToByteArray(data, []); - - var keyObject = CC["@mozilla.org/security/keyobjectfactory;1"] - .getService(CI.nsIKeyObjectFactory) - .keyFromString(CI.nsIKeyObject.HMAC, secret); - - var cryptoHMAC = CC["@mozilla.org/security/hmac;1"] - .createInstance(CI.nsICryptoHMAC); - cryptoHMAC.init(CI.nsICryptoHMAC.SHA1, keyObject); - cryptoHMAC.update(dataarray, dataarray.length); - return cryptoHMAC.finish(true); -} components/S3Protocol.js @@ -1,4 +1,4 @@ -var EXPORTED_SYMBOLS = ['s3_auth']; +var EXPORTED_SYMBOLS = ['s3_auth', 'hmacSHA1']; var loginManager = Components.classes["@mozilla.org/login-manager;1"] .getService(Components.interfaces.nsILoginManager); @@ -7,6 +7,25 @@ var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginIn Components.interfaces.nsILoginInfo, "init"); +function hmacSHA1(data, secret) { + var uconv = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + uconv.charset = "utf-8"; + + var dataarray = uconv.convertToByteArray(data, []); + + var keyObject = Components.classes["@mozilla.org/security/keyobjectfactory;1"] + .getService(Components.interfaces.nsIKeyObjectFactory) + .keyFromString(Components.interfaces.nsIKeyObject.HMAC, secret); + + var cryptoHMAC = Components.classes["@mozilla.org/security/hmac;1"] + .createInstance(Components.interfaces.nsICryptoHMAC); + cryptoHMAC.init(Components.interfaces.nsICryptoHMAC.SHA1, keyObject); + cryptoHMAC.update(dataarray, dataarray.length); + return cryptoHMAC.finish(true); +} + + function getLogins() { return loginManager.findLogins({}, 'chrome://s3', 'S3 Credentials', null); } modules/auth.js aaabd3753a0104d877fda79773774c96835840fa Jesse Andrews anotherjesse@gmail.com http://github.com/anotherjesse/s3/commit/8ea9277caa72fd1fd66934d46b7158b47bcf7bee 8ea9277caa72fd1fd66934d46b7158b47bcf7bee 2008-09-22T07:58:02-07:00 2008-09-22T07:58:02-07:00 move hmacSHA1 into module so it can be used from chrome 0ee77cf72a879be18e053880548bca60e50969cd Jesse Andrews anotherjesse@gmail.com