diff options
author | miod <> | 2014-08-07 20:02:23 +0000 |
---|---|---|
committer | miod <> | 2014-08-07 20:02:23 +0000 |
commit | e58fb502ca02fb2bd4f85e5725abd1189d26921c (patch) | |
tree | 3edb8354ad6b2884901d930a4a6006640b51962b /src/lib/libssl/s3_lib.c | |
parent | 15e8f255e119bc9bcc3d331677007d5263431e63 (diff) | |
download | openbsd-e58fb502ca02fb2bd4f85e5725abd1189d26921c.tar.gz openbsd-e58fb502ca02fb2bd4f85e5725abd1189d26921c.tar.bz2 openbsd-e58fb502ca02fb2bd4f85e5725abd1189d26921c.zip |
Oops, revert changes commited by mistake. The previous commit was supposed
to only apply to s23_srvr.c.
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index aa091f51c7..4631c517cc 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.72 2014/08/07 19:46:31 miod Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.73 2014/08/07 20:02:23 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -2333,7 +2333,7 @@ ssl3_new(SSL *s) | |||
2333 | SSL3_STATE *s3; | 2333 | SSL3_STATE *s3; |
2334 | 2334 | ||
2335 | if ((s3 = calloc(1, sizeof *s3)) == NULL) | 2335 | if ((s3 = calloc(1, sizeof *s3)) == NULL) |
2336 | return 0; | 2336 | goto err; |
2337 | memset(s3->rrec.seq_num, 0, sizeof(s3->rrec.seq_num)); | 2337 | memset(s3->rrec.seq_num, 0, sizeof(s3->rrec.seq_num)); |
2338 | memset(s3->wrec.seq_num, 0, sizeof(s3->wrec.seq_num)); | 2338 | memset(s3->wrec.seq_num, 0, sizeof(s3->wrec.seq_num)); |
2339 | 2339 | ||
@@ -2341,6 +2341,8 @@ ssl3_new(SSL *s) | |||
2341 | 2341 | ||
2342 | s->method->ssl_clear(s); | 2342 | s->method->ssl_clear(s); |
2343 | return (1); | 2343 | return (1); |
2344 | err: | ||
2345 | return (0); | ||
2344 | } | 2346 | } |
2345 | 2347 | ||
2346 | void | 2348 | void |