X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/a93aacce200e0d68b614d8bfb05d9cbeba850b12..b87bffcb20069b174b2c03721466abdaafd780f2:/server/tripe.h diff --git a/server/tripe.h b/server/tripe.h index 8cd66afa..de3e016c 100644 --- a/server/tripe.h +++ b/server/tripe.h @@ -171,6 +171,7 @@ typedef struct bulkcrypto { #define BCP_CIPHER 1 #define BCP_MAC 2 +#define BCP_BLKC 4 struct algswitch { const gchash *h; /* Hash function */ @@ -178,10 +179,11 @@ struct algswitch { const struct bulkcrypto *bulk; /* Bulk crypto transformation */ const gccipher *c; /* Symmetric encryption scheme */ const gcmac *m; /* Message authentication code */ + const gccipher *b; /* Block cipher */ size_t hashsz; /* Hash output size */ size_t tagsz; /* Length to truncate MAC tags */ size_t expsz; /* Size of data to process */ - size_t cksz, mksz; /* Key lengths for @c@ and @m@ */ + size_t cksz, mksz, bksz; /* Key lengths for things */ }; typedef struct kdata { @@ -269,6 +271,7 @@ struct keyset { struct ksdir { gcipher *c; /* Keyset cipher for encryption */ gmac *m; /* Keyset MAC for integrity */ + gcipher *b; /* Block cipher, just in case */ } in, out; uint32 oseq; /* Outbound sequence number */ seqwin iseq; /* Inbound sequence number */