indented

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index c9fdde82b722033fc2205355f50a6989e6d8af04..7dab15037c8c70159c463c0d079c8b33c3596ef5 100644 (file)
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -67,27 +67,24 @@ gnutls_privkey_type_t gnutls_privkey_get_type(gnutls_privkey_t key)
  *
  * Since: 2.12.0
  **/
-int
-gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key, unsigned int *bits)
+int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key, unsigned int *bits)
 {
        switch (key->type) {
 #ifdef ENABLE_OPENPGP
        case GNUTLS_PRIVKEY_OPENPGP:
-               return gnutls_openpgp_privkey_get_pk_algorithm(key->key.
-                                                              openpgp,
+               return gnutls_openpgp_privkey_get_pk_algorithm(key->key.openpgp,
                                                               bits);
 #endif
 #ifdef ENABLE_PKCS11
        case GNUTLS_PRIVKEY_PKCS11:
-               return gnutls_pkcs11_privkey_get_pk_algorithm(key->key.
-                                                             pkcs11,
+               return gnutls_pkcs11_privkey_get_pk_algorithm(key->key.pkcs11,
                                                              bits);
 #endif
        case GNUTLS_PRIVKEY_X509:
                if (bits)
                        *bits =
-                           _gnutls_mpi_get_nbits(key->key.x509->params.
-                                                 params[0]);
+                           _gnutls_mpi_get_nbits(key->key.x509->
+                                                 params.params[0]);
                return gnutls_x509_privkey_get_pk_algorithm(key->key.x509);
        case GNUTLS_PRIVKEY_EXT:
                if (bits)
@@ -102,8 +99,7 @@ gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key, unsigned int *bits)
 
 static int
 privkey_to_pubkey(gnutls_pk_algorithm_t pk,
-                 const gnutls_pk_params_st * priv,
-                 gnutls_pk_params_st * pub)
+                 const gnutls_pk_params_st * priv, gnutls_pk_params_st * pub)
 {
        int ret;
 
@@ -146,8 +142,7 @@ privkey_to_pubkey(gnutls_pk_algorithm_t pk,
 
                pub->params_nr = ECC_PUBLIC_PARAMS;
 
-               if (pub->params[ECC_X] == NULL
-                   || pub->params[ECC_Y] == NULL) {
+               if (pub->params[ECC_X] == NULL || pub->params[ECC_Y] == NULL) {
                        gnutls_assert();
                        ret = GNUTLS_E_MEMORY_ERROR;
                        goto cleanup;
@@ -160,17 +155,15 @@ privkey_to_pubkey(gnutls_pk_algorithm_t pk,
        }
 
        return 0;
-      cleanup:
+ cleanup:
        gnutls_pk_params_release(pub);
        return ret;
 }
 
-
 /* Returns the public key of the private key (if possible)
  */
 static int
-_gnutls_privkey_get_mpis(gnutls_privkey_t key,
-                               gnutls_pk_params_st * params)
+_gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
 {
        int ret;
 
@@ -187,18 +180,12 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key,
                        if (ret == 0) {
                                KEYID_IMPORT(kid, keyid);
                                ret =
-                                   _gnutls_openpgp_privkey_get_mpis(key->
-                                                                    key.
-                                                                    openpgp,
-                                                                    kid,
-                                                                    params);
+                                   _gnutls_openpgp_privkey_get_mpis
+                                   (key->key.openpgp, kid, params);
                        } else
                                ret =
-                                   _gnutls_openpgp_privkey_get_mpis(key->
-                                                                    key.
-                                                                    openpgp,
-                                                                    NULL,
-                                                                    params);
+                                   _gnutls_openpgp_privkey_get_mpis
+                                   (key->key.openpgp, NULL, params);
 
                        if (ret < 0) {
                                gnutls_assert();
@@ -298,8 +285,7 @@ void gnutls_privkey_deinit(gnutls_privkey_t key)
                case GNUTLS_PRIVKEY_EXT:
                        if (key->key.ext.deinit_func != NULL)
                                key->key.ext.deinit_func(key,
-                                                        key->key.ext.
-                                                        userdata);
+                                                        key->key.ext.userdata);
                        break;
                default:
                        break;
@@ -341,8 +327,7 @@ static int check_if_clean(gnutls_privkey_t key)
  **/
 int
 gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey,
-                            gnutls_pkcs11_privkey_t key,
-                            unsigned int flags)
+                            gnutls_pkcs11_privkey_t key, unsigned int flags)
 {
        int ret;
 
@@ -357,8 +342,7 @@ gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey,
 
        pkey->key.pkcs11 = key;
        pkey->type = GNUTLS_PRIVKEY_PKCS11;
-       pkey->pk_algorithm =
-           gnutls_pkcs11_privkey_get_pk_algorithm(key, NULL);
+       pkey->pk_algorithm = gnutls_pkcs11_privkey_get_pk_algorithm(key, NULL);
        pkey->flags = flags;
 
        if (pkey->pin.data)
@@ -412,7 +396,7 @@ int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key, const char *url)
 
        return 0;
 
-      cleanup:
+ cleanup:
        gnutls_pkcs11_privkey_deinit(pkey);
 
        return ret;
@@ -586,28 +570,27 @@ gnutls_privkey_import_x509(gnutls_privkey_t pkey,
  * Since: 3.3.0
  **/
 int
-gnutls_privkey_generate (gnutls_privkey_t pkey,
-                         gnutls_pk_algorithm_t algo, unsigned int bits,
-                         unsigned int flags)
+gnutls_privkey_generate(gnutls_privkey_t pkey,
+                       gnutls_pk_algorithm_t algo, unsigned int bits,
+                       unsigned int flags)
 {
-int ret;
-
-  ret = gnutls_x509_privkey_init(&pkey->key.x509);
-  if (ret < 0)
-    return gnutls_assert_val(ret);
-      
-  ret = gnutls_x509_privkey_generate(pkey->key.x509, algo, bits, flags);
-  if (ret < 0)
-    {
-      gnutls_x509_privkey_deinit(pkey->key.x509);
-      return gnutls_assert_val(ret);
-    }
-
-  pkey->type = GNUTLS_PRIVKEY_X509;
-  pkey->pk_algorithm = algo;
-  pkey->flags = flags|GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE;
-
-  return 0;
+       int ret;
+
+       ret = gnutls_x509_privkey_init(&pkey->key.x509);
+       if (ret < 0)
+               return gnutls_assert_val(ret);
+
+       ret = gnutls_x509_privkey_generate(pkey->key.x509, algo, bits, flags);
+       if (ret < 0) {
+               gnutls_x509_privkey_deinit(pkey->key.x509);
+               return gnutls_assert_val(ret);
+       }
+
+       pkey->type = GNUTLS_PRIVKEY_X509;
+       pkey->pk_algorithm = algo;
+       pkey->flags = flags | GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE;
+
+       return 0;
 }
 
 #ifdef ENABLE_OPENPGP
@@ -634,8 +617,7 @@ int ret;
  **/
 int
 gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
-                             gnutls_openpgp_privkey_t key,
-                             unsigned int flags)
+                             gnutls_openpgp_privkey_t key, unsigned int flags)
 {
        int ret, idx;
        uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
@@ -673,8 +655,7 @@ gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
 
                pkey->pk_algorithm =
                    gnutls_openpgp_privkey_get_subkey_pk_algorithm(key,
-                                                                  idx,
-                                                                  NULL);
+                                                                  idx, NULL);
        }
 
        pkey->flags = flags;
@@ -711,18 +692,14 @@ int gnutls_privkey_import_openpgp_raw(gnutls_privkey_t pkey,
        if (ret < 0)
                return gnutls_assert_val(ret);
 
-       ret =
-           gnutls_openpgp_privkey_import(xpriv, data, format, password,
-                                         0);
+       ret = gnutls_openpgp_privkey_import(xpriv, data, format, password, 0);
        if (ret < 0) {
                gnutls_assert();
                goto cleanup;
        }
 
        if (keyid) {
-               ret =
-                   gnutls_openpgp_privkey_set_preferred_key_id(xpriv,
-                                                               keyid);
+               ret = gnutls_openpgp_privkey_set_preferred_key_id(xpriv, keyid);
                if (ret < 0) {
                        gnutls_assert();
                        goto cleanup;
@@ -739,7 +716,7 @@ int gnutls_privkey_import_openpgp_raw(gnutls_privkey_t pkey,
 
        ret = 0;
 
-      cleanup:
+ cleanup:
        gnutls_openpgp_privkey_deinit(xpriv);
 
        return ret;
@@ -793,9 +770,7 @@ gnutls_privkey_sign_data(gnutls_privkey_t signer,
                goto cleanup;
        }
 
-       ret =
-           gnutls_privkey_sign_raw_data(signer, flags, &digest,
-                                        signature);
+       ret = gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
        _gnutls_free_datum(&digest);
 
        if (ret < 0) {
@@ -805,7 +780,7 @@ gnutls_privkey_sign_data(gnutls_privkey_t signer,
 
        return 0;
 
-      cleanup:
+ cleanup:
        _gnutls_free_datum(&digest);
        return ret;
 }
@@ -864,9 +839,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
                goto cleanup;
        }
 
-       ret =
-           gnutls_privkey_sign_raw_data(signer, flags, &digest,
-                                        signature);
+       ret = gnutls_privkey_sign_raw_data(signer, flags, &digest, signature);
        if (ret < 0) {
                gnutls_assert();
                goto cleanup;
@@ -874,7 +847,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer,
 
        ret = 0;
 
-      cleanup:
+ cleanup:
        _gnutls_free_datum(&digest);
        return ret;
 }
@@ -919,8 +892,7 @@ gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
 #endif
        case GNUTLS_PRIVKEY_X509:
                return _gnutls_pk_sign(key->key.x509->pk_algorithm,
-                                      signature, data,
-                                      &key->key.x509->params);
+                                      signature, data, &key->key.x509->params);
        case GNUTLS_PRIVKEY_EXT:
                if (key->key.ext.sign_func == NULL)
                        return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
@@ -956,15 +928,13 @@ gnutls_privkey_decrypt_data(gnutls_privkey_t key,
        switch (key->type) {
 #ifdef ENABLE_OPENPGP
        case GNUTLS_PRIVKEY_OPENPGP:
-               return _gnutls_openpgp_privkey_decrypt_data(key->key.
-                                                           openpgp, flags,
-                                                           ciphertext,
+               return _gnutls_openpgp_privkey_decrypt_data(key->key.openpgp,
+                                                           flags, ciphertext,
                                                            plaintext);
 #endif
        case GNUTLS_PRIVKEY_X509:
                return _gnutls_pk_decrypt(key->pk_algorithm, plaintext,
-                                         ciphertext,
-                                         &key->key.x509->params);
+                                         ciphertext, &key->key.x509->params);
 #ifdef ENABLE_PKCS11
        case GNUTLS_PRIVKEY_PKCS11:
                return _gnutls_pkcs11_privkey_decrypt_data(key->key.pkcs11,
@@ -1007,8 +977,7 @@ gnutls_privkey_decrypt_data(gnutls_privkey_t key,
 int gnutls_privkey_import_x509_raw(gnutls_privkey_t pkey,
                                   const gnutls_datum_t * data,
                                   gnutls_x509_crt_fmt_t format,
-                                  const char *password,
-                                  unsigned int flags)
+                                  const char *password, unsigned int flags)
 {
        gnutls_x509_privkey_t xpriv;
        int ret;
@@ -1017,9 +986,7 @@ int gnutls_privkey_import_x509_raw(gnutls_privkey_t pkey,
        if (ret < 0)
                return gnutls_assert_val(ret);
 
-       ret =
-           gnutls_x509_privkey_import2(xpriv, data, format, password,
-                                       flags);
+       ret = gnutls_x509_privkey_import2(xpriv, data, format, password, flags);
        if (ret < 0) {
                gnutls_assert();
                goto cleanup;
@@ -1035,7 +1002,7 @@ int gnutls_privkey_import_x509_raw(gnutls_privkey_t pkey,
 
        return 0;
 
-      cleanup:
+ cleanup:
        gnutls_x509_privkey_deinit(xpriv);
 
        return ret;
@@ -1069,8 +1036,7 @@ gnutls_privkey_import_url(gnutls_privkey_t key, const char *url,
 
        if (strncmp(url, "tpmkey:", 7) == 0)
 #ifdef HAVE_TROUSERS
-               return gnutls_privkey_import_tpm_url(key, url, NULL, NULL,
-                                                    0);
+               return gnutls_privkey_import_tpm_url(key, url, NULL, NULL, 0);
 #else
                return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
 #endif
@@ -1095,8 +1061,7 @@ gnutls_privkey_import_url(gnutls_privkey_t key, const char *url,
  *
  **/
 void gnutls_privkey_set_pin_function(gnutls_privkey_t key,
-                                    gnutls_pin_callback_t fn,
-                                    void *userdata)
+                                    gnutls_pin_callback_t fn, void *userdata)
 {
        key->pin.cb = fn;
        key->pin.data = userdata;