wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10267 commits 20 branches 302 tags 153 MiB
Commit graph

10267 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Caswell
a8b966f48f Run util/openssl-format-source -v -c . 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:46:18 +00:00
Matt Caswell
e3db68b766 Yet more changes to comments 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:46:13 +00:00
Matt Caswell
c583d40678 More tweaks for comments due indent issues 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:46:08 +00:00
Matt Caswell
31082f2127 Fix modes.h so that indent doesn't complain 
Conflicts:
	crypto/modes/modes.h

Conflicts:
	crypto/modes/modes.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:46:01 +00:00
Matt Caswell
2c783509f4 Backport hw_ibmca.c from master due to failed merge 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:56 +00:00
Matt Caswell
6bd72a273e Tweaks for comments due to indent's inability to handle them 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:51 +00:00
Matt Caswell
5011589a0b Move more comments that confuse indent 
Conflicts:
	crypto/dsa/dsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl_locl.h

Conflicts:
	crypto/bn/rsaz_exp.c
	crypto/evp/e_aes_cbc_hmac_sha1.c
	crypto/evp/e_aes_cbc_hmac_sha256.c
	ssl/ssl_locl.h

Conflicts:
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ecp_nistputil.c
	crypto/ec/ecp_oct.c
	crypto/modes/gcm128.c
	ssl/ssl_locl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:45 +00:00
Dr. Stephen Henson
7b0ec6a4af Delete trailing whitespace from output. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:40 +00:00
Dr. Stephen Henson
e5ebff7b6a Add -d debug option to save preprocessed files. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:35 +00:00
Dr. Stephen Henson
9c392088de Test option -nc 
Add option -nc which sets COMMENTS=true but disables all indent comment
reformatting options.

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:30 +00:00
Matt Caswell
a75d7245e5 Add ecp_nistz256.c to list of files skipped by openssl-format-source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:25 +00:00
Matt Caswell
b10a8451e3 Manually reformat aes_x86core.c and add it to the list of files skipped by 
openssl-format-source

Conflicts:
	crypto/aes/aes_x86core.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:19 +00:00
Andy Polyakov
679fee0e18 crypto/ofb128.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:15 +00:00
Andy Polyakov
74c1dc909d modes/ctr128.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:10 +00:00
Andy Polyakov
638f75b686 modes/cfb128.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:05 +00:00
Matt Caswell
510edea8db Fix indent comment corruption issue 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:01 +00:00
Matt Caswell
3bc28b8022 Amend openssl-format-source so that it give more repeatable output 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:55 +00:00
Andy Polyakov
2d8e9d0c55 bn/bn_const.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:48 +00:00
Andy Polyakov
15a9c36755 bn/asm/x86_64-gcc.cL make it indent-friendly. 
Conflicts:
	crypto/bn/asm/x86_64-gcc.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:42 +00:00
Andy Polyakov
a988c1edfc bn/bn_asm.c: make it indent-friendly. 
Conflicts:
	crypto/bn/bn_asm.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:35 +00:00
Andy Polyakov
23a79aac28 bn/bn_exp.c: make it indent-friendly. 
Conflicts:
	crypto/bn/bn_exp.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:29 +00:00
Matt Caswell
d8305efeb4 Manually reformat aes_core.c 
Add aes_core.c to the list of files not processed by openssl-format-source

Conflicts:
	crypto/aes/aes_core.c

Conflicts:
	crypto/aes/aes_core.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:22 +00:00
Matt Caswell
7566807cfc Add obj_dat.h to the list of files that will not be processed by 
openssl-format-source

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:16 +00:00
Matt Caswell
3ad5ae5d44 Fix strange formatting by indent 
Conflicts:
	crypto/hmac/hmac.h

Conflicts:
	crypto/evp/e_aes_cbc_hmac_sha256.c

Conflicts:
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ectest.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:08 +00:00
Matt Caswell
e16db4b3d7 indent has problems with comments that are on the right hand side of a line. 
Sometimes it fails to format them very well, and sometimes it corrupts them!
This commit moves some particularly problematic ones.

Conflicts:
	crypto/bn/bn.h
	crypto/ec/ec_lcl.h
	crypto/rsa/rsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl.h
	ssl/ssl3.h

Conflicts:
	crypto/ec/ec_lcl.h
	ssl/tls1.h

