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:24:04 +0000 |
commit | bc2d623c0e8a8ae33218c61bcd6729aae23ae666 (patch) | |
tree | 26753d390c30ad76c63c5424927493f9425af5be /ssl/t1_lib.c | |
parent | c695ebe2a09cb7f9aaec3c435ab94d36a6d6aece (diff) |
Fix source where indent will not be able to cope
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r-- | ssl/t1_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index b702de25c0..8b8c9cd71f 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2283,8 +2283,10 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char if (s->s3->client_opaque_prf_input != NULL) /* shouldn't really happen */ OPENSSL_free(s->s3->client_opaque_prf_input); + + /* dummy byte just to get non-NULL */ if (s->s3->client_opaque_prf_input_len == 0) - s->s3->client_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */ + s->s3->client_opaque_prf_input = OPENSSL_malloc(1); else s->s3->client_opaque_prf_input = BUF_memdup(sdata, s->s3->client_opaque_prf_input_len); if (s->s3->client_opaque_prf_input == NULL) |