Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / gcrypt / cipher.h

diff --git a/src/gcrypt/cipher.h b/src/gcrypt/cipher.h
index 57c8128..41450c4 100644 (file)
--- 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
@@ -17,8 +20,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CIPHER_H__
-#define __TINC_CIPHER_H__
+#include "system.h"
 
 #include <gcrypt.h>
 
@@ -28,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 *);