diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-05 00:34:00 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:48:59 +0000 |
| commit | 564ccc55d6463e485f885a8c2192121ea8fe6adf (patch) | |
| tree | de073a7f21239041a5b23820a91515e87abb89f2 /ssl | |
| parent | b558c8d59782dab2809a1530cbbcd9f38785302b (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
Conflicts:
crypto/bio/b_sock.c
crypto/pem/pem.h
crypto/x509/x509_vfy.c
crypto/x509v3/pcy_tree.c
ssl/s3_both.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/kssl.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 3 | ||||
| -rw-r--r-- | ssl/ssltest.c | 6 | ||||
| -rw-r--r-- | ssl/t1_enc.c | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/ssl/kssl.c b/ssl/kssl.c index c550cec9fc..cdd0ae09bb 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -906,7 +906,8 @@ size_t *populate_cksumlens(void) return cklens; } -/* Return pointer to start of real authenticator within authenticator, or +/*- + * Return pointer to start of real authenticator within authenticator, or * return NULL on error. * Decrypted authenticator looks like this: * [0 or 8 byte confounder] [4-24 byte checksum] [real authent'r] diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 542ab5a558..409b9e7a2b 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1533,7 +1533,8 @@ SSL_CTX *SSL_CTX_new(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; */ diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 995d185052..f5e752b7d8 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -1411,7 +1411,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count) if (SSL_in_init(s_ssl)) printf("server waiting in SSL_accept - %s\n", SSL_state_string_long(s_ssl)); -/* else if (s_write) +/*- + else if (s_write) printf("server:SSL_write()\n"); else printf("server:SSL_read()\n"); */ @@ -1422,7 +1423,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count) if (SSL_in_init(c_ssl)) printf("client waiting in SSL_connect - %s\n", SSL_state_string_long(c_ssl)); -/* else if (c_write) +/*- + else if (c_write) printf("client:SSL_write()\n"); else printf("client:SSL_read()\n"); */ diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 4b9383adfa..b884957d49 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -528,7 +528,8 @@ err: return(0); } -/* tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively. +/*- + * tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively. * * Returns: * 0: (in non-constant time) if the record is publically invalid (i.e. too |