diff options
| author | jsing <> | 2014-06-07 14:14:13 +0000 |
|---|---|---|
| committer | jsing <> | 2014-06-07 14:14:13 +0000 |
| commit | ae0771eca079417ae5f9a2081994d980817297e3 (patch) | |
| tree | 7de63d151aa040934e7dfb3a1201224615cebe15 /src | |
| parent | f343af817aa3c5121ccee178feb8ac0fa700172b (diff) | |
| download | openbsd-ae0771eca079417ae5f9a2081994d980817297e3.tar.gz openbsd-ae0771eca079417ae5f9a2081994d980817297e3.tar.bz2 openbsd-ae0771eca079417ae5f9a2081994d980817297e3.zip | |
ssl3_release_{read,write}_buffer() handle being called with NULL buffers,
so do not bother checking before calling.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 7 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/s3_lib.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index d8066720f9..5ed0aee7d5 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -2328,10 +2328,9 @@ ssl3_free(SSL *s) | |||
| 2328 | #endif | 2328 | #endif |
| 2329 | 2329 | ||
| 2330 | ssl3_cleanup_key_block(s); | 2330 | ssl3_cleanup_key_block(s); |
| 2331 | if (s->s3->rbuf.buf != NULL) | 2331 | ssl3_release_read_buffer(s); |
| 2332 | ssl3_release_read_buffer(s); | 2332 | ssl3_release_write_buffer(s); |
| 2333 | if (s->s3->wbuf.buf != NULL) | 2333 | |
| 2334 | ssl3_release_write_buffer(s); | ||
| 2335 | free(s->s3->rrec.comp); | 2334 | free(s->s3->rrec.comp); |
| 2336 | DH_free(s->s3->tmp.dh); | 2335 | DH_free(s->s3->tmp.dh); |
| 2337 | EC_KEY_free(s->s3->tmp.ecdh); | 2336 | EC_KEY_free(s->s3->tmp.ecdh); |
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c index d8066720f9..5ed0aee7d5 100644 --- a/src/lib/libssl/src/ssl/s3_lib.c +++ b/src/lib/libssl/src/ssl/s3_lib.c | |||
| @@ -2328,10 +2328,9 @@ ssl3_free(SSL *s) | |||
| 2328 | #endif | 2328 | #endif |
| 2329 | 2329 | ||
| 2330 | ssl3_cleanup_key_block(s); | 2330 | ssl3_cleanup_key_block(s); |
| 2331 | if (s->s3->rbuf.buf != NULL) | 2331 | ssl3_release_read_buffer(s); |
| 2332 | ssl3_release_read_buffer(s); | 2332 | ssl3_release_write_buffer(s); |
| 2333 | if (s->s3->wbuf.buf != NULL) | 2333 | |
| 2334 | ssl3_release_write_buffer(s); | ||
| 2335 | free(s->s3->rrec.comp); | 2334 | free(s->s3->rrec.comp); |
| 2336 | DH_free(s->s3->tmp.dh); | 2335 | DH_free(s->s3->tmp.dh); |
| 2337 | EC_KEY_free(s->s3->tmp.ecdh); | 2336 | EC_KEY_free(s->s3->tmp.ecdh); |