diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-19 12:42:01 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:33:54 +0000 |
| commit | 1566497495b30054453b05d275c01d6db5211e2a (patch) | |
| tree | a1d5537c54452e0bd4fefcb327d82acdbc2ddf82 /ssl/ssl_sess.c | |
| parent | 712548231e101f11c06e729e2330a7f3155b2d7e (diff) | |
Fix source where indent will not be able to cope
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Conflicts:
crypto/ec/ec_curve.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 373ebac824..0abf580798 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -494,7 +494,8 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, try_session_cache = 0; #ifndef OPENSSL_NO_TLSEXT - r = tls1_process_ticket(s, session_id, len, limit, &ret); /* sets s->tlsext_ticket_expected */ + /* sets s->tlsext_ticket_expected */ + r = tls1_process_ticket(s, session_id, len, limit, &ret); switch (r) { case -1: /* Error during processing */ |