summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-05 00:34:00 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:41:33 +0000
commit89f6c5b4926c8ef8bc1a544a031ed3e01e092cbe (patch)
treec2971b1976bb1c550b203c2842d56cf4311c631a /ssl/ssl_lib.c
parentf326f6544debb563d9401b1673a96d0073a32e37 (diff)
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Conflicts: apps/apps.c ssl/ssltest.c Conflicts: apps/apps.c crypto/ec/ec2_oct.c crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c ssl/s3_cbc.c ssl/ssl_sess.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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index bd8cc68641..9b6df7a36e 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1577,7 +1577,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; */