diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-16 15:52:31 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:20:06 +0000 |
| commit | 28470b6095aa1f098860ffdf226f32e4c4cd334f (patch) | |
| tree | 02493f5887006cd6c5fd9a844fc2165e8960121c | |
| parent | 23a22b4cf72b0c2aadcd65001d4a28941d570547 (diff) | |
Yet more comments
Conflicts:
crypto/dsa/dsa_asn1.c
crypto/pem/pem_all.c
fips/dh/dh_gen.c
fips/dh/fips_dh_check.c
fips/dh/fips_dh_gen.c
ssl/ssl_ciph.c
Conflicts:
ssl/d1_clnt.c
Conflicts:
ssl/s2_pkt.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rw-r--r-- | crypto/des/ofb64ede.c | 2 | ||||
| -rw-r--r-- | demos/easy_tls/easy-tls.c | 4 | ||||
| -rw-r--r-- | demos/easy_tls/easy-tls.h | 2 | ||||
| -rw-r--r-- | demos/spkigen.c | 3 | ||||
| -rw-r--r-- | ssl/d1_pkt.c | 6 |
5 files changed, 10 insertions, 7 deletions
diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c index 26bbf9a6a7..a9cdfd63f3 100644 --- a/crypto/des/ofb64ede.c +++ b/crypto/des/ofb64ede.c @@ -105,7 +105,7 @@ void DES_ede3_ofb64_encrypt(register const unsigned char *in, } if (save) { -/* v0=ti[0]; +/*- v0=ti[0]; v1=ti[1];*/ iv = &(*ivec)[0]; l2c(v0,iv); diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c index 80dcc1469b..cc93e05c54 100644 --- a/demos/easy_tls/easy-tls.c +++ b/demos/easy_tls/easy-tls.c @@ -1,5 +1,5 @@ /* -*- Mode: C; c-file-style: "bsd" -*- */ -/* +/*- * easy-tls.c -- generic TLS proxy. * $Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $ */ @@ -62,7 +62,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Attribution for OpenSSL library: * * This product includes cryptographic software written by Eric Young diff --git a/demos/easy_tls/easy-tls.h b/demos/easy_tls/easy-tls.h index 52b298e654..71ed87aeac 100644 --- a/demos/easy_tls/easy-tls.h +++ b/demos/easy_tls/easy-tls.h @@ -1,5 +1,5 @@ /* -*- Mode: C; c-file-style: "bsd" -*- */ -/* +/*- * easy-tls.h -- generic TLS proxy. * $Id: easy-tls.h,v 1.1 2001/09/17 19:06:59 bodo Exp $ */ diff --git a/demos/spkigen.c b/demos/spkigen.c index 2cd5dfea97..a22b3ef340 100644 --- a/demos/spkigen.c +++ b/demos/spkigen.c @@ -1,5 +1,6 @@ /* NOCW */ -/* demos/spkigen.c +/*- + * demos/spkigen.c * 18-Mar-1997 - eay - A quick hack :-) * version 1.1, it would probably help to save or load the * private key :-) diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 9a1394a8e2..ee2c0e0c53 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -1045,9 +1045,11 @@ start: } } - /* s->d1->handshake_fragment_len == 12 iff rr->type == SSL3_RT_HANDSHAKE; + /*- + * s->d1->handshake_fragment_len == 12 iff rr->type == SSL3_RT_HANDSHAKE; * s->d1->alert_fragment_len == 7 iff rr->type == SSL3_RT_ALERT. - * (Possibly rr is 'empty' now, i.e. rr->length may be 0.) */ + * (Possibly rr is 'empty' now, i.e. rr->length may be 0.) + */ /* If we are a client, check for an incoming 'Hello Request': */ if ((!s->server) && |