mbed TLS 2.4.2, Virgil Security 2.0.3

VirgilSecurity · Mar 22, 2017 · d31c55f · d31c55f
2 parents 65f6188 + 31d51b8
commit d31c55f
Show file tree

Hide file tree

Showing 15 changed files with 156 additions and 150 deletions.
diff --git a/VirgilChangeLog b/VirgilChangeLog
@@ -1,5 +1,11 @@
 Virgil Security ChangeLog (Sorted per version, date)
 
+= Virgil Security 2.0.3 released 2016-03-22
+
+Bugfix
+  * Fix MSVC warnings
+
+
 = Virgil Security 2.0.2 released 2016-03-22
 
 Bugfix

diff --git a/library/ecies.c b/library/ecies.c
@@ -180,7 +180,7 @@ int mbedtls_ecies_encrypt(void *key, const mbedtls_ecies_info_t* info,
     );
     INVOKE_AND_CHECK(result,
         mbedtls_cipher_setkey(&cipher_ctx, cipher_key,
-                cipher_key_len * ECIES_OCTET_SIZE, MBEDTLS_ENCRYPT)
+                (int)(cipher_key_len * ECIES_OCTET_SIZE), MBEDTLS_ENCRYPT)
     );
     INVOKE_AND_CHECK(result,
         mbedtls_cipher_set_padding_mode(&cipher_ctx, MBEDTLS_ECIES_CIPHER_PADDING)
@@ -381,7 +381,7 @@ int mbedtls_ecies_decrypt(void *key, const mbedtls_ecies_info_t* info,
     // 4. Decrypt given message.
     INVOKE_AND_CHECK(result,
         mbedtls_cipher_setkey(&cipher_ctx, cipher_key,
-                cipher_key_len * ECIES_OCTET_SIZE, MBEDTLS_DECRYPT)
+                (int)(cipher_key_len * ECIES_OCTET_SIZE), MBEDTLS_DECRYPT)
     );
     INVOKE_AND_CHECK(result,
         mbedtls_cipher_set_padding_mode(&cipher_ctx, MBEDTLS_ECIES_CIPHER_PADDING)

diff --git a/library/ed25519/ref10/fe_add.c b/library/ed25519/ref10/fe_add.c
@@ -44,14 +44,14 @@ void fe_add(fe h,const fe f,const fe g)
   crypto_int32 h7 = f7 + g7;
   crypto_int32 h8 = f8 + g8;
   crypto_int32 h9 = f9 + g9;
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_cmov.c b/library/ed25519/ref10/fe_cmov.c
@@ -39,7 +39,7 @@ void fe_cmov(fe f,const fe g,unsigned int b)
   crypto_int32 x7 = f7 ^ g7;
   crypto_int32 x8 = f8 ^ g8;
   crypto_int32 x9 = f9 ^ g9;
-  b = -b;
+  b = -(int)b;
   x0 &= b;
   x1 &= b;
   x2 &= b;

diff --git a/library/ed25519/ref10/fe_cswap.c b/library/ed25519/ref10/fe_cswap.c
@@ -39,7 +39,7 @@ void fe_cswap(fe f,fe g,unsigned int b)
   crypto_int32 x7 = f7 ^ g7;
   crypto_int32 x8 = f8 ^ g8;
   crypto_int32 x9 = f9 ^ g9;
-  b = -b;
+  b = -(int)b;
   x0 &= b;
   x1 &= b;
   x2 &= b;

diff --git a/library/ed25519/ref10/fe_frombytes.c b/library/ed25519/ref10/fe_frombytes.c
@@ -60,14 +60,14 @@ void fe_frombytes(fe h,const unsigned char *s)
   carry6 = (h6 + (crypto_int64) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
   carry8 = (h8 + (crypto_int64) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_mul.c b/library/ed25519/ref10/fe_mul.c
@@ -240,14 +240,14 @@ void fe_mul(fe h,const fe f,const fe g)
   /* |h0| <= 2^25; from now on fits into int32 unchanged */
   /* |h1| <= 1.01*2^24 */
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_mul121666.c b/library/ed25519/ref10/fe_mul121666.c
@@ -57,14 +57,14 @@ void fe_mul121666(fe h, const fe f)
   carry6 = (h6 + (crypto_int64) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
   carry8 = (h8 + (crypto_int64) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_neg.c b/library/ed25519/ref10/fe_neg.c
@@ -32,14 +32,14 @@ void fe_neg(fe h,const fe f)
   crypto_int32 h7 = -f7;
   crypto_int32 h8 = -f8;
   crypto_int32 h9 = -f9;
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_sq.c b/library/ed25519/ref10/fe_sq.c
@@ -136,14 +136,14 @@ void fe_sq(fe h,const fe f)
 
   carry0 = (h0 + (crypto_int64) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_sq2.c b/library/ed25519/ref10/fe_sq2.c
@@ -147,14 +147,14 @@ void fe_sq2(fe h,const fe f)
 
   carry0 = (h0 + (crypto_int64) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/fe_sub.c b/library/ed25519/ref10/fe_sub.c
@@ -44,14 +44,14 @@ void fe_sub(fe h,const fe f,const fe g)
   crypto_int32 h7 = f7 - g7;
   crypto_int32 h8 = f8 - g8;
   crypto_int32 h9 = f9 - g9;
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32)h0;
+  h[1] = (crypto_int32)h1;
+  h[2] = (crypto_int32)h2;
+  h[3] = (crypto_int32)h3;
+  h[4] = (crypto_int32)h4;
+  h[5] = (crypto_int32)h5;
+  h[6] = (crypto_int32)h6;
+  h[7] = (crypto_int32)h7;
+  h[8] = (crypto_int32)h8;
+  h[9] = (crypto_int32)h9;
 }
diff --git a/library/ed25519/ref10/ge_scalarmult_base.c b/library/ed25519/ref10/ge_scalarmult_base.c
@@ -9,14 +9,14 @@ static unsigned char equal(signed char b,signed char c)
   crypto_uint32 y = x; /* 0: yes; 1..255: no */
   y -= 1; /* 4294967295: yes; 0..254: no */
   y >>= 31; /* 1: yes; 0: no */
-  return y;
+  return (unsigned char)y;
 }
 
 static unsigned char negative(signed char b)
 {
   unsigned long long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
   x >>= 63; /* 1: yes; 0: no */
-  return x;
+  return (unsigned char)x;
 }
 
 static void cmov(ge_precomp *t,ge_precomp *u,unsigned char b)

diff --git a/library/ed25519/ref10/sc_muladd.c b/library/ed25519/ref10/sc_muladd.c
@@ -333,36 +333,36 @@ void sc_muladd(unsigned char *s,const unsigned char *a,const unsigned char *b,co
   carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21;
   carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21;
 
-  s[0] = s0 >> 0;
-  s[1] = s0 >> 8;
-  s[2] = (s0 >> 16) | (s1 << 5);
-  s[3] = s1 >> 3;
-  s[4] = s1 >> 11;
-  s[5] = (s1 >> 19) | (s2 << 2);
-  s[6] = s2 >> 6;
-  s[7] = (s2 >> 14) | (s3 << 7);
-  s[8] = s3 >> 1;
-  s[9] = s3 >> 9;
-  s[10] = (s3 >> 17) | (s4 << 4);
-  s[11] = s4 >> 4;
-  s[12] = s4 >> 12;
-  s[13] = (s4 >> 20) | (s5 << 1);
-  s[14] = s5 >> 7;
-  s[15] = (s5 >> 15) | (s6 << 6);
-  s[16] = s6 >> 2;
-  s[17] = s6 >> 10;
-  s[18] = (s6 >> 18) | (s7 << 3);
-  s[19] = s7 >> 5;
-  s[20] = s7 >> 13;
-  s[21] = s8 >> 0;
-  s[22] = s8 >> 8;
-  s[23] = (s8 >> 16) | (s9 << 5);
-  s[24] = s9 >> 3;
-  s[25] = s9 >> 11;
-  s[26] = (s9 >> 19) | (s10 << 2);
-  s[27] = s10 >> 6;
-  s[28] = (s10 >> 14) | (s11 << 7);
-  s[29] = s11 >> 1;
-  s[30] = s11 >> 9;
-  s[31] = s11 >> 17;
+  s[0] = (unsigned char)(s0 >> 0);
+  s[1] = (unsigned char)(s0 >> 8);
+  s[2] = (unsigned char)((s0 >> 16) | (s1 << 5));
+  s[3] = (unsigned char)(s1 >> 3);
+  s[4] = (unsigned char)(s1 >> 11);
+  s[5] = (unsigned char)((s1 >> 19) | (s2 << 2));
+  s[6] = (unsigned char)(s2 >> 6);
+  s[7] = (unsigned char)((s2 >> 14) | (s3 << 7));
+  s[8] = (unsigned char)(s3 >> 1);
+  s[9] = (unsigned char)(s3 >> 9);
+  s[10] = (unsigned char)((s3 >> 17) | (s4 << 4));
+  s[11] = (unsigned char)(s4 >> 4);
+  s[12] = (unsigned char)(s4 >> 12);
+  s[13] = (unsigned char)((s4 >> 20) | (s5 << 1));
+  s[14] = (unsigned char)(s5 >> 7);
+  s[15] = (unsigned char)((s5 >> 15) | (s6 << 6));
+  s[16] = (unsigned char)(s6 >> 2);
+  s[17] = (unsigned char)(s6 >> 10);
+  s[18] = (unsigned char)((s6 >> 18) | (s7 << 3));
+  s[19] = (unsigned char)(s7 >> 5);
+  s[20] = (unsigned char)(s7 >> 13);
+  s[21] = (unsigned char)(s8 >> 0);
+  s[22] = (unsigned char)(s8 >> 8);
+  s[23] = (unsigned char)((s8 >> 16) | (s9 << 5));
+  s[24] = (unsigned char)(s9 >> 3);
+  s[25] = (unsigned char)(s9 >> 11);
+  s[26] = (unsigned char)((s9 >> 19) | (s10 << 2));
+  s[27] = (unsigned char)(s10 >> 6);
+  s[28] = (unsigned char)((s10 >> 14) | (s11 << 7));
+  s[29] = (unsigned char)(s11 >> 1);
+  s[30] = (unsigned char)(s11 >> 9);
+  s[31] = (unsigned char)(s11 >> 17);
 }