You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mi...@apache.org on 2023/06/22 08:54:37 UTC
[tomcat-native] branch 1.2.x updated: Replace tabs with spaces
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new df4c93e20 Replace tabs with spaces
df4c93e20 is described below
commit df4c93e205ca6f0341d54eec2d105f5400375c55
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 22 10:52:40 2023 +0200
Replace tabs with spaces
---
native/include/ssl_private.h | 6 +++---
native/src/ssl.c | 4 ++--
native/src/sslcontext.c | 4 ++--
native/src/sslutils.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 545022ba2..b48f7ca84 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -358,9 +358,9 @@ typedef struct {
*/
} reneg_state;
enum {
- PHA_NONE = 0, /* Before PHA */
- PHA_STARTED, /* PHA req sent to client but no response */
- PHA_COMPLETE /* Client has returned cert */
+ PHA_NONE = 0, /* Before PHA */
+ PHA_STARTED, /* PHA req sent to client but no response */
+ PHA_COMPLETE /* Client has returned cert */
} pha_state;
apr_socket_t *sock;
apr_pollset_t *pollset;
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 92414e611..31493e74f 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -817,7 +817,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
err = APR_ENOTIMPL;
else {
#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
- if (strcmp(J2S(engine), "chil") == 0)
+ if (strcmp(J2S(engine), "chil") == 0)
ENGINE_ctrl(ee, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
#endif
if (!ENGINE_set_default(ee, ENGINE_METHOD_ALL))
@@ -947,7 +947,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
if (strcmp("fips", name)) {
return 0;
} else {
- return 1;
+ return 1;
}
#else
UNREFERENCED(o);
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 483446dd6..c0541bd72 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -923,8 +923,8 @@ TCN_IMPLEMENT_CALL(void, SSLContext, setTmpECDHByCurveName)(TCN_STDARGS, jlong c
EC_KEY_free(ecdh);
TCN_FREE_CSTRING(curveName);
#else
- tcn_Throw(e, "Cant't configure elliptic curve: unsupported by this OpenSSL version");
- return;
+ tcn_Throw(e, "Cant't configure elliptic curve: unsupported by this OpenSSL version");
+ return;
#endif
}
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index c3bd41a45..619a6537e 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -741,7 +741,7 @@ static char **decode_OCSP_url(ASN1_OCTET_STRING *os, apr_pool_t *p)
return NULL;
}
if (parse_ASN1_Sequence(ocsp_urls, &response, &numofresponses, p) ||
- numofresponses ==0) {
+ numofresponses ==0) {
response = NULL;
}
return response;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org