Changeset 464 for azure_iot_hub_f767zi/trunk/wolfssl-4.7.0/wolfcrypt/src/wolfmath.c

Timestamp:

Jun 22, 2021, 9:00:19 PM (3 years ago)

Author:

coas-nagasima

Message:

WolfSSLとAzure IoT SDKを更新

Location:

azure_iot_hub_f767zi/trunk/wolfssl-4.7.0

Files:

• . (moved) (moved from azure_iot_hub_f767zi/trunk/wolfssl-4.4.0 )
• wolfcrypt/src/wolfmath.c (modified) (9 diffs)

azure_iot_hub_f767zi/trunk/wolfssl-4.7.0/wolfcrypt/src/wolfmath.c

@@ -72 +72 @@
 
 
-#if !defined(WOLFSSL_SP_MATH)
 int get_digit_count(mp_int* a)
 {
@@ -80 +79 @@
     return a->used;
 }
-#endif
 
 mp_digit get_digit(mp_int* a, int n)
@@ -90 +88 @@
 }
 
+#if defined(HAVE_ECC) || defined(WOLFSSL_MP_COND_COPY)
 /* Conditionally copy a into b. Performed in constant time.
  *
@@ -102 +101 @@
     int err = MP_OKAY;
     int i;
+#if defined(SP_WORD_SIZE) && SP_WORD_SIZE == 8
+    unsigned int mask = (unsigned int)0 - copy;
+#else
     mp_digit mask = (mp_digit)0 - copy;
+#endif
 
     if (a == NULL || b == NULL)
@@ -124 +127 @@
         }
         b->used ^= (a->used ^ b->used) & (int)mask;
-    }
-
-    return err;
-}
+#if (!defined(WOLFSSL_SP_MATH) && !defined(WOLFSSL_SP_MATH_ALL)) || \
+    defined(WOLFSSL_SP_INT_NEGATIVE)
+        b->sign ^= (a->sign ^ b->sign) & (int)mask;
+#endif
+    }
+
+    return err;
+}
+#endif
 
 #ifndef WC_NO_RNG
@@ -147 +155 @@
         ret = MISSING_RNG_E;
     }
-    else if (a == NULL) {
+    else if (a == NULL || digits == 0) {
         ret = BAD_FUNC_ARG;
     }
@@ -157 +165 @@
     }
 #else
-#if defined(WOLFSSL_SP_MATH)
+#if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
     if ((ret == MP_OKAY) && (digits > SP_INT_DIGITS))
 #else
@@ -194 +202 @@
 #endif
 
+#if defined(HAVE_ECC) || defined(WOLFSSL_EXPORT_INT)
 /* export an mp_int as unsigned char or hex string
  * encType is WC_TYPE_UNSIGNED_BIN or WC_TYPE_HEX_STR
@@ -227 +236 @@
     return err;
 }
+#endif