Browse Source

Move getPeerCertificate and getCipher to CryptoStream

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
a473b8dafb
  1. 47
      lib/tls.js
  2. 8
      test/simple/test-securepair-client.js
  3. 4
      test/simple/test-securepair-server.js

47
lib/tls.js

@ -63,6 +63,26 @@ CryptoStream.prototype.end = function(err) {
};
CryptoStream.prototype.getPeerCertificate = function() {
if (this.pair._ssl) {
return this.pair._ssl.getPeerCertificate();
} else {
return null;
}
};
CryptoStream.prototype.getCipher = function(err) {
if (this.pair._ssl) {
return this.pair._ssl.getCurrentCipher();
} else {
return null;
}
};
/**
* Provides a pair of streams to do encrypted communication.
*/
@ -357,24 +377,6 @@ SecurePair.prototype._error = function(err) {
}
};
SecurePair.prototype.getPeerCertificate = function(err) {
if (this._ssl) {
return this._ssl.getPeerCertificate();
} else {
return null;
}
};
SecurePair.prototype.getCipher = function(err) {
if (this._ssl) {
return this._ssl.getCurrentCipher();
} else {
return null;
}
};
// TODO: support anonymous (nocert) and PSK
@ -606,11 +608,10 @@ exports.connect = function(port /* host, options, cb */) {
socket.connect(port, host);
pair.on('secure', function() {
console.log('client: connected+secure!');
console.log('client pair.getPeerCertificate(): %j',
pair.getPeerCertificate());
console.log('client pair.getCipher(): %j',
pair.getCipher());
console.log('client cleartext.getPeerCertificate(): %j',
cleartext.getPeerCertificate());
console.log('client cleartext.getCipher(): %j',
cleartext.getCipher());
if (cb) {
cb(cleartext);

8
test/simple/test-securepair-client.js

@ -89,10 +89,10 @@ function startClient() {
pair.on('secure', function() {
console.log('client: connected+secure!');
console.log('client pair.getPeerCertificate(): %j',
pair.getPeerCertificate());
console.log('client pair.getCipher(): %j',
pair.getCipher());
console.log('client pair.cleartext.getPeerCertificate(): %j',
pair.cleartext.getPeerCertificate());
console.log('client pair.cleartext.getCipher(): %j',
pair.cleartext.getCipher());
setTimeout(function() {
pair.cleartext.write('hello\r\n');
}, 500);

4
test/simple/test-securepair-server.js

@ -35,8 +35,8 @@ var server = net.createServer(function(socket) {
pair.on('secure', function() {
log('connected+secure!');
pair.cleartext.write('hello\r\n');
log(pair.getPeerCertificate());
log(pair.getCipher());
log(pair.cleartext.getPeerCertificate());
log(pair.cleartext.getCipher());
});
pair.cleartext.on('data', function(data) {

Loading…
Cancel
Save