mirror of https://github.com/nodejs/node.git
Pass secureProtocol through on tls.Server creation
The secureProtocol option to building the SSL context was not being properly passed through in the credentials in the tls code. This is fixed.v0.7.4-release
parent
90348a616d
commit
d0e84b0088
|
@ -723,6 +723,7 @@ function Server(/* [options], listener */) {
|
||||||
key: self.key,
|
key: self.key,
|
||||||
cert: self.cert,
|
cert: self.cert,
|
||||||
ca: self.ca,
|
ca: self.ca,
|
||||||
|
secureProtocol: self.secureProtocol,
|
||||||
crl: self.crl
|
crl: self.crl
|
||||||
});
|
});
|
||||||
//creds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
|
//creds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
|
||||||
|
@ -792,6 +793,7 @@ Server.prototype.setOptions = function(options) {
|
||||||
if (options.key) this.key = options.key;
|
if (options.key) this.key = options.key;
|
||||||
if (options.cert) this.cert = options.cert;
|
if (options.cert) this.cert = options.cert;
|
||||||
if (options.ca) this.ca = options.ca;
|
if (options.ca) this.ca = options.ca;
|
||||||
|
if (options.secureProtocol) this.secureProtocol = options.secureProtocol;
|
||||||
if (options.crl) this.crl = options.crl;
|
if (options.crl) this.crl = options.crl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue