projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
global reindent, now with uncrustify hook enabled
[oweals/gnunet.git] / src / credential / credential_misc.c
diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c
index bc8a289123fd948cea0435a0349179e78f3c82c6..13435273e6f5b13c3806172f78f359c936d7d208 100644 (file)
--- a/src/credential/credential_misc.c
+++ b/src/credential/credential_misc.c
@@ -34,7 +34,8 @@
 #include <inttypes.h>
 
 char*
-GNUNET_CREDENTIAL_credential_to_string(const struct GNUNET_CREDENTIAL_Credential *cred)
+GNUNET_CREDENTIAL_credential_to_string (const struct
+                                        GNUNET_CREDENTIAL_Credential *cred)
 {
   char *cred_str;
   char *subject_pkey;
@@ -42,26 +43,26 @@ GNUNET_CREDENTIAL_credential_to_string(const struct GNUNET_CREDENTIAL_Credential
   char *signature;
 
 
-  subject_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string(&cred->subject_key);
-  issuer_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string(&cred->issuer_key);
-  GNUNET_STRINGS_base64_encode((char*)&cred->signature,
-                               sizeof(struct GNUNET_CRYPTO_EcdsaSignature),
-                               &signature);
-  GNUNET_asprintf(&cred_str,
-                  "%s.%s -> %s | %s | %" SCNu64,
-                  issuer_pkey,
-                  cred->issuer_attribute,
-                  subject_pkey,
-                  signature,
-                  cred->expiration.abs_value_us);
-  GNUNET_free(subject_pkey);
-  GNUNET_free(issuer_pkey);
-  GNUNET_free(signature);
+  subject_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&cred->subject_key);
+  issuer_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&cred->issuer_key);
+  GNUNET_STRINGS_base64_encode ((char*) &cred->signature,
+                                sizeof(struct GNUNET_CRYPTO_EcdsaSignature),
+                                &signature);
+  GNUNET_asprintf (&cred_str,
+                   "%s.%s -> %s | %s | %" SCNu64,
+                   issuer_pkey,
+                   cred->issuer_attribute,
+                   subject_pkey,
+                   signature,
+                   cred->expiration.abs_value_us);
+  GNUNET_free (subject_pkey);
+  GNUNET_free (issuer_pkey);
+  GNUNET_free (signature);
   return cred_str;
 }
 
 struct GNUNET_CREDENTIAL_Credential*
-GNUNET_CREDENTIAL_credential_from_string(const char* s)
+GNUNET_CREDENTIAL_credential_from_string (const char*s)
 {
   struct GNUNET_CREDENTIAL_Credential *cred;
   size_t enclen = (sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)) * 8;
@@ -72,42 +73,46 @@ GNUNET_CREDENTIAL_credential_from_string(const char* s)
   char subject_pkey[enclen + 1];
   char issuer_pkey[enclen + 1];
   char name[253 + 1];
-  char signature[256]; //TODO max payload size
+  char signature[256]; // TODO max payload size
 
   struct GNUNET_CRYPTO_EcdsaSignature *sig;
   struct GNUNET_TIME_Absolute etime_abs;
 
-  if (5 != sscanf(s,
-                  "%52s.%253s -> %52s | %s | %" SCNu64,
-                  issuer_pkey,
-                  name,
-                  subject_pkey,
-                  signature,
-                  &etime_abs.abs_value_us))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Unable to parse CRED record string `%s'\n"),
-                 s);
-      return NULL;
-    }
-  cred = GNUNET_malloc(sizeof(struct GNUNET_CREDENTIAL_Credential) + strlen(name) + 1);
-  GNUNET_CRYPTO_ecdsa_public_key_from_string(subject_pkey,
-                                             strlen(subject_pkey),
-                                             &cred->subject_key);
-  GNUNET_CRYPTO_ecdsa_public_key_from_string(issuer_pkey,
-                                             strlen(issuer_pkey),
-                                             &cred->issuer_key);
-  GNUNET_assert(sizeof(struct GNUNET_CRYPTO_EcdsaSignature) == GNUNET_STRINGS_base64_decode(signature,
-                                                                                            strlen(signature),
-                                                                                            (char**)&sig));
+  if (5 != sscanf (s,
+                   "%52s.%253s -> %52s | %s | %" SCNu64,
+                   issuer_pkey,
+                   name,
+                   subject_pkey,
+                   signature,
+                   &etime_abs.abs_value_us))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Unable to parse CRED record string `%s'\n"),
+                s);
+    return NULL;
+  }
+  cred = GNUNET_malloc (sizeof(struct GNUNET_CREDENTIAL_Credential) + strlen (
+                          name) + 1);
+  GNUNET_CRYPTO_ecdsa_public_key_from_string (subject_pkey,
+                                              strlen (subject_pkey),
+                                              &cred->subject_key);
+  GNUNET_CRYPTO_ecdsa_public_key_from_string (issuer_pkey,
+                                              strlen (issuer_pkey),
+                                              &cred->issuer_key);
+  GNUNET_assert (sizeof(struct GNUNET_CRYPTO_EcdsaSignature) ==
+                 GNUNET_STRINGS_base64_decode (signature,
+                                               strlen (
+                                                 signature),
+                                               (
+                                                 char**) &sig));
   cred->signature = *sig;
   cred->expiration = etime_abs;
