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:23:50 +0000 |
| commit | e19d4a99b8f25456dfab7086af57f3f208cdfed6 (patch) | |
| tree | cd7931e89476c762982afdc5585aa942ad0a4f0b /crypto/des | |
| parent | 6977c7e2baf291278aee7632f1a68581b7c4d1f9 (diff) | |
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)
Conflicts:
crypto/x509v3/pcy_tree.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/des_old.c | 3 | ||||
| -rw-r--r-- | crypto/des/set_key.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c index 7c33ed7a93..3d42014b5b 100644 --- a/crypto/des/des_old.c +++ b/crypto/des/des_old.c @@ -1,6 +1,7 @@ /* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */ -/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +/*- + * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING * * The function names in here are deprecated and are only present to * provide an interface compatible with libdes. OpenSSL now provides diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index 9cbde2ace7..3321396be3 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -152,7 +152,8 @@ int DES_is_weak_key(const_DES_cblock *key) return(0); } -/* NOW DEFINED IN des_local.h +/*- + * NOW DEFINED IN des_local.h * See ecb_encrypt.c for a pseudo description of these macros. * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ * (b)^=(t),\ @@ -322,7 +323,8 @@ int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule) } } -/* return 0 if key parity is odd (correct), +/*- + * return 0 if key parity is odd (correct), * return -1 if key parity error, * return -2 if illegal weak key. */ |