summaryrefslogtreecommitdiff
path: root/js/bin/HttpServer.js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-04-07 19:24:08 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-04-07 19:24:08 +0200
commit92b20f89662b327edf8f732d082d9fd07da9c665 (patch)
tree1224af8f2d610322a2ab6520471c503af0e20fe0 /js/bin/HttpServer.js
parentFixed IceSSL OpenSSL bug which could cause a crash when loading a certificate... (diff)
downloadice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.bz2
ice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.xz
ice-92b20f89662b327edf8f732d082d9fd07da9c665.zip
ICE-6382: removed iceca and fixed makecerts.py to depend on IceCertUtils PyPI package
Diffstat (limited to 'js/bin/HttpServer.js')
-rw-r--r--js/bin/HttpServer.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js
index 45ed32f6740..a8e28dd6d84 100644
--- a/js/bin/HttpServer.js
+++ b/js/bin/HttpServer.js
@@ -237,8 +237,7 @@ function Init()
}
var options = {
passphrase: "password",
- key: fs.readFileSync(path.join(baseDir, "s_rsa1024_priv.pem")),
- cert: fs.readFileSync(path.join(baseDir, "s_rsa1024_pub.pem"))
+ pfx: fs.readFileSync(path.join(baseDir, "server.p12")),
};
var httpServer = http.createServer();