diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-07-12 11:35:07 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2018-07-13 14:21:10 +0300 |
| commit | 74d268047e27052ab7c4a8e6c05626eba9582388 (patch) | |
| tree | cb13fbcf723968796888eb1abdc3db3c800ee5d6 | |
| parent | 5b61de4b3e54aa1faf13f7a17054ad0386a53e23 (diff) | |
linux-gen: ipsec: fall back to lower odp_random_kind_t if necessary
Create IV with lower random kind if ODP_RANDOM_CRYPTO is not supported.
This enables passing validation tests using odp_random_null.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
| -rw-r--r-- | platform/linux-generic/include/odp_global_data.h | 2 | ||||
| -rw-r--r-- | platform/linux-generic/odp_ipsec.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index a5c2abd14..a9eccc2b5 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -13,6 +13,7 @@ extern "C" { #include <odp/api/init.h> #include <odp/api/cpumask.h> +#include <odp/api/random.h> #include <sys/types.h> #include <pthread.h> #include <stdint.h> @@ -57,6 +58,7 @@ struct odp_global_data_s { int inotify_watch_fd; pthread_t inotify_thread; int inotify_pcapng_is_running; + odp_random_kind_t ipsec_rand_kind; }; extern struct odp_global_data_s odp_global_data; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 71258fe9a..5b739cc1a 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -13,6 +13,7 @@ #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp_global_data.h> #include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> @@ -1003,7 +1004,7 @@ static int ipsec_out_iv(ipsec_state_t *state, uint32_t len; len = odp_random_data(state->iv, ipsec_sa->esp_iv_len, - ODP_RANDOM_CRYPTO); + odp_global_data.ipsec_rand_kind); if (len != ipsec_sa->esp_iv_len) return -1; @@ -1892,6 +1893,10 @@ int _odp_ipsec_init_global(void) memset(&default_out_opt, 0, sizeof(default_out_opt)); + odp_global_data.ipsec_rand_kind = ODP_RANDOM_CRYPTO; + if (odp_global_data.ipsec_rand_kind > odp_random_max_kind()) + odp_global_data.ipsec_rand_kind = odp_random_max_kind(); + return 0; } |