diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-16 14:43:29 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:20:06 +0000 |
| commit | 23a22b4cf72b0c2aadcd65001d4a28941d570547 (patch) | |
| tree | 3f6c6736f094e124061be4aaddcf46da1ba79f54 /ssl | |
| parent | c80fd6b215449f2ba7228af58979ac8709f74b82 (diff) | |
More comments
Conflicts:
crypto/dsa/dsa_vrf.c
crypto/ec/ec2_smpl.c
crypto/ec/ecp_smpl.c
Conflicts:
demos/bio/saccept.c
ssl/d1_clnt.c
Conflicts:
bugs/dggccbug.c
demos/tunala/cb.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/kssl.c | 3 | ||||
| -rw-r--r-- | ssl/s3_enc.c | 6 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ssl/kssl.c b/ssl/kssl.c index 3ae19d2f6a..21172f31d5 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -1301,7 +1301,8 @@ kssl_TKT2tkt( /* IN */ krb5_context krb5context, } -/* Given krb5 service name in KSSL_CTX *kssl_ctx (typically "kssl"), +/*- + * Given krb5 service name in KSSL_CTX *kssl_ctx (typically "kssl"), * and krb5 AP_REQ message & message length, * Return Kerberos session key and client principle * to SSL Server in KSSL_CTX *kssl_ctx. diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 66f5280179..dd3e343ca8 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -485,7 +485,8 @@ void ssl3_cleanup_key_block(SSL *s) s->s3->tmp.key_block_length=0; } -/* ssl3_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively. +/*- + * ssl3_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 @@ -774,7 +775,8 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send) * data we are hashing because that gives an attacker a * timing-oracle. */ - /* npad is, at most, 48 bytes and that's with MD5: + /*- + * npad is, at most, 48 bytes and that's with MD5: * 16 + 48 + 8 (sequence bytes) + 1 + 2 = 75. * * With SHA-1 (the largest hash speced for SSLv3) the hash size diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 33a55fe699..e817b381bc 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -488,7 +488,7 @@ * SSL_aDSS <- DSA_SIGN */ -/* +/*- #define CERT_INVALID 0 #define CERT_PUBLIC_KEY 1 #define CERT_PRIVATE_KEY 2 |