diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-09-22 09:23:47 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-09-22 09:23:47 +0200 |
| commit | a3a8b4acaed04c039cbd20583755f140d70c84b1 (patch) | |
| tree | 88e018546464808b7cb52bca3ff102418221921b /src/libstrongswan | |
| parent | 11140e717f1eab88e29260083ca62f2f25d5dd15 (diff) | |
| download | strongswan-a3a8b4acaed04c039cbd20583755f140d70c84b1.tar.bz2 strongswan-a3a8b4acaed04c039cbd20583755f140d70c84b1.tar.xz | |
bliss: bliss_sampler expects XOF type
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/plugins/bliss/bliss_private_key.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstrongswan/plugins/bliss/bliss_private_key.c b/src/libstrongswan/plugins/bliss/bliss_private_key.c index 0479f0f8d..25253ed37 100644 --- a/src/libstrongswan/plugins/bliss/bliss_private_key.c +++ b/src/libstrongswan/plugins/bliss/bliss_private_key.c @@ -174,8 +174,7 @@ static bool sign_bliss(private_bliss_private_key_t *this, hash_algorithm_t alg, bliss_sampler_t *sampler = NULL; rng_t *rng; hasher_t *hasher; - hash_algorithm_t mgf1_alg; - ext_out_function_t oracle_alg; + ext_out_function_t mgf1_alg, oracle_alg; size_t mgf1_seed_len; uint8_t mgf1_seed_buf[HASH_SIZE_SHA512], data_hash_buf[HASH_SIZE_SHA512]; chunk_t mgf1_seed, data_hash; @@ -210,12 +209,12 @@ static bool sign_bliss(private_bliss_private_key_t *this, hash_algorithm_t alg, /* Set MGF1 hash algorithm and seed length based on security strength */ if (this->set->strength > 160) { - mgf1_alg = HASH_SHA256; + mgf1_alg = XOF_MGF1_SHA256; mgf1_seed_len = HASH_SIZE_SHA256; } else { - mgf1_alg = HASH_SHA1; + mgf1_alg = XOF_MGF1_SHA1; mgf1_seed_len = HASH_SIZE_SHA1; } mgf1_seed = chunk_create(mgf1_seed_buf, mgf1_seed_len); |