Move RSA key generation into the wrappers.

[tinc] / src / gcrypt / cipher.h

diff --git a/src/gcrypt/cipher.h b/src/gcrypt/cipher.h
index 593b985..4d1e096 100644 (file)
--- a/src/gcrypt/cipher.h
+++ b/src/gcrypt/cipher.h
@@ -24,6 +24,10 @@
 
 #include <gcrypt.h>
 
+#define CIPHER_MAX_BLOCK_SIZE 32
+#define CIPHER_MAX_IV_SIZE 16
+#define CIPHER_MAX_KEY_SIZE 32
+
 typedef struct cipher {
        gcry_cipher_hd_t handle;
        char *key;
@@ -37,10 +41,10 @@ extern bool cipher_open_by_nid(struct cipher *, int);
 extern bool cipher_open_blowfish_ofb(struct cipher *);
 extern void cipher_close(struct cipher *);
 extern size_t cipher_keylength(const struct cipher *);
-extern void cipher_get_key(const struct cipher *, void *, bool);
+extern void cipher_get_key(const struct cipher *, void *);
 extern bool cipher_set_key(struct cipher *, void *, bool);
 extern bool cipher_set_key_from_rsa(struct cipher *, void *, size_t, bool);
-extern bool cipher_regenerate_key(struct cipher *);
+extern bool cipher_regenerate_key(struct cipher *, bool);
 extern bool cipher_encrypt(struct cipher *, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot);
 extern bool cipher_decrypt(struct cipher *, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot);
 extern int cipher_get_nid(const struct cipher *);