diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-12-12 12:48:23 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-12-12 12:48:31 +0100 |
| commit | 8aaf36c6e3ac478cc771d32e1cb8e8bcedaed870 (patch) | |
| tree | 264d9d3ab134e68c004094fa2909d1444f7f109a /src | |
| parent | 6e4620adfb29ae4767b9951d0d93d7840db2a7f9 (diff) | |
| download | strongswan-8aaf36c6e3ac478cc771d32e1cb8e8bcedaed870.tar.bz2 strongswan-8aaf36c6e3ac478cc771d32e1cb8e8bcedaed870.tar.xz | |
Fix ambiguities and gcc compiler warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/bliss/bliss_private_key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstrongswan/plugins/bliss/bliss_private_key.c b/src/libstrongswan/plugins/bliss/bliss_private_key.c index 55822232e..4f241bf1a 100644 --- a/src/libstrongswan/plugins/bliss/bliss_private_key.c +++ b/src/libstrongswan/plugins/bliss/bliss_private_key.c @@ -1004,7 +1004,7 @@ bliss_private_key_t *bliss_private_key_load(key_type_t type, va_list args) bliss_bitpacker_t *packer; asn1_parser_t *parser; size_t s_bits = 0; - uint32_t s_sign, s_mask, value; + uint32_t s_sign, s_mask = 0, value; bool success = FALSE; int objectID, oid, i; @@ -1072,7 +1072,7 @@ bliss_private_key_t *bliss_private_key_load(key_type_t type, va_list args) for (i = 0; i < this->set->n; i++) { packer->read_bits(packer, &value, s_bits); - this->s1[i] = value & s_sign ? value | s_mask : value; + this->s1[i] = (value & s_sign) ? value | s_mask : value; } packer->destroy(packer); break; @@ -1089,7 +1089,7 @@ bliss_private_key_t *bliss_private_key_load(key_type_t type, va_list args) for (i = 0; i < this->set->n; i++) { packer->read_bits(packer, &value, s_bits); - this->s2[i] = 2*(value & s_sign ? value | s_mask : value); + this->s2[i] = 2*((value & s_sign) ? value | s_mask : value); if (i == 0) { this->s2[0] += 1; |