Open "{" in same line as "if".
Single line for "} else {".
Empty line after local declarations.
Signed-off-by: Antonio Borneo <borneo.antonio at gmail.com>
---
gnutls_pkcs12.c | 182 +++++++++++++++++++------------------------------------
1 files changed, 63 insertions(+), 119 deletions(-)
diff --git a/gnutls_pkcs12.c b/gnutls_pkcs12.c
index ae203fa..871c415 100644
--- a/gnutls_pkcs12.c
+++ b/gnutls_pkcs12.c
@@ -55,17 +55,15 @@ static int make_chain(gnutls_x509_crt_t **chain, unsigned int *chain_len,
return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
i = 0;
- while (i < *extra_certs_len)
- {
+ while (i < *extra_certs_len) {
/* if it is an issuer but not a self-signed one */
if (gnutls_x509_crt_check_issuer((*chain)[*chain_len - 1], (*extra_certs)[i]) != 0 &&
- gnutls_x509_crt_check_issuer((*extra_certs)[i], (*extra_certs)[i]) == 0)
- {
+ gnutls_x509_crt_check_issuer((*extra_certs)[i], (*extra_certs)[i]) == 0) {
void *tmp = *chain;
+
*chain = gnutls_realloc(*chain, sizeof((*chain)[0]) *
++(*chain_len));
- if (*chain == NULL)
- {
+ if (*chain == NULL) {
gnutls_assert();
gnutls_free(tmp);
return GNUTLS_E_MEMORY_ERROR;
@@ -161,14 +159,12 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
*crl = NULL;
/* find the first private key */
- for (;;)
- {
+ for (;;) {
int elements_in_bag;
int i;
ret = gnutls_pkcs12_bag_init(&bag);
- if (ret < 0)
- {
+ if (ret < 0) {
bag = NULL;
gnutls_assert();
goto done;
@@ -177,80 +173,67 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
ret = gnutls_pkcs12_get_bag(p12, idx, bag);
if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
break;
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
ret = gnutls_pkcs12_bag_get_type(bag, 0);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
- if (ret == GNUTLS_BAG_ENCRYPTED)
- {
- if (password == NULL)
- {
+ if (ret == GNUTLS_BAG_ENCRYPTED) {
+ if (password == NULL) {
ret = gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
goto done;
}
ret = gnutls_pkcs12_bag_decrypt(bag, password);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
}
elements_in_bag = gnutls_pkcs12_bag_get_count(bag);
- if (elements_in_bag < 0)
- {
+ if (elements_in_bag < 0) {
gnutls_assert();
goto done;
}
- for (i = 0; i < elements_in_bag; i++)
- {
+ for (i = 0; i < elements_in_bag; i++) {
int type;
gnutls_datum_t data;
type = gnutls_pkcs12_bag_get_type(bag, i);
- if (type < 0)
- {
+ if (type < 0) {
gnutls_assert();
goto done;
}
ret = gnutls_pkcs12_bag_get_data(bag, i, &data);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
- switch (type)
- {
+ switch (type) {
case GNUTLS_BAG_PKCS8_ENCRYPTED_KEY:
- if (password == NULL)
- {
+ if (password == NULL) {
ret = gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
goto done;
}
case GNUTLS_BAG_PKCS8_KEY:
- if (*key != NULL) /* too simple to continue */
- {
+ if (*key != NULL) { /* too simple to continue */
gnutls_assert();
break;
}
ret = gnutls_x509_privkey_init(key);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
@@ -258,19 +241,16 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
ret = gnutls_x509_privkey_import_pkcs8
(*key, &data, GNUTLS_X509_FMT_DER, password,
type == GNUTLS_BAG_PKCS8_KEY ? GNUTLS_PKCS_PLAIN : 0);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
gnutls_x509_privkey_deinit(*key);
goto done;
}
key_id_size = sizeof(key_id);
- ret =
- gnutls_x509_privkey_get_key_id(*key, 0, key_id,
- &key_id_size);
- if (ret < 0)
- {
+ ret = gnutls_x509_privkey_get_key_id(*key, 0, key_id,
+ &key_id_size);
+ if (ret < 0) {
gnutls_assert();
gnutls_x509_privkey_deinit(*key);
goto done;
@@ -290,24 +270,20 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
break;
}
- if (privkey_ok == 0) /* no private key */
- {
+ if (privkey_ok == 0) { /* no private key */
gnutls_assert();
return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
}
- /* now find the corresponding certificate
- */
+ /* now find the corresponding certificate */
idx = 0;
bag = NULL;
- for (;;)
- {
+ for (;;) {
int elements_in_bag;
int i;
ret = gnutls_pkcs12_bag_init(&bag);
- if (ret < 0)
- {
+ if (ret < 0) {
bag = NULL;
gnutls_assert();
goto done;
@@ -316,70 +292,58 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
ret = gnutls_pkcs12_get_bag(p12, idx, bag);
if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
break;
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
ret = gnutls_pkcs12_bag_get_type(bag, 0);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
- if (ret == GNUTLS_BAG_ENCRYPTED)
- {
+ if (ret == GNUTLS_BAG_ENCRYPTED) {
ret = gnutls_pkcs12_bag_decrypt(bag, password);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
}
elements_in_bag = gnutls_pkcs12_bag_get_count(bag);
- if (elements_in_bag < 0)
- {
+ if (elements_in_bag < 0) {
gnutls_assert();
goto done;
}
- for (i = 0; i < elements_in_bag; i++)
- {
+ for (i = 0; i < elements_in_bag; i++) {
int type;
gnutls_datum_t data;
gnutls_x509_crt_t this_cert;
type = gnutls_pkcs12_bag_get_type(bag, i);
- if (type < 0)
- {
+ if (type < 0) {
gnutls_assert();
goto done;
}
ret = gnutls_pkcs12_bag_get_data(bag, i, &data);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
- switch (type)
- {
+ switch (type) {
case GNUTLS_BAG_CERTIFICATE:
ret = gnutls_x509_crt_init(&this_cert);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
- ret =
- gnutls_x509_crt_import(this_cert, &data, GNUTLS_X509_FMT_DER);
- if (ret < 0)
- {
+ ret = gnutls_x509_crt_import(this_cert, &data, GNUTLS_X509_FMT_DER);
+ if (ret < 0) {
gnutls_assert();
gnutls_x509_crt_deinit(this_cert);
goto done;
@@ -387,25 +351,22 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
/* check if the key id match */
cert_id_size = sizeof(cert_id);
- ret =
- gnutls_x509_crt_get_key_id(this_cert, 0, cert_id, &cert_id_size);
- if (ret < 0)
- {
+ ret = gnutls_x509_crt_get_key_id(this_cert, 0, cert_id, &cert_id_size);
+ if (ret < 0) {
gnutls_assert();
gnutls_x509_crt_deinit(this_cert);
goto done;
}
- if (memcmp(cert_id, key_id, cert_id_size) != 0)
- { /* they don't match - skip the certificate */
- if (extra_certs)
- {
+ if (memcmp(cert_id, key_id, cert_id_size) != 0) {
+ /* they don't match - skip the certificate */
+ if (extra_certs) {
void *tmp = _extra_certs;
+
_extra_certs = gnutls_realloc(_extra_certs,
sizeof(_extra_certs[0]) *
++_extra_certs_len);
- if (!_extra_certs)
- {
+ if (!_extra_certs) {
gnutls_assert();
gnutls_free(tmp);
ret = GNUTLS_E_MEMORY_ERROR;
@@ -413,50 +374,39 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
}
_extra_certs[_extra_certs_len - 1] = this_cert;
this_cert = NULL;
- }
- else
- {
+ } else {
gnutls_x509_crt_deinit(this_cert);
}
- }
- else
- {
- if (_chain_len == 0)
- {
+ } else {
+ if (_chain_len == 0) {
_chain = gnutls_malloc(sizeof(_chain[0]) * (++_chain_len));
- if (!_chain)
- {
+ if (!_chain) {
gnutls_assert();
ret = GNUTLS_E_MEMORY_ERROR;
goto done;
}
_chain[_chain_len - 1] = this_cert;
this_cert = NULL;
- }
- else
- {
+ } else {
gnutls_x509_crt_deinit(this_cert);
}
}
break;
case GNUTLS_BAG_CRL:
- if (crl == NULL || *crl != NULL)
- {
+ if (crl == NULL || *crl != NULL) {
gnutls_assert();
break;
}
ret = gnutls_x509_crl_init(crl);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
ret = gnutls_x509_crl_import(*crl, &data, GNUTLS_X509_FMT_DER);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
gnutls_x509_crl_deinit(*crl);
goto done;
@@ -476,15 +426,13 @@ gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
gnutls_pkcs12_bag_deinit(bag);
}
- if (_chain_len != 1)
- {
+ if (_chain_len != 1) {
ret = GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
goto done;
}
ret = make_chain(&_chain, &_chain_len, &_extra_certs, &_extra_certs_len);
- if (ret < 0)
- {
+ if (ret < 0) {
gnutls_assert();
goto done;
}
@@ -495,29 +443,25 @@ done:
if (bag)
gnutls_pkcs12_bag_deinit(bag);
- if (ret < 0)
- {
+ if (ret < 0) {
if (*key)
gnutls_x509_privkey_deinit(*key);
- if (_extra_certs_len && _extra_certs != NULL)
- {
+ if (_extra_certs_len && _extra_certs != NULL) {
unsigned int i;
+
for (i = 0; i < _extra_certs_len; i++)
gnutls_x509_crt_deinit(_extra_certs[i]);
gnutls_free(_extra_certs);
}
- if (_chain_len && _chain != NULL)
- {
+ if (_chain_len && _chain != NULL) {
unsigned int i;
+
for (i = 0; i < _chain_len; i++)
gnutls_x509_crt_deinit(_chain[i]);
gnutls_free(_chain);
}
- }
- else
- {
- if (extra_certs)
- {
+ } else {
+ if (extra_certs) {
*extra_certs = _extra_certs;
*extra_certs_len = _extra_certs_len;
}
--
1.7.3.4
