diff options
| author | Tim Hudson <tjh@openssl.org> | 2014-12-28 12:48:40 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:33:23 +0000 |
| commit | 3e9a08ecb164098f997bce92a0db72287f39c106 (patch) | |
| tree | b086482b8835ee069eb902a5edd708f418623ee3 /ssl/ssl_lib.c | |
| parent | 3a9a0321638ae13957b66baae6d4955597fc128d (diff) | |
| download | openssl-new-3e9a08ecb164098f997bce92a0db72287f39c106.tar.gz | |
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments
(cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960)
Conflicts:
crypto/bn/bn_lcl.h
crypto/bn/bn_prime.c
crypto/engine/eng_all.c
crypto/rc4/rc4_utl.c
crypto/sha/sha.h
ssl/kssl.c
ssl/t1_lib.c
Conflicts:
crypto/rc4/rc4_enc.c
crypto/x509v3/v3_scts.c
crypto/x509v3/v3nametest.c
ssl/d1_both.c
ssl/s3_srvr.c
ssl/ssl.h
ssl/ssl_locl.h
ssl/ssltest.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 4a62b4a790..e3b93a730c 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1750,7 +1750,8 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) ret->quiet_shutdown=0; /* ret->cipher=NULL;*/ -/* ret->s2->challenge=NULL; +/*- + ret->s2->challenge=NULL; ret->master_key=NULL; ret->key_arg=NULL; ret->s2->conn_id=NULL; */ |