unfortunately my tab/spc config was wrong for a couple of years. fixed all tabs=>spaces+re-indent

2025-12-17 03:50:57 +01:00 · 2016-05-09 22:24:13 +02:00
parent a67149229f
commit 671352bc29
34 changed files with 1031 additions and 1031 deletions
--- a/bindings/cpp/helpers++.h
+++ b/bindings/cpp/helpers++.h
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/bindings/cpp/key++.h
+++ b/bindings/cpp/key++.h
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/bindings/cpp/key.cpp
+++ b/bindings/cpp/key.cpp
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/bindings/py/gencffi.pl
+++ b/bindings/py/gencffi.pl
@@ -87,19 +87,19 @@ foreach my $head (@ARGV) {
 print "PCP_RAW_CODE = '''\n";
 print qq(
 typedef enum {
-    JSON_OBJECT,
-    JSON_ARRAY,
-    JSON_STRING,
-    JSON_INTEGER,
-    JSON_REAL,
-    JSON_TRUE,
-    JSON_FALSE,
-    JSON_NULL
+JSON_OBJECT,
+JSON_ARRAY,
+JSON_STRING,
+JSON_INTEGER,
+JSON_REAL,
+JSON_TRUE,
+JSON_FALSE,
+JSON_NULL
 } json_type;

 typedef struct json_t {
-    json_type type;
-    size_t refcount;
+json_type type;
+size_t refcount;
 } json_t;
 );
 print join "\n", @typedefs;
--- a/include/pcp/crypto.h
+++ b/include/pcp/crypto.h
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.Linden.
+    Copyright (C) 2013-2016 T.Linden.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/include/pcp/keyhash.h
+++ b/include/pcp/keyhash.h
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.Linden.
+    Copyright (C) 2013-2016 T.Linden.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/include/pcp/platform.h
+++ b/include/pcp/platform.h
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/include/pcp/structs.h
+++ b/include/pcp/structs.h
@@ -311,6 +311,7 @@ struct _pcp_stream_t {
  Buffer *cache;     /**< The caching Buffer object (for look ahead read) */
  Buffer *next;      /**< The caching Next-Buffer object (for look ahead read) */
  Buffer *save;      /**< Temporary buffer to backup overflow data */
+  byte    *xb;       /**< Temporary byte buffer for reading/writing data */
  uint8_t is_buffer; /**< Set to 1 if the backend is a Buffer */
  uint8_t eof;       /**< Set to 1 if EOF reached */
  uint8_t err;       /**< Set to 1 if an error occured */
--- a/libpcp/buffer.c
+++ b/libpcp/buffer.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/context.c
+++ b/libpcp/context.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/crypto.c
+++ b/libpcp/crypto.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/ed.c
+++ b/libpcp/ed.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/key.c
+++ b/libpcp/key.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/keyhash.c
+++ b/libpcp/keyhash.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/keysig.c
+++ b/libpcp/keysig.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/mem.c
+++ b/libpcp/mem.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/mgmt.c
+++ b/libpcp/mgmt.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -914,19 +914,19 @@ json_t *pcp_sk2json(pcp_key_t *sk, byte *sig, size_t siglen) {
  }

  jout = json_pack(jformat,
-		   "id", sk->id,
-		   "owner", sk->owner,
-		   "mail", sk->mail,
-		   "ctime", (json_int_t)sk->ctime,
-		   "expire", (json_int_t)sk->ctime+31536000,
-		   "version", (json_int_t)sk->version,
-		   "serial", (json_int_t)sk->serial,
-		   "type", "public",
-		   "cipher", EXP_PK_CIPHER_NAME,
-		   "cryptpub", cryptpub,
-		   "sigpub", sigpub,
-		   "masterpub", masterpub,
-		   "signature", ssig
+                   "id"        , sk->id,
+                   "owner"     , sk->owner,
+                   "mail"      , sk->mail,
+                   "ctime"     , (json_int_t)sk->ctime,
+                   "expire"    , (json_int_t)sk->ctime+31536000,
+                   "version"   , (json_int_t)sk->version,
+                   "serial"    , (json_int_t)sk->serial,
+                   "type"      , "public",
+                   "cipher"    , EXP_PK_CIPHER_NAME,
+                   "cryptpub"  , cryptpub,
+                   "sigpub"    , sigpub,
+                   "masterpub" , masterpub,
+                   "signature" , ssig
                   );

  free(cryptpub);
--- a/libpcp/pcpstream.c
+++ b/libpcp/pcpstream.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/platform.c
+++ b/libpcp/platform.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/scrypt.c
+++ b/libpcp/scrypt.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/util.c
+++ b/libpcp/util.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T. von Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/vault.c
+++ b/libpcp/vault.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/libpcp/z85.c
+++ b/libpcp/z85.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2014 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/src/encryption.c
+++ b/src/encryption.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/src/keymgmt.c
+++ b/src/keymgmt.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.v.Dein.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/src/keyprint.c
+++ b/src/keyprint.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013 T.Linden.
+    Copyright (C) 2013-2016 T.v.Dein.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -119,11 +119,11 @@ void pcptext_vault(vault_t *vault) {
    
    checksum = _bin2hex(vault->checksum, LSHA);
    jout = json_pack("{sssisssisi}",
-		     "keyvaultfile", vault->filename,
-		     "version", vault->version,
-		     "checksum", checksum,
-		     "secretkeys", pcphash_count(ptx),
-		     "publickey", pcphash_countpub(ptx));
+                     "keyvaultfile" , vault->filename,
+                     "version"      , vault->version,
+                     "checksum"     , checksum,
+                     "secretkeys"   , pcphash_count(ptx),
+                     "publickey"    , pcphash_countpub(ptx));

    jkeys = json_array();
    
--- a/src/pcp.c
+++ b/src/pcp.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.Linden.
+    Copyright (C) 2013-2016 T.Linden.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -283,7 +283,6 @@ int main (int argc, char **argv)  {
        p_add_me(&recipient);
        userec = 1;
        break;
-
      case 'D':
        debug = 1;
        break;
--- a/src/signature.c
+++ b/src/signature.c
@@ -1,7 +1,7 @@
 /*
    This file is part of Pretty Curved Privacy (pcp1).

-    Copyright (C) 2013-2015 T.Linden.
+    Copyright (C) 2013-2016 T.Linden.

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by