wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

use a scriptableinputstream to correctly read openssl output

Browse Source
This commit is contained in:
Dan Mills 2008-02-19 20:53:01 -08:00
parent 5efa6b7b5f
commit 350adaed51
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
services/sync/modules/crypto.js
View File

@ -120,7 +120,10 @@ WeaveCrypto.prototype = {
let args = [wrap, Utils.getTmp().path, bin];
args = args.concat(arguments);
return Utils.runCmd.apply(null, args);
let rv = Utils.runCmd.apply(null, args);
if (rv != 0)
throw "openssl did not run successfully, error code " + rv;
},
_opensslPBE: function Crypto__openssl(op, algorithm, input, password) {
@ -129,10 +132,6 @@ WeaveCrypto.prototype = {
inputFOS.write(input, input.length);
inputFOS.close();
let outputFile = Utils.getTmp("output");
if (outputFile.exists())
outputFile.remove(false);
// nsIProcess doesn't support stdin, so we write a file instead
let passFile = Utils.getTmp("pass");
let [passFOS] = Utils.open(passFile, ">", PERMS_PASSFILE);
@ -142,7 +141,6 @@ WeaveCrypto.prototype = {
try {
this._openssl(algorithm, op, "-a", "-salt", "-in", "input",
"-out", "output", "-pass", "file:pass");
// FIXME: check rv
} catch (e) {
throw e;
@ -152,6 +150,7 @@ WeaveCrypto.prototype = {
inputFile.remove(false);
}
let outputFile = Utils.getTmp("output");
let [outputFIS] = Utils.open(outputFile, "<");
let ret = Utils.readStream(outputFIS);
outputFIS.close();
@ -169,8 +168,7 @@ WeaveCrypto.prototype = {
if (outputFile.exists())
outputFile.remove(false);
let rv = this._openssl("rand", "-base64", "-out", "output", length);
// FIXME: check rv
this._openssl("rand", "-base64", "-out", "output", length);
let [outputFIS] = Utils.open(outputFile, "<");
let ret = Utils.readStream(outputFIS);
@ -191,16 +189,14 @@ WeaveCrypto.prototype = {
if (privKeyF.exists())
privKeyF.remove(false);
let rv = this._openssl("genrsa", "-out", "privkey.pem", bits);
// FIXME: check rv
this._openssl("genrsa", "-out", "privkey.pem", bits);
let pubKeyF = Utils.getTmp("pubkey.pem");
if (pubKeyF.exists())
pubKeyF.remove(false);
rv = this._openssl("rsa", "-in", "privkey.pem", "-out", "pubkey.pem",
"-outform", "PEM", "-pubout");
// FIXME: check rv
this._openssl("rsa", "-in", "privkey.pem", "-out", "pubkey.pem",
"-outform", "PEM", "-pubout");
let cryptedKeyF = Utils.getTmp("enckey.pem");
if (cryptedKeyF.exists())
@ -213,11 +209,12 @@ WeaveCrypto.prototype = {
passFOS.close();
try {
rv = this._openssl("pkcs8", "-in", "privkey.pem", "-out", "enckey.pem",
"-topk8", "-v2", algorithm, "-pass", "file:pass");
// FIXME: check rv
this._openssl("pkcs8", "-in", "privkey.pem", "-out", "enckey.pem",
"-topk8", "-v2", algorithm, "-pass", "file:pass");
} catch (e) {
throw e;
} finally {
passFile.remove(false);
privKeyF.remove(false);
@ -252,9 +249,8 @@ WeaveCrypto.prototype = {
if (outputFile.exists())
outputFile.remove(false);
let rv = this._openssl("rsautl", "-encrypt", "-pubin", "-inkey", "key",
"-in", "input", "-out", "output");
// FIXME: check rv
this._openssl("rsautl", "-encrypt", "-pubin", "-inkey", "key",
"-in", "input", "-out", "output");
let [outputFIS] = Utils.open(outputFile, "<");
let output = Utils.readStream(outpusFIS);
@ -287,11 +283,12 @@ WeaveCrypto.prototype = {
passFOS.close();
try {
let rv = this._openssl("rsautl", "-decrypt", "-inkey", "key", "-pass",
"file:pass", "-in", "input", "-out", "output");
// FIXME: check rv
this._openssl("rsautl", "-decrypt", "-inkey", "key", "-pass",
"file:pass", "-in", "input", "-out", "output");
} catch(e) {
throw e;
} finally {
passFile.remove(false);
}

23
services/sync/modules/util.js
View File

@ -221,10 +221,12 @@ let Utils = {
case "<": {
if (!file.exists())
throw "Cannot open file for reading, file does not exist";
stream = Cc["@mozilla.org/network/file-input-stream;1"].
let fis = Cc["@mozilla.org/network/file-input-stream;1"].
createInstance(Ci.nsIFileInputStream);
stream.init(file, MODE_RDONLY, perms, 0);
stream.QueryInterface(Ci.nsILineInputStream);
fis.init(file, MODE_RDONLY, perms, 0);
stream = Cc["@mozilla.org/scriptableinputstream;1"].
createInstance(Ci.nsIScriptableInputStream);
stream.init(fis);
} break;
case ">": {
@ -246,14 +248,15 @@ let Utils = {
return [stream, file];
},
readStream: function Weave_readStream(fis) {
let data = "";
while (fis.available()) {
let ret = {};
fis.readLine(ret);
data += ret.value;
// assumes an nsIScriptableInputStream
readStream: function Weave_readStream(is) {
let ret = "";
let chunk = is.read(4096);
while (chunk.length > 0) {
ret += chunk;
chunk = is.read(4096);
}
return data;
return ret;
},
/*