Indent code

Co-authored-by: Simon Josefsson <simon@josefsson.org>
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>

1 files changed, 54 insertions, 45 deletions

diff --git a/lib/pcert.c b/lib/pcert.c
index e5057aec51..84da6d2fd7 100644
--- a/lib/pcert.c
+++ b/lib/pcert.c
@@ -54,9 +54,7 @@ int gnutls_pcert_import_x509(gnutls_pcert_st * pcert,
 	pcert->type = GNUTLS_CRT_X509;
 	pcert->cert.data = NULL;
 
-	ret =
-	    gnutls_x509_crt_export2(crt, GNUTLS_X509_FMT_DER,
-				    &pcert->cert);
+	ret = gnutls_x509_crt_export2(crt, GNUTLS_X509_FMT_DER, &pcert->cert);
 	if (ret < 0) {
 		ret = gnutls_assert_val(ret);
 		goto cleanup;
@@ -78,7 +76,7 @@ int gnutls_pcert_import_x509(gnutls_pcert_st * pcert,
 
 	return 0;
 
-      cleanup:
+ cleanup:
 	_gnutls_free_datum(&pcert->cert);
 
 	return ret;
@@ -107,7 +105,7 @@ int gnutls_pcert_import_x509(gnutls_pcert_st * pcert,
  * Since: 3.4.0
  **/
 int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list,
-				  gnutls_x509_crt_t *crt, unsigned *ncrt,
+				  gnutls_x509_crt_t * crt, unsigned *ncrt,
 				  unsigned int flags)
 {
 	int ret;
@@ -134,7 +132,7 @@ int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list,
 		}
 	}
 
-	for (i=0;i<*ncrt;i++) {
+	for (i = 0; i < *ncrt; i++) {
 		ret = gnutls_pcert_import_x509(&pcert_list[i], s[i], 0);
 		if (ret < 0) {
 			current = i;
@@ -145,7 +143,7 @@ int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list,
 	return 0;
 
  cleanup:
-	for (i=0;i<current;i++) {
+	for (i = 0; i < current; i++) {
 		gnutls_pcert_deinit(&pcert_list[i]);
 	}
 	return ret;
@@ -175,9 +173,9 @@ int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list,
  * Since: 3.0
  **/
 int
-gnutls_pcert_list_import_x509_raw(gnutls_pcert_st *pcert_list,
+gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcert_list,
 				  unsigned int *pcert_list_size,
-				  const gnutls_datum_t *data,
+				  const gnutls_datum_t * data,
 				  gnutls_x509_crt_fmt_t format,
 				  unsigned int flags)
 {
@@ -246,7 +244,7 @@ gnutls_pcert_list_import_x509_raw(gnutls_pcert_st *pcert_list,
  *
  * Since: 3.6.3
  **/
-int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
+int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list,
 				       unsigned *pcert_list_size,
 				       const char *file,
 				       gnutls_x509_crt_fmt_t format,
@@ -258,13 +256,20 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
 	unsigned i;
 	gnutls_x509_crt_t *crts = NULL;
 	unsigned crts_size = 0;
-	gnutls_datum_t data = {NULL, 0};
+	gnutls_datum_t data = { NULL, 0 };
 
 	if (gnutls_url_is_supported(file) != 0) {
-		ret = gnutls_x509_crt_list_import_url(&crts, &crts_size, file, pin_fn, pin_fn_userdata, 0);
+		ret =
+		    gnutls_x509_crt_list_import_url(&crts, &crts_size, file,
+						    pin_fn, pin_fn_userdata, 0);
 		if (ret < 0) {
-			ret2 = gnutls_x509_crt_list_import_url(&crts, &crts_size, file, pin_fn, pin_fn_userdata, GNUTLS_PKCS11_OBJ_FLAG_LOGIN);
-			if (ret2 >= 0) ret = ret2;
+			ret2 =
+			    gnutls_x509_crt_list_import_url(&crts, &crts_size,
+							    file, pin_fn,
+							    pin_fn_userdata,
+							    GNUTLS_PKCS11_OBJ_FLAG_LOGIN);
+			if (ret2 >= 0)
+				ret = ret2;
 		}
 
 		if (ret < 0) {
@@ -272,12 +277,16 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
 			goto cleanup;
 		}
 
-	} else { /* file */
+	} else {		/* file */
 		ret = gnutls_load_file(file, &data);
 		if (ret < 0)
 			return gnutls_assert_val(ret);
 
-		ret = gnutls_x509_crt_list_import2(&crts, &crts_size, &data, format, flags|GNUTLS_X509_CRT_LIST_SORT);
+		ret =
+		    gnutls_x509_crt_list_import2(&crts, &crts_size, &data,
+						 format,
+						 flags |
+						 GNUTLS_X509_CRT_LIST_SORT);
 		if (ret < 0) {
 			gnutls_assert();
 			goto cleanup;
@@ -290,7 +299,8 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
 		goto cleanup;
 	}
 
-	ret = gnutls_pcert_import_x509_list(pcert_list, crts, &crts_size, flags);
+	ret =
+	    gnutls_pcert_import_x509_list(pcert_list, crts, &crts_size, flags);
 	if (ret < 0) {
 		gnutls_assert();
 		goto cleanup;
@@ -298,15 +308,14 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
 	*pcert_list_size = crts_size;
 
 	ret = 0;
-cleanup:
-	for (i=0;i<crts_size;i++)
+ cleanup:
+	for (i = 0; i < crts_size; i++)
 		gnutls_x509_crt_deinit(crts[i]);
 	gnutls_free(crts);
 	gnutls_free(data.data);
 	return ret;
 }
 
-
 /**
  * gnutls_pcert_import_x509_raw:
  * @pcert: The pcert structure
@@ -351,7 +360,7 @@ int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert,
 
 	ret = 0;
 
-      cleanup:
+ cleanup:
 	gnutls_x509_crt_deinit(crt);
 
 	return ret;
@@ -374,8 +383,8 @@ int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert,
  *
  * Since: 3.6.6
  **/
-int gnutls_pcert_import_rawpk(gnutls_pcert_st* pcert,
-			     gnutls_pubkey_t pubkey, unsigned int flags)
+int gnutls_pcert_import_rawpk(gnutls_pcert_st * pcert,
+			      gnutls_pubkey_t pubkey, unsigned int flags)
 {
 	int ret;
 
@@ -426,10 +435,10 @@ int gnutls_pcert_import_rawpk(gnutls_pcert_st* pcert,
  *
  * Since: 3.6.6
  **/
-int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
-				    const gnutls_datum_t* rawpubkey,
-				    gnutls_x509_crt_fmt_t format,
-				    unsigned int key_usage, unsigned int flags)
+int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert,
+				  const gnutls_datum_t * rawpubkey,
+				  gnutls_x509_crt_fmt_t format,
+				  unsigned int key_usage, unsigned int flags)
 {
 	int ret;
 
@@ -443,7 +452,6 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
 	if (ret < 0) {
 		return gnutls_assert_val(ret);
 	}
-
 	// Convert our raw public-key to a gnutls_pubkey_t structure
 	ret = gnutls_pubkey_import(pcert->pubkey, rawpubkey, format);
 	if (ret < 0) {
@@ -460,8 +468,8 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
 	 */
 	if (format == GNUTLS_X509_FMT_PEM) {
 		ret = _gnutls_fbase64_decode(PEM_PK,
-					rawpubkey->data, rawpubkey->size,
-					&pcert->cert);
+					     rawpubkey->data, rawpubkey->size,
+					     &pcert->cert);
 
 		if (ret < 0) {
 			gnutls_pubkey_deinit(pcert->pubkey);
@@ -470,7 +478,9 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
 		}
 	} else {
 		// Directly copy the raw DER data to our pcert
-		ret = _gnutls_set_datum(&pcert->cert, rawpubkey->data, rawpubkey->size);
+		ret =
+		    _gnutls_set_datum(&pcert->cert, rawpubkey->data,
+				      rawpubkey->size);
 
 		if (ret < 0) {
 			gnutls_pubkey_deinit(pcert->pubkey);
@@ -499,8 +509,7 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
  *
  * Since: 3.4.0
  */
-int gnutls_pcert_export_x509(gnutls_pcert_st * pcert,
-			     gnutls_x509_crt_t * crt)
+int gnutls_pcert_export_x509(gnutls_pcert_st * pcert, gnutls_x509_crt_t * crt)
 {
 	int ret;
 
@@ -549,17 +558,17 @@ _gnutls_get_auth_info_pcert(gnutls_pcert_st * pcert,
 			    cert_auth_info_t info)
 {
 	switch (type) {
-		case GNUTLS_CRT_X509:
-			return gnutls_pcert_import_x509_raw(pcert,
-							&info->raw_certificate_list[0],
-							GNUTLS_X509_FMT_DER,
-							0);
-		case GNUTLS_CRT_RAWPK:
-			return gnutls_pcert_import_rawpk_raw(pcert,
-							&info->raw_certificate_list[0],
-							GNUTLS_X509_FMT_DER,
-							0, 0);
-		default:
-			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+	case GNUTLS_CRT_X509:
+		return gnutls_pcert_import_x509_raw(pcert,
+						    &info->raw_certificate_list
+						    [0], GNUTLS_X509_FMT_DER,
+						    0);
+	case GNUTLS_CRT_RAWPK:
+		return gnutls_pcert_import_rawpk_raw(pcert,
+						     &info->raw_certificate_list
+						     [0], GNUTLS_X509_FMT_DER,
+						     0, 0);
+	default:
+		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 	}
 }