[pisa-src] r1481 - trunk/libpisa/global.h

  • From: Thomas Jansen <mithi@xxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Mon, 02 Nov 2009 13:28:31 +0100

Author: tjansen
Date: Mon Nov  2 13:28:31 2009
New Revision: 1481

Log:
Removed unused #defines and typedefs.

Modified:
   trunk/libpisa/global.h

Modified: trunk/libpisa/global.h
==============================================================================
--- trunk/libpisa/global.h      Mon Nov  2 13:02:07 2009        (r1480)
+++ trunk/libpisa/global.h      Mon Nov  2 13:28:31 2009        (r1481)
@@ -166,51 +166,6 @@
 
 #define DEFAULT_CONFIG_DIR_MODE        0755
 
-/**
- * Protocol definitions
- * TODO: TH: possible preauth remnants (PISA_HIP*) - check dependencies and 
remove if possible
- *              Almost everything crypto-related (SHA, AES, MD5, 3DES, ESP, 
HMAC, HASH, TOKEN) should be handled
- *              by HIP and not PISA.
- */
-
-#define PISA_HIP_RESERVED                0
-#define PISA_HIP_AES_SHA1                1
-#define PISA_HIP_3DES_SHA1               2
-#define PISA_HIP_3DES_MD5                3
-#define PISA_HIP_BLOWFISH_SHA1           4
-#define PISA_HIP_NULL_SHA1               5
-#define PISA_HIP_NULL_MD5                6
-
-#define PISA_TRANSFORM_HIP_MAX           6
-#define PISA_TRANSFORM_ESP_MAX           6
-#define PISA_LOWER_TRANSFORM_TYPE 2048
-#define PISA_UPPER_TRANSFORM_TYPE 4095
-
-#define PISA_ESP_RESERVED                0
-#define PISA_ESP_AES_SHA1                1
-#define PISA_ESP_3DES_SHA1               2
-#define PISA_ESP_3DES_MD5                3
-#define PISA_ESP_BLOWFISH_SHA1           4
-#define PISA_ESP_NULL_SHA1               5
-#define PISA_ESP_NULL_MD5                6
-
-#define ESP_AES_KEY_BITS                128
-#define ESP_3DES_KEY_BITS               192
-
-#define PISA_ESP_NULL_NULL            0x0
-
-#define PISA_DIGEST_MD5                1
-#define PISA_DIGEST_SHA1               2
-#define PISA_DIGEST_SHA1_HMAC          3
-#define PISA_DIGEST_MD5_HMAC           4
-
-#define PISA_AH_SHA_LEN        20
-
-#define PISA_HMAC      HMAC
-#define PISA_HASH_LENGTH       SHA_DIGEST_LENGTH
-#define PISA_DEFAULT_TOKEN_HASH_KEY    "pisapisapisapisapisapisapisapisa"
-#define PISA_TOKEN_LENGTH      32
-
 /* FIXME: The entire certificate string should be 1760 bytes, i.e.,
  *  = public key(768 bytes) + certificate(224 bytes) + signature(768 bytes)
  *
@@ -222,9 +177,6 @@
  */
 //#define PISA_CERT_LENGTH     1760
 #define PISA_CERT_LENGTH       992
-#define PISA_KEY_LENGTH                32
-
-#define PISA_PUZZLE_OPAQUE_LEN 2
 
 /**
  * Types which are necessary for TLV(Type-Length-Value)
@@ -232,10 +184,6 @@
 typedef uint16_t pisa_tlv_type;
 typedef uint16_t pisa_tlv_len;
 typedef uint16_t pisa_packet_flags;
-typedef char pisa_generic_hash[PISA_HASH_LENGTH+1];
-typedef char pisa_cert[PISA_CERT_LENGTH+1];
-typedef struct in6_addr pisa_hit;
-typedef struct in_addr pisa_lsi;
 
 /**
  * Common data structure containing either IPv4 address or IPv6 address.
@@ -249,18 +197,6 @@
        uint16_t port;
 } pisa_common_addr;
 
-/** Struct used to deliver the minimal needed information to build SPKI cert 
**/
-typedef struct pisa_cert_spki_info {
-       pisa_tlv_type type;
-       pisa_tlv_len length;
-       char public_key[768];
-       char cert[224];
-       char signature[768];
-        struct in6_addr issuer_hit;
-        /* 0 if succesfully verified otherwise negative */
-        uint32_t success;
-} pisa_cert_spki_info;
-
 /**
  * Copy a IPv4 address
  * @param dst destination

Other related posts:

  • » [pisa-src] r1481 - trunk/libpisa/global.h - Thomas Jansen