diff options
author | Tim Hudson <tjh@openssl.org> | 2014-12-28 12:48:40 +1000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:33:23 +0000 |
commit | 3e9a08ecb164098f997bce92a0db72287f39c106 (patch) | |
tree | b086482b8835ee069eb902a5edd708f418623ee3 /crypto/des | |
parent | 3a9a0321638ae13957b66baae6d4955597fc128d (diff) |
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments
(cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960)
Conflicts:
crypto/bn/bn_lcl.h
crypto/bn/bn_prime.c
crypto/engine/eng_all.c
crypto/rc4/rc4_utl.c
crypto/sha/sha.h
ssl/kssl.c
ssl/t1_lib.c
Conflicts:
crypto/rc4/rc4_enc.c
crypto/x509v3/v3_scts.c
crypto/x509v3/v3nametest.c
ssl/d1_both.c
ssl/s3_srvr.c
ssl/ssl.h
ssl/ssl_locl.h
ssl/ssltest.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/des')
-rw-r--r-- | crypto/des/des_locl.h | 3 | ||||
-rw-r--r-- | crypto/des/des_old.c | 3 | ||||
-rw-r--r-- | crypto/des/des_old.h | 3 | ||||
-rw-r--r-- | crypto/des/destest.c | 2 | ||||
-rw-r--r-- | crypto/des/enc_read.c | 2 | ||||
-rw-r--r-- | crypto/des/enc_writ.c | 2 | ||||
-rw-r--r-- | crypto/des/ncbc_enc.c | 2 | ||||
-rw-r--r-- | crypto/des/rpc_des.h | 2 | ||||
-rw-r--r-- | crypto/des/set_key.c | 11 |
9 files changed, 18 insertions, 12 deletions
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h index a3b512e9b0..cbf8939a92 100644 --- a/crypto/des/des_locl.h +++ b/crypto/des/des_locl.h @@ -360,7 +360,8 @@ #endif #endif - /* IP and FP + /*- + * IP and FP * The problem is more of a geometric problem that random bit fiddling. 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4 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/des_old.h b/crypto/des/des_old.h index 2b2c372354..5ac4c1bf65 100644 --- a/crypto/des/des_old.h +++ b/crypto/des/des_old.h @@ -1,6 +1,7 @@ /* crypto/des/des_old.h -*- 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 openssl 0.9.6 and older as diff --git a/crypto/des/destest.c b/crypto/des/destest.c index 64b92a34fe..b5bcf8f74b 100644 --- a/crypto/des/destest.c +++ b/crypto/des/destest.c @@ -380,7 +380,7 @@ int main(int argc, char *argv[]) DES_ENCRYPT); DES_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,&ks,&ks2,&ks3, &iv3,&iv2,DES_ENCRYPT); - /* if (memcmp(cbc_out,cbc3_ok, + /*- if (memcmp(cbc_out,cbc3_ok, (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0) { printf("des_ede3_cbc_encrypt encrypt error\n"); diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index edb6620d08..e6c4769126 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -66,7 +66,7 @@ OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE) -/* +/*- * WARNINGS: * * - The data format used by DES_enc_write() and DES_enc_read() diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c index 2353ac1e89..cd5d6761d3 100644 --- a/crypto/des/enc_writ.c +++ b/crypto/des/enc_writ.c @@ -63,7 +63,7 @@ #include "des_locl.h" #include <openssl/rand.h> -/* +/*- * WARNINGS: * * - The data format used by DES_enc_write() and DES_enc_read() diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c index fda23d522f..fdd8655c12 100644 --- a/crypto/des/ncbc_enc.c +++ b/crypto/des/ncbc_enc.c @@ -1,5 +1,5 @@ /* crypto/des/ncbc_enc.c */ -/* +/*- * #included by: * cbc_enc.c (DES_cbc_encrypt) * des_enc.c (DES_ncbc_encrypt) diff --git a/crypto/des/rpc_des.h b/crypto/des/rpc_des.h index 41328d7965..94a1d11aff 100644 --- a/crypto/des/rpc_des.h +++ b/crypto/des/rpc_des.h @@ -57,7 +57,7 @@ */ /* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */ -/* +/*- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape * media and as a part of the software program in whole or part. Users diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index da4d62e112..3321396be3 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -106,7 +106,8 @@ int DES_check_key_parity(const_DES_cblock *key) return(1); } -/* Weak and semi week keys as take from +/*- + * Weak and semi week keys as take from * %A D.W. Davies * %A W.L. Price * %T Security for Computer Networks @@ -151,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),\ @@ -321,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. */ @@ -406,7 +409,7 @@ int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule) { return(DES_set_key(key,schedule)); } -/* +/*- #undef des_fixup_key_parity void des_fixup_key_parity(des_cblock *key) { |