Skip to content

Commit 3570f20

Browse files
committed
Merge branch 'crypto-buffers'
2 parents 160e4d0 + 1122e3a commit 3570f20

10 files changed

+1399
-999
lines changed

doc/api/crypto.markdown

+195-144
Large diffs are not rendered by default.

lib/crypto.js

+349-46
Large diffs are not rendered by default.

lib/tls.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,10 @@ exports.connect = function(/* [port, host], options, cb */) {
12961296
});
12971297

12981298
if (options.session) {
1299-
pair.ssl.setSession(options.session);
1299+
var session = options.session;
1300+
if (typeof session === 'string')
1301+
session = new Buffer(session, 'binary');
1302+
pair.ssl.setSession(session);
13001303
}
13011304

13021305
var cleartext = pipe(pair, socket);

0 commit comments

Comments
 (0)