-  GNUNET_free(sig);
-  GNUNET_memcpy(&cred[1],
-                name,
-                strlen(name) + 1);
-  cred->issuer_attribute_len = strlen((char*)&cred[1]);
-  cred->issuer_attribute = (char*)&cred[1];
+  GNUNET_free (sig);
+  GNUNET_memcpy (&cred[1],
+                 name,
+                 strlen (name) + 1);
+  cred->issuer_attribute_len = strlen ((char*) &cred[1]);
+  cred->issuer_attribute = (char*) &cred[1];
   return cred;
 }
 
@@ -120,51 +125,52 @@ GNUNET_CREDENTIAL_credential_from_string(const char* s)
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Credential *
-GNUNET_CREDENTIAL_credential_issue(const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer,
-                                   struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
-                                   const char *attribute,
-                                   struct GNUNET_TIME_Absolute *expiration)
+GNUNET_CREDENTIAL_credential_issue (const struct
+                                    GNUNET_CRYPTO_EcdsaPrivateKey *issuer,
+                                    struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
+                                    const char *attribute,
+                                    struct GNUNET_TIME_Absolute *expiration)
 {
   struct CredentialEntry *crd;
   struct GNUNET_CREDENTIAL_Credential *cred;
   size_t size;
 
-  size = sizeof(struct CredentialEntry) + strlen(attribute) + 1;
-  crd = GNUNET_malloc(size);
-  cred = GNUNET_malloc(sizeof(struct GNUNET_CREDENTIAL_Credential) + strlen(attribute) + 1);
-  crd->purpose.size = htonl(size - sizeof(struct GNUNET_CRYPTO_EcdsaSignature));
+  size = sizeof(struct CredentialEntry) + strlen (attribute) + 1;
+  crd = GNUNET_malloc (size);
+  cred = GNUNET_malloc (sizeof(struct GNUNET_CREDENTIAL_Credential) + strlen (
+                          attribute) + 1);
+  crd->purpose.size = htonl (size - sizeof(struct
+                                           GNUNET_CRYPTO_EcdsaSignature));
 
-  crd->purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_CREDENTIAL);
-  GNUNET_CRYPTO_ecdsa_key_get_public(issuer,
-                                     &crd->issuer_key);
+  crd->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CREDENTIAL);
+  GNUNET_CRYPTO_ecdsa_key_get_public (issuer,
+                                      &crd->issuer_key);
   crd->subject_key = *subject;
-  crd->expiration = GNUNET_htonll(expiration->abs_value_us);
-  crd->issuer_attribute_len = htonl(strlen(attribute) + 1);
-  GNUNET_memcpy((char*)&crd[1],
-                attribute,
-                strlen(attribute) + 1);
+  crd->expiration = GNUNET_htonll (expiration->abs_value_us);
+  crd->issuer_attribute_len = htonl (strlen (attribute) + 1);
+  GNUNET_memcpy ((char*) &crd[1],
+                 attribute,
+                 strlen (attribute) + 1);
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecdsa_sign(issuer,
-                               &crd->purpose,
-                               &crd->signature))
-    {
-      GNUNET_break(0);
-      GNUNET_free(crd);
-      GNUNET_free(cred);
-      return NULL;
-    }
+      GNUNET_CRYPTO_ecdsa_sign (issuer,
+                                &crd->purpose,
+                                &crd->signature))
+  {
+    GNUNET_break (0);
+    GNUNET_free (crd);
+    GNUNET_free (cred);
+    return NULL;
+  }
   cred->signature = crd->signature;
   cred->expiration = *expiration;
-  GNUNET_CRYPTO_ecdsa_key_get_public(issuer,
-                                     &cred->issuer_key);
+  GNUNET_CRYPTO_ecdsa_key_get_public (issuer,
+                                      &cred->issuer_key);
 
   cred->subject_key = *subject;
-  GNUNET_memcpy(&cred[1],
-                attribute,
-                strlen(attribute) + 1);
-  cred->issuer_attribute = (char*)&cred[1];
-  GNUNET_free(crd);
+  GNUNET_memcpy (&cred[1],
+                 attribute,
+                 strlen (attribute) + 1);
+  cred->issuer_attribute = (char*) &cred[1];
+  GNUNET_free (crd);
   return cred;
 }
-
-
Unnamed repository; edit this file 'description' to name the repository.