X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Fcipher.h;h=41450c411f4af6cdcdc8d4b0d4a9dfd4e7950af9;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=4d1e0962463699b0cfffbffa1a8382ad7d9ed656;hpb=551cd19406a560d0d206bff5b4e9da064ec222b6;p=tinc

diff --git a/src/gcrypt/cipher.h b/src/gcrypt/cipher.h
index 4d1e0962..41450c41 100644
--- a/src/gcrypt/cipher.h
+++ b/src/gcrypt/cipher.h
@@ -1,6 +1,9 @@
+#ifndef TINC_GCRYPT_CIPHER_H
+#define TINC_GCRYPT_CIPHER_H
+
 /*
     cipher.h -- header file cipher.c
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -12,15 +15,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CIPHER_H__
-#define __TINC_CIPHER_H__
+#include "system.h"
 
 #include <gcrypt.h>
 
@@ -30,10 +30,11 @@
 
 typedef struct cipher {
 	gcry_cipher_hd_t handle;
-	char *key;
+	uint8_t *key;
 	int nid;
 	uint16_t keylen;
 	uint16_t blklen;
+	bool padding;
 } cipher_t;
 
 extern bool cipher_open_by_name(struct cipher *, const char *);