[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: indentation
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: indentation |
|
Date: |
Thu, 02 Apr 2020 10:17:41 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new ab4bc34 indentation
ab4bc34 is described below
commit ab4bc34fe87266b6da5be6200ad304a69ea8d1ee
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Apr 2 10:17:39 2020 +0200
indentation
---
src/util/anastasis_crypto.c | 75 +++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 2c9db15..7881b0a 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -59,8 +59,7 @@ get_iv_key (const void *key_material,
key_material,
key_m_len,
nonce,
- sizeof (struct
- ANASTASIS_CRYPTO_Nonce),
+ sizeof (struct ANASTASIS_CRYPTO_Nonce),
salt,
strlen (salt),
NULL,
@@ -198,7 +197,8 @@ anastasis_decrypt (const void *key,
TALER_B2S (tag));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"CIPHERTEXT_D: %s\n",
- TALER_b2s (ciphertext, strlen (ciphertext)));
+ TALER_b2s (ciphertext,
+ strlen (ciphertext)));
get_iv_key (key,
key_len,
nonce,
@@ -224,10 +224,10 @@ anastasis_decrypt (const void *key,
*res_size,
ciphertext,
*res_size));
- GNUNET_assert (0 == gcry_cipher_checktag (cipher,
- tag,
- sizeof(struct
- ANASTASIS_CRYPTO_AesTag)));
+ GNUNET_assert (0 ==
+ gcry_cipher_checktag (cipher,
+ tag,
+ sizeof(struct
ANASTASIS_CRYPTO_AesTag)));
gcry_cipher_close (cipher);
}
@@ -276,8 +276,7 @@ ANASTASIS_CRYPTO_account_private_key_derive (
GCRY_MD_SHA512,
GCRY_MD_SHA256,
id,
- sizeof (struct
- ANASTASIS_CRYPTO_UserIdentifier),
+ sizeof (struct ANASTASIS_CRYPTO_UserIdentifier),
"ver",
strlen ("ver"),
NULL,
@@ -357,8 +356,7 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
{
const char *salt = "erd";
anastasis_decrypt (id,
- sizeof (struct
- ANASTASIS_CRYPTO_UserIdentifier),
+ sizeof (struct ANASTASIS_CRYPTO_UserIdentifier),
enc_rec_doc,
erd_size,
salt,
@@ -388,16 +386,14 @@ ANASTASIS_CRYPTO_key_share_encrypt (
security question, see 12.6.-> interface EncryptedKeyShare in spec)
*/
anastasis_encrypt (id,
- sizeof (struct
- ANASTASIS_CRYPTO_UserIdentifier),
+ sizeof (struct ANASTASIS_CRYPTO_UserIdentifier),
key_share,
- sizeof (struct
- ANASTASIS_CRYPTO_KeyShare),
+ sizeof (struct ANASTASIS_CRYPTO_KeyShare),
salt,
(void **) enc_key_share,
&eks_size);
- GNUNET_assert (eks_size == sizeof (struct
- ANASTASIS_CRYPTO_EncryptedKeyShare));
+ GNUNET_assert (eks_size ==
+ sizeof (struct ANASTASIS_CRYPTO_EncryptedKeyShare));
}
@@ -417,11 +413,9 @@ ANASTASIS_CRYPTO_key_share_decrypt (
const char *salt = "eks";
size_t ks_size;
anastasis_decrypt (id,
- sizeof (struct
- ANASTASIS_CRYPTO_UserIdentifier),
+ sizeof (struct ANASTASIS_CRYPTO_UserIdentifier),
enc_key_share,
- sizeof (struct
- ANASTASIS_CRYPTO_EncryptedKeyShare),
+ sizeof (struct ANASTASIS_CRYPTO_EncryptedKeyShare),
salt,
(void **) key_share,
&ks_size);
@@ -451,8 +445,7 @@ ANASTASIS_CRYPTO_truth_encrypt (
{
const char *salt = "ect";
anastasis_encrypt (truth_enc_key,
- sizeof (struct
- ANASTASIS_CRYPTO_TruthKey),
+ sizeof (struct ANASTASIS_CRYPTO_TruthKey),
truth,
truth_size,
salt,
@@ -482,8 +475,7 @@ ANASTASIS_CRYPTO_truth_decrypt (
{
const char *salt = "ect";
anastasis_decrypt (truth_enc_key,
- sizeof (struct
- ANASTASIS_CRYPTO_TruthKey),
+ sizeof (struct ANASTASIS_CRYPTO_TruthKey),
enc_truth,
ect_size,
salt,
@@ -580,13 +572,13 @@ ANASTASIS_CRYPTO_core_secret_encrypt (
struct GNUNET_CRYPTO_SymmetricInitializationVector i_iv;
GNUNET_CRYPTO_hash_to_aes_key (&policy_keys[i].key, &i_sk, &i_iv);
- GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CRYPTO_symmetric_encrypt (&master_key,
- sizeof (struct
- GNUNET_HashCode),
- &i_sk,
- &i_iv,
-
&encrypted_master_keys[i]));
+ GNUNET_assert (
+ GNUNET_SYSERR !=
+ GNUNET_CRYPTO_symmetric_encrypt (&master_key,
+ sizeof (struct GNUNET_HashCode),
+ &i_sk,
+ &i_iv,
+ &encrypted_master_keys[i]));
}
}
@@ -617,14 +609,17 @@ ANASTASIS_CRYPTO_core_secret_recover (
*core_secret = GNUNET_malloc (encrypted_core_secret_size);
GNUNET_CRYPTO_hash_to_aes_key (&policy_key.key, &mk_sk, &mk_iv);
- GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CRYPTO_symmetric_decrypt (encrypted_master_key,
- sizeof (struct
-
ANASTASIS_CRYPTO_EncryptedMasterKey),
- &mk_sk,
- &mk_iv,
- &master_key));
- GNUNET_CRYPTO_hash_to_aes_key (&master_key, &core_sk, &core_iv);
+ GNUNET_assert (
+ GNUNET_SYSERR !=
+ GNUNET_CRYPTO_symmetric_decrypt (
+ encrypted_master_key,
+ sizeof (struct ANASTASIS_CRYPTO_EncryptedMasterKey),
+ &mk_sk,
+ &mk_iv,
+ &master_key));
+ GNUNET_CRYPTO_hash_to_aes_key (&master_key,
+ &core_sk,
+ &core_iv);
GNUNET_assert (GNUNET_SYSERR !=
GNUNET_CRYPTO_symmetric_decrypt (encrypted_core_secret,
encrypted_core_secret_size,
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: indentation,
gnunet <=