kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Using NewSessionCallback for bssl client.

Browse Source 
TLS 1.3 requires callers use the callback rather than SSL_get_session.

Change-Id: I2caae70e641b102ce93256c847c178871bf78bac
Reviewed-on: https://boringssl-review.googlesource.com/9076
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Steven Valdez 2016-08-02 15:59:26 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent a70de147ff
commit 7b689f6b9e
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tool/client.cc
View File

@ -119,6 +119,21 @@ static void KeyLogCallback(const SSL *ssl, const char *line) {
fflush(g_keylog_file); fflush(g_keylog_file);
} }
static ScopedBIO session_out;
static int NewSessionCallback(SSL *ssl, SSL_SESSION *session) {
if (session_out) {
if (!PEM_write_bio_SSL_SESSION(session_out.get(), session) ||
BIO_flush(session_out.get()) <= 0) {
fprintf(stderr, "Error while saving session:\n");
ERR_print_errors_cb(PrintErrorCallback, stderr);
return 0;
}
}
return 0;
}
bool Client(const std::vector<std::string> &args) { bool Client(const std::vector<std::string> &args) {
if (!InitSocketLibrary()) { if (!InitSocketLibrary()) {
return false; return false;
@ -239,6 +254,16 @@ bool Client(const std::vector<std::string> &args) {
} }
} }
if (args_map.count("-session-out") != 0) {
session_out.reset(BIO_new_file(args_map["-session-out"].c_str(), "wb"));
if (!session_out) {
fprintf(stderr, "Error while saving session:\n");
ERR_print_errors_cb(PrintErrorCallback, stderr);
return false;
}
SSL_CTX_sess_set_new_cb(ctx.get(), NewSessionCallback);
}
int sock = -1; int sock = -1;
if (!Connect(&sock, args_map["-connect"])) { if (!Connect(&sock, args_map["-connect"])) {
return false; return false;
@ -294,16 +319,6 @@ bool Client(const std::vector<std::string> &args) {
fprintf(stderr, "Connected.\n"); fprintf(stderr, "Connected.\n");
PrintConnectionInfo(ssl.get()); PrintConnectionInfo(ssl.get());
if (args_map.count("-session-out") != 0) {
ScopedBIO out(BIO_new_file(args_map["-session-out"].c_str(), "wb"));
if (!out ||
!PEM_write_bio_SSL_SESSION(out.get(), SSL_get0_session(ssl.get()))) {
fprintf(stderr, "Error while saving session:\n");
ERR_print_errors_cb(PrintErrorCallback, stderr);
return false;
}
}
bool ok = TransferData(ssl.get(), sock); bool ok = TransferData(ssl.get(), sock);
return ok; return ok;