diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-10-29 17:43:51 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-10-29 17:43:51 +0100 |
| commit | 4d0c77888c6b17b11390eaefe41e14229365c463 (patch) | |
| tree | 76db22e48b28d96f16a7ce0111109b00b6f519c3 /src/openvpn/crypto.h | |
| parent | 52a3e3b0ad96506d705d1759f5a41b40563167ec (diff) | |
| parent | 63862ed15e1abb4b29c5a43b469321c928613c62 (diff) | |
Merge tag 'upstream/2.3.5'
Upstream version 2.3.5
Diffstat (limited to 'src/openvpn/crypto.h')
| -rw-r--r-- | src/openvpn/crypto.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index 3b4b88e..bf2f802 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -32,8 +32,6 @@ #ifdef ENABLE_CRYPTO -#define ALLOW_NON_CBC_CIPHERS - #include "crypto_backend.h" #include "basic.h" #include "buffer.h" @@ -189,8 +187,6 @@ bool write_key (const struct key *key, const struct key_type *kt, int read_key (struct key *key, const struct key_type *kt, struct buffer *buf); -bool cfb_ofb_mode (const struct key_type* kt); - void init_key_type (struct key_type *kt, const char *ciphername, bool ciphername_defined, const char *authname, bool authname_defined, int keysize, bool cfb_ofb_allowed, bool warn); |