diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 15:44:54 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 15:44:54 +0000 |
| commit | 4f974dbcf7306f25ed0c3d075c752e36558bf974 (patch) | |
| tree | a30aef4fc19d8cec1bf6985d73fc4cdcc1da2301 /lib | |
| parent | 22aeb514b22b653d4da068618d533d6eb9c14191 (diff) | |
If the application uses tls_session_secret_cb for session resumption, set
the CCS_OK flag. From OpenSSL trunk.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/ssl/s3_clnt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c index 017aaaecba1..3596acf1de5 100644 --- a/lib/libssl/src/ssl/s3_clnt.c +++ b/lib/libssl/src/ssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.76 2014/07/11 13:21:15 miod Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.77 2014/07/11 15:44:53 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -849,7 +849,8 @@ ssl3_get_server_hello(SSL *s) &s->session->master_key_length, NULL, &pref_cipher, s->tls_session_secret_cb_arg)) { s->session->cipher = pref_cipher ? - pref_cipher : ssl_get_cipher_by_char(s, p + j); + pref_cipher : ssl_get_cipher_by_char(s, p + j); + s->s3->flags |= SSL3_FLAGS_CCS_OK; } } |