diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 11:09:58 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:44:02 +0000 |
| commit | e16db4b3d75e9e3ea4dccdd5df65e75e62a320c3 (patch) | |
| tree | f91d4a8ee4124337576ea8686112ac6f87739de9 /demos | |
| parent | 134d38bcde371839f5ffe33181a4d83858fc3469 (diff) | |
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>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/easy_tls/easy-tls.c | 4 | ||||
| -rw-r--r-- | demos/engines/ibmca/hw_ibmca.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c index b433036715..e6b9b865c8 100644 --- a/demos/easy_tls/easy-tls.c +++ b/demos/easy_tls/easy-tls.c @@ -708,7 +708,9 @@ tls_create_ctx(struct tls_create_ctx_args a, void *apparg) SSL_CTX_set_verify_depth(ret, a.verify_depth); if (a.ca_file != NULL) { - r = SSL_CTX_load_verify_locations(ret, a.ca_file, NULL /* no CA-directory */); /* does not report failure if file does not exist ... */ + /* does not report failure if file does not exist ... */ + /* NULL argument means no CA-directory */ + r = SSL_CTX_load_verify_locations(ret, a.ca_file, NULL); if (!r) { err_pref_1 = " while processing certificate file "; err_pref_2 = a.ca_file; diff --git a/demos/engines/ibmca/hw_ibmca.c b/demos/engines/ibmca/hw_ibmca.c index 0c2c39b8a7..fa690a2286 100644 --- a/demos/engines/ibmca/hw_ibmca.c +++ b/demos/engines/ibmca/hw_ibmca.c @@ -917,4 +917,4 @@ IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) #endif /* !OPENSSL_NO_HW_IBMCA */
-#endif /* !OPENSSL_NO_HW */
+#endif /* !OPENSSL_NO_HW */ |