diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-11-09 11:16:12 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-11-09 11:16:12 +0100 |
| commit | 4fc0a9d40b4664eeee3e92831dd47e4d99aaabe9 (patch) | |
| tree | ec5ae265bef461dab48026d43719293ab60ffcf7 /src/libstrongswan/crypto/iv/iv_gen.c | |
| parent | 32ebb56c5be7969f4f68b3844e3b68f53ab5c270 (diff) | |
| parent | 17816515d26fb8b983c35641caaaf82a08cb5962 (diff) | |
| download | strongswan-4fc0a9d40b4664eeee3e92831dd47e4d99aaabe9.tar.bz2 strongswan-4fc0a9d40b4664eeee3e92831dd47e4d99aaabe9.tar.xz | |
Merge branch 'iv-gen-null-encr'
Fixes NULL encryption in libipsec.
Fixes #1174.
Diffstat (limited to 'src/libstrongswan/crypto/iv/iv_gen.c')
| -rw-r--r-- | src/libstrongswan/crypto/iv/iv_gen.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libstrongswan/crypto/iv/iv_gen.c b/src/libstrongswan/crypto/iv/iv_gen.c index 7d6570a74..c70627723 100644 --- a/src/libstrongswan/crypto/iv/iv_gen.c +++ b/src/libstrongswan/crypto/iv/iv_gen.c @@ -1,4 +1,7 @@ /* + * Copyright (C) 2015 Tobias Brunner + * Hochschule fuer Technik Rapperswil + * * Copyright (C) 2015 Martin Willi * Copyright (C) 2015 revosec AG * @@ -16,6 +19,7 @@ #include "iv_gen.h" #include "iv_gen_rand.h" #include "iv_gen_seq.h" +#include "iv_gen_null.h" /** * See header. @@ -52,6 +56,7 @@ iv_gen_t* iv_gen_create_for_alg(encryption_algorithm_t alg) case ENCR_NULL_AUTH_AES_GMAC: return iv_gen_seq_create(); case ENCR_NULL: + return iv_gen_null_create(); case ENCR_UNDEFINED: case ENCR_DES_ECB: case ENCR_DES_IV32: |