Fixed bad bit shift and sign extension errors

diff --git a/src/libstrongswan/crypto/mgf1/mgf1_bitspender.c b/src/libstrongswan/crypto/mgf1/mgf1_bitspender.c
index 776201112e3d146877fd830fe1b28966425f5301..ef0a2bd01bb277b19be20878a1145f0413020f18 100644 (file)
--- a/src/libstrongswan/crypto/mgf1/mgf1_bitspender.c
+++ b/src/libstrongswan/crypto/mgf1/mgf1_bitspender.c
@@ -79,13 +79,19 @@ METHOD(mgf1_bitspender_t, get_bits, bool,
        private_mgf1_bitspender_t *this, int bits_needed, uint32_t *bits)
 {
        int bits_now;
-       
+
+       *bits = 0x00000000;
+
+       if (bits_needed == 0)
+       {
+               /* trivial */
+               return TRUE;
+       }
        if (bits_needed > 32)
        {
                /* too many bits requested */
                return FALSE;
        }
-       *bits = 0x00000000;
 
        while (bits_needed)
        {
@@ -113,17 +119,25 @@ METHOD(mgf1_bitspender_t, get_bits, bool,
                        bits_now = this->bits_left;
                        this->bits_left = 0;
                        bits_needed -= bits_now;
-                       *bits <<= bits_now;
-                       *bits |= this->bits;
                }
                else
                {
                        bits_now = bits_needed;
                        this->bits_left -= bits_needed;
                        bits_needed = 0;
+               }
+               if (bits_now == 32)
+               {
+                       *bits = this->bits;
+               }
+               else
+               {
                        *bits <<= bits_now;
                        *bits |= this->bits >> this->bits_left;
-                       this->bits &= 0xffffffff >> (32 - this->bits_left);
+                       if (this->bits_left)
+                       {
+                               this->bits &= 0xffffffff >> (32 - this->bits_left);
+                       }
                }
        }
        return TRUE;
@@ -151,7 +165,7 @@ METHOD(mgf1_bitspender_t, get_byte, bool,
        }
        *byte = this->bytes[4 - this->bytes_left--];
 
-       return TRUE;                            
+       return TRUE;
 }
 
 METHOD(mgf1_bitspender_t, destroy, void,

diff --git a/src/libstrongswan/plugins/bliss/bliss_bitpacker.c b/src/libstrongswan/plugins/bliss/bliss_bitpacker.c
index 295c5a219dd03fac709ed17d524144bd27693364..4d84461191cceb8b7e83d003b53df5b32d29f778 100644 (file)
--- a/src/libstrongswan/plugins/bliss/bliss_bitpacker.c
+++ b/src/libstrongswan/plugins/bliss/bliss_bitpacker.c
@@ -62,12 +62,19 @@ METHOD(bliss_bitpacker_t, get_bits, size_t,
 METHOD(bliss_bitpacker_t, write_bits, bool,
        private_bliss_bitpacker_t *this, uint32_t value, size_t bits)
 {
+       if (bits == 0)
+       {
+               return TRUE;
+       }
        if (bits > 32)
        {
                return FALSE;
        }
+       if (bits < 32)
+       {
+               value &= (1 << bits) - 1;
+       }
        this->bits += bits;
-       value &= (1 << bits) - 1;
 
        while (TRUE)
        {
@@ -152,7 +159,7 @@ METHOD(bliss_bitpacker_t, destroy, void,
 /**
  * See header.
  */
-bliss_bitpacker_t *bliss_bitpacker_create(size_t max_bits)
+bliss_bitpacker_t *bliss_bitpacker_create(uint16_t max_bits)
 {
        private_bliss_bitpacker_t *this;
 

diff --git a/src/libstrongswan/plugins/bliss/bliss_bitpacker.h b/src/libstrongswan/plugins/bliss/bliss_bitpacker.h
index 52f6c8af0e033cc859878b5dee74a6128d2ce76c..2fe6cba1c64dae879903f1b73241228b9f3c84b1 100644 (file)
--- a/src/libstrongswan/plugins/bliss/bliss_bitpacker.h
+++ b/src/libstrongswan/plugins/bliss/bliss_bitpacker.h
@@ -73,7 +73,7 @@ struct bliss_bitpacker_t {
  *
  * @param max_bits             Total number of bits to be stored
  */
-bliss_bitpacker_t* bliss_bitpacker_create(size_t max_bits);
+bliss_bitpacker_t* bliss_bitpacker_create(uint16_t max_bits);
 
 /**
  * Create a bliss_bitpacker_t object for reading

diff --git a/src/libstrongswan/plugins/bliss/bliss_public_key.c b/src/libstrongswan/plugins/bliss/bliss_public_key.c
index f97d0f3f78fbedee6924a03b20aa2ba079b7e00f..912ec3de520b15dd6ee3732cf52871ce5d93b3f1 100644 (file)
--- a/src/libstrongswan/plugins/bliss/bliss_public_key.c
+++ b/src/libstrongswan/plugins/bliss/bliss_public_key.c
@@ -391,12 +391,15 @@ bool bliss_public_key_from_asn1(chunk_t object, bliss_param_set_t *set,
 {
        bliss_bitpacker_t *packer;
        uint32_t coefficient;
+       uint16_t needed_bits;
        int i;
 
        /* skip initial bit string octet defining unused bits */
        object = chunk_skip(object, 1);
 
-       if (8 * object.len < set->n * set->q_bits)
+       needed_bits = set->n * set->q_bits;
+
+       if (8 * object.len < needed_bits)
        {
                return FALSE;
        }