formatting

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>

Author: zandbelt

src/cache.c

@@ -253,7 +253,7 @@ static bool _oauth2_cache_hash_key(oauth2_log_t *log, const char *key,
 }
 
 static const char *_oauth_cache_get_enc_key(oauth2_log_t *log,
-						     oauth2_cache_t *cache)
+					    oauth2_cache_t *cache)
 {
 
 	const char *passphrase = NULL, *passphrase_hash_algo = NULL;
@@ -272,11 +272,12 @@ static const char *_oauth_cache_get_enc_key(oauth2_log_t *log,
 	if (strcmp(passphrase_hash_algo, "none") == 0) {
 		cache->enc_key = oauth2_strdup(passphrase);
 	} else {
-		//		if (oauth2_jose_hash_bytes(log, passphrase_hash_algo,
-		//					   (const unsigned char *)passphrase,
-		//					   strlen(passphrase), &cache->enc_key,
-		//					   &enc_key_len) == false) {
-		if (oauth2_jose_hash2s(log, passphrase_hash_algo, passphrase, &cache->enc_key) == false) {
+		//		if (oauth2_jose_hash_bytes(log,
+		//passphrase_hash_algo, 					   (const unsigned char *)passphrase,
+		//					   strlen(passphrase),
+		//&cache->enc_key, 					   &enc_key_len) == false) {
+		if (oauth2_jose_hash2s(log, passphrase_hash_algo, passphrase,
+				       &cache->enc_key) == false) {
 			oauth2_error(
 			    log, "could not hash cache encryption passphrase");
 			goto end;

src/cfg/auth.c

@@ -437,7 +437,8 @@ char *oauth2_cfg_set_endpoint_auth(oauth2_log_t *log,
 		    rv,
 		    _oauth2_cfg_endpoint_auth_options_set[i + 1].type == NULL
 			? " or "
-			: i > 0 ? ", " : "",
+		    : i > 0 ? ", "
+			    : "",
 		    _oauth2_cfg_endpoint_auth_options_set[i].type, NULL);
 		i++;
 	}

src/cfg/cfg.c

@@ -269,9 +269,11 @@ char *oauth2_cfg_set_options(oauth2_log_t *log, void *cfg, const char *type,
 	rv = oauth2_strdup("Invalid value, must be one of: ");
 	i = 0;
 	while (set[i].type != NULL) {
-		rv = oauth2_stradd(
-		    rv, set[i + 1].type == NULL ? " or " : i > 0 ? ", " : "",
-		    set[i].type, NULL);
+		rv = oauth2_stradd(rv,
+				   set[i + 1].type == NULL ? " or "
+				   : i > 0		   ? ", "
+							   : "",
+				   set[i].type, NULL);
 		i++;
 	}
 	rv = oauth2_stradd(rv, ".", NULL, NULL);

src/cfg/proto_cfg.c

@@ -263,8 +263,9 @@ void oauth2_cfg_ropc_merge(oauth2_log_t *log, oauth2_cfg_ropc_t *dst,
 			   oauth2_cfg_ropc_t *base, oauth2_cfg_ropc_t *add)
 {
 
-	oauth2_cfg_ropc_t *src =
-	    (add && add->token_endpoint != 0) ? add : base ? base : NULL;
+	oauth2_cfg_ropc_t *src = (add && add->token_endpoint != 0) ? add
+				 : base				   ? base
+								   : NULL;
 
 	if ((src == NULL) || (dst == NULL))
 		goto end;

src/cfg/source.c

@@ -153,7 +153,8 @@ char *oauth2_cfg_token_in_set(oauth2_log_t *log, oauth2_cfg_token_in_t *cfg,
 		    rv,
 		    _oauth2_cfg_accept_in_options_set[i + 1].method == NULL
 			? " or "
-			: i > 0 ? ", " : "",
+		    : i > 0 ? ", "
+			    : "",
 		    _oauth2_cfg_accept_in_options_set[i].method, NULL);
 		i++;
 	}
@@ -307,8 +308,10 @@ void oauth2_cfg_source_token_merge(oauth2_log_t *log,
 				   oauth2_cfg_source_token_t *base,
 				   oauth2_cfg_source_token_t *add)
 {
-	oauth2_cfg_source_token_t *src =
-	    (add && add->accept_in.value != 0) ? add : base ? base : NULL;
+	oauth2_cfg_source_token_t *src = (add && add->accept_in.value != 0)
+					     ? add
+					 : base ? base
+						: NULL;
 
 	if (src == NULL)
 		goto end;

test/check_liboauth2.h

@@ -109,14 +109,15 @@ void liboauth2_check_register_http_callbacks(
 			p = strrchr(path, '.');                                \
 			if (p)                                                 \
 				*p = '\0';                                     \
-			p = path; \
-            while (*p == '.') { \
-				p++; \
-                if (*p == '/') p++; \
-			} \
-            if (*p == '/') p++; \
-			_http_base_path =                                      \
-			    oauth2_stradd(NULL, "/", p, NULL);              \
+			p = path;                                              \
+			while (*p == '.') {                                    \
+				p++;                                           \
+				if (*p == '/')                                 \
+					p++;                                   \
+			}                                                      \
+			if (*p == '/')                                         \
+				p++;                                           \
+			_http_base_path = oauth2_stradd(NULL, "/", p, NULL);   \
 			oauth2_mem_free(path);                                 \
 		}                                                              \
 		return _http_base_path;                                        \

test/check_openidc.c

@@ -551,9 +551,11 @@ START_TEST(test_openidc_resolver)
 	oauth2_openidc_provider_free(_log, provider);
 	provider = NULL;
 
-	sprintf((char *)filename, "%s/%s", getenv("srcdir") ? getenv("srcdir") : ".", "test/provider.json");
-	rv = oauth2_cfg_openidc_provider_resolver_set_options(
-	    _log, c, "file", filename, NULL);
+	sprintf((char *)filename, "%s/%s",
+		getenv("srcdir") ? getenv("srcdir") : ".",
+		"test/provider.json");
+	rv = oauth2_cfg_openidc_provider_resolver_set_options(_log, c, "file",
+							      filename, NULL);
 	ck_assert_ptr_eq(rv, NULL);
 
 	rc = _oauth2_openidc_provider_resolve(_log, c, r, NULL, &provider);
@@ -647,9 +649,10 @@ START_TEST(test_openidc_client)
 	cfg = oauth2_cfg_openidc_init(_log);
 	ck_assert_ptr_ne(cfg, NULL);
 
-	sprintf((char *)filename, "%s/%s", getenv("srcdir") ? getenv("srcdir") : ".", "test/client.json");
-	rv = oauth2_openidc_client_set_options(
-	    _log, cfg, "file", filename, "ssl_verify=false");
+	sprintf((char *)filename, "%s/%s",
+		getenv("srcdir") ? getenv("srcdir") : ".", "test/client.json");
+	rv = oauth2_openidc_client_set_options(_log, cfg, "file", filename,
+					       "ssl_verify=false");
 	ck_assert_ptr_eq(rv, NULL);
 
 	client = oauth2_cfg_openidc_client_get(_log, cfg);