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:41:33 +0000 |
| commit | 89f6c5b4926c8ef8bc1a544a031ed3e01e092cbe (patch) | |
| tree | c2971b1976bb1c550b203c2842d56cf4311c631a /ssl | |
| parent | f326f6544debb563d9401b1673a96d0073a32e37 (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')
| -rw-r--r-- | ssl/kssl.c | 3 | ||||
| -rw-r--r-- | ssl/s3_both.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 |
5 files changed, 12 insertions, 6 deletions
diff --git a/ssl/kssl.c b/ssl/kssl.c index 1ac460e891..6ada0a4a53 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -907,7 +907,8 @@ static 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/s3_both.c b/ssl/s3_both.c index 56e7d68ac3..412d095d60 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -628,7 +628,8 @@ int ssl_verify_alarm_type(long type) } #ifndef OPENSSL_NO_BUF_FREELISTS -/* On some platforms, malloc() performance is bad enough that you can't just +/*- + * On some platforms, malloc() performance is bad enough that you can't just * free() and malloc() buffers all the time, so we need to use freelists from * unused buffers. Currently, each freelist holds memory chunks of only a * given size (list->chunklen); other sized chunks are freed and malloced. 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; */ diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 0c3da6ff35..8fbe012a87 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -1490,7 +1490,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"); */ @@ -1501,7 +1502,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 7220a85db3..7ce67bc82c 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -640,7 +640,8 @@ err: return(ret); } -/* 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 |