Conflicts:
	crypto/ec/ecp_nistp224.c
	crypto/evp/evp.h
	ssl/d1_both.c
	ssl/ssl.h
	ssl/ssl_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:02 +00:00
Andy Polyakov
134d38bcde modes/cts128.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:57 +00:00
Andy Polyakov
74d3242514 crypto/mem_dbg.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:52 +00:00
Matt Caswell
6020ffc766 More indent fixes for STACK_OF 
Conflicts:
	ssl/s3_lib.c

Conflicts:
	apps/cms.c
	crypto/x509/x509_lu.c
	crypto/x509/x509_vfy.h
	ssl/s3_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:43 +00:00
Matt Caswell
7cba857c9a Fix indent issue with functions using STACK_OF 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:37 +00:00
Matt Caswell
08220fec49 Fix indent issue with engine.h 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:32 +00:00
Matt Caswell
bfe4de7257 Fix logic to check for indent.pro 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:26 +00:00
Andy Polyakov
7a9f1f174c crypto/cryptlib.c: make it indent-friendly. 
Conflicts:
	crypto/cryptlib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:21 +00:00
Andy Polyakov
033a5fcfe8 bn/bntest.c: make it indent-friendly. 
Conflicts:
	crypto/bn/bntest.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:16 +00:00
Andy Polyakov
4f6930f5d3 bn/bn_recp.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:10 +00:00
Andy Polyakov
bc18f2f140 engines/e_ubsec.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:05 +00:00
Andy Polyakov
1a9c746696 apps/speed.c: make it indent-friendly. 
Conflicts:
	apps/speed.c

Conflicts:
	apps/speed.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:56 +00:00
Matt Caswell
92fd726fb4 Fix make errors 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:50 +00:00
Richard Levitte
46d8227210 Make the script a little more location agnostic 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:45 +00:00
Matt Caswell
5d3dc701b9 Provide script for filtering data initialisers for structs/unions. indent just can't handle it. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:39 +00:00
Dr. Stephen Henson
25c438987b Script fixes. 
Don't use double newline for headers.
Don't interpret ASN1_PCTX as start of an ASN.1 module.

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:34 +00:00
Richard Levitte
016b92d112 Run expand before perl, to make sure things are properly aligned 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:29 +00:00
Richard Levitte
dd6da173fd Force the use of our indent profile 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:21 +00:00
Tim Hudson
6ff1bf382e Provide source reformating script. Requires GNU indent to be 
available.

Script written by Tim Hudson, with amendments by Steve Henson, Rich Salz and
Matt Caswell

Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-01-22 09:41:55 +00:00
Matt Caswell
65f1d188c5 Fix source where indent will not be able to cope 
Conflicts:
	apps/ciphers.c
	ssl/s3_pkt.c

Conflicts:
	crypto/ec/ec_curve.c

Conflicts:
	crypto/ec/ec_curve.c
	ssl/s3_clnt.c
	ssl/s3_srvr.c
	ssl/ssl_sess.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:41:47 +00:00
Matt Caswell
a25d0527b7 Additional comment changes for reformat of 1.0.0 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:41:42 +00:00
Matt Caswell
89f6c5b492 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>
 2015-01-22 09:41:33 +00:00
Tim Hudson
f326f6544d mark all block comments that need format preserving so that 
indent will not alter them when reformatting comments

(cherry picked from commit 1d97c84351)

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

Conflicts:
	crypto/asn1/a_sign.c
	crypto/bn/bn_div.c
	crypto/dsa/dsa_asn1.c
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ecp_nistputil.c
	crypto/modes/gcm128.c
	crypto/opensslv.h
	ssl/d1_both.c
	ssl/heartbeat_test.c
	ssl/s3_clnt.c
	ssl/s3_srvr.c
	ssl/ssl_sess.c
	ssl/t1_lib.c
	test/testutil.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:41:18 +00:00
Matt Caswell
569c68744a Prepare for 1.0.0r-dev 
Reviewed-by: Stephen Henson <steve@openssl.org>
 2015-01-15 15:01:09 +00:00
Matt Caswell
cdac2e8928 Prepare for 1.0.0q release 
Reviewed-by: Stephen Henson <steve@openssl.org>
 2015-01-15 14:56:27 +00:00
Matt Caswell
01fb34ad43 make update 
Reviewed-by: Stephen Henson <steve@openssl.org>
 2015-01-15 14:56:27 +00:00