GOST EC armv7 aarch64 fixes

[openssl-gost/engine.git] / ecp_id_GostR3410_2001_TestParamSet.c

diff --git a/ecp_id_GostR3410_2001_TestParamSet.c b/ecp_id_GostR3410_2001_TestParamSet.c
index 71f1b23c5da63b661d0e6598492c99c27da3a5a6..410de5af46758e84c4c411f3097e29307d435a92 100644 (file)
--- a/ecp_id_GostR3410_2001_TestParamSet.c
+++ b/ecp_id_GostR3410_2001_TestParamSet.c
@@ -3609,8 +3609,8 @@ static void point_double(pt_prj_t *Q, const pt_prj_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4;
     /* constants */
-    const limb_t *b3 = const_b3;
     const limb_t *a = const_a;
+    const limb_t *b3 = const_b3;
     /* set pointers for legacy curve arith */
     const limb_t *X = P->X;
     const limb_t *Y = P->Y;
@@ -3664,8 +3664,8 @@ static void point_add_mixed(pt_prj_t *R, const pt_prj_t *Q, const pt_aff_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4, t5;
     /* constants */
-    const limb_t *b3 = const_b3;
     const limb_t *a = const_a;
+    const limb_t *b3 = const_b3;
     /* set pointers for legacy curve arith */
     const limb_t *X1 = Q->X;
     const limb_t *Y1 = Q->Y;
@@ -3732,8 +3732,8 @@ static void point_add_proj(pt_prj_t *R, const pt_prj_t *Q, const pt_prj_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4, t5;
     /* constants */
-    const limb_t *b3 = const_b3;
     const limb_t *a = const_a;
+    const limb_t *b3 = const_b3;
     /* set pointers for legacy curve arith */
     const limb_t *X1 = Q->X;
     const limb_t *Y1 = Q->Y;
@@ -3834,9 +3834,9 @@ static int scalar_get_bit(const unsigned char in[32], int idx) {
  * {\pm 1, \pm 3, \pm 5, \pm 7, \pm 9, ...}
  * i.e. signed odd digits with _no zeroes_ -- that makes it "regular".
  */
-static void scalar_rwnaf(char out[52], const unsigned char in[32]) {
+static void scalar_rwnaf(int8_t out[52], const unsigned char in[32]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = (in[0] & (DRADIX_WNAF - 1)) | 1;
     for (i = 0; i < 51; i++) {
@@ -3856,9 +3856,9 @@ static void scalar_rwnaf(char out[52], const unsigned char in[32]) {
  * Compute "textbook" wnaf representation of a scalar.
  * NB: not constant time
  */
-static void scalar_wnaf(char out[257], const unsigned char in[32]) {
+static void scalar_wnaf(int8_t out[257], const unsigned char in[32]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = in[0] & (DRADIX_WNAF - 1);
     for (i = 0; i < 257; i++) {
@@ -3878,8 +3878,8 @@ static void scalar_wnaf(char out[257], const unsigned char in[32]) {
 static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[32],
                               const unsigned char b[32], const pt_aff_t *P) {
     int i, d, is_neg, is_inf = 1, flipped = 0;
-    char anaf[257] = {0};
-    char bnaf[257] = {0};
+    int8_t anaf[257] = {0};
+    int8_t bnaf[257] = {0};
     pt_prj_t Q;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -3945,7 +3945,7 @@ static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[32],
 static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[32],
                            const pt_aff_t *P) {
     int i, j, d, diff, is_neg;
-    char rnaf[52] = {0};
+    int8_t rnaf[52] = {0};
     pt_prj_t Q, lut;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -4021,7 +4021,7 @@ static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[32],
  */
 static void fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[32]) {
     int i, j, k, d, diff, is_neg = 0;
-    char rnaf[52] = {0};
+    int8_t rnaf[52] = {0};
     pt_prj_t Q, R;
     pt_aff_t lut;
 
@@ -4130,6 +4130,7 @@ static void point_mul(unsigned char outx[32], unsigned char outy[32],
     fiat_id_GostR3410_2001_TestParamSet_to_bytes(outy, P.Y);
 }
 
+
 #include <openssl/ec.h>
 
 static const unsigned char const_zb[32] = {0};
@@ -10886,8 +10887,8 @@ static void point_double(pt_prj_t *Q, const pt_prj_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4;
     /* constants */
-    const limb_t *a = const_a;
     const limb_t *b3 = const_b3;
+    const limb_t *a = const_a;
     /* set pointers for legacy curve arith */
     const limb_t *X = P->X;
     const limb_t *Y = P->Y;
@@ -10941,8 +10942,8 @@ static void point_add_mixed(pt_prj_t *R, const pt_prj_t *Q, const pt_aff_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4, t5;
     /* constants */
-    const limb_t *a = const_a;
     const limb_t *b3 = const_b3;
+    const limb_t *a = const_a;
     /* set pointers for legacy curve arith */
     const limb_t *X1 = Q->X;
     const limb_t *Y1 = Q->Y;
@@ -11009,8 +11010,8 @@ static void point_add_proj(pt_prj_t *R, const pt_prj_t *Q, const pt_prj_t *P) {
     /* temporary variables */
     fe_t t0, t1, t2, t3, t4, t5;
     /* constants */
-    const limb_t *a = const_a;
     const limb_t *b3 = const_b3;
+    const limb_t *a = const_a;
     /* set pointers for legacy curve arith */
     const limb_t *X1 = Q->X;
     const limb_t *Y1 = Q->Y;
@@ -11111,9 +11112,9 @@ static int scalar_get_bit(const unsigned char in[32], int idx) {
  * {\pm 1, \pm 3, \pm 5, \pm 7, \pm 9, ...}
  * i.e. signed odd digits with _no zeroes_ -- that makes it "regular".
  */
-static void scalar_rwnaf(char out[52], const unsigned char in[32]) {
+static void scalar_rwnaf(int8_t out[52], const unsigned char in[32]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = (in[0] & (DRADIX_WNAF - 1)) | 1;
     for (i = 0; i < 51; i++) {
@@ -11133,9 +11134,9 @@ static void scalar_rwnaf(char out[52], const unsigned char in[32]) {
  * Compute "textbook" wnaf representation of a scalar.
  * NB: not constant time
  */
-static void scalar_wnaf(char out[257], const unsigned char in[32]) {
+static void scalar_wnaf(int8_t out[257], const unsigned char in[32]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = in[0] & (DRADIX_WNAF - 1);
     for (i = 0; i < 257; i++) {
@@ -11155,8 +11156,8 @@ static void scalar_wnaf(char out[257], const unsigned char in[32]) {
 static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[32],
                               const unsigned char b[32], const pt_aff_t *P) {
     int i, d, is_neg, is_inf = 1, flipped = 0;
-    char anaf[257] = {0};
-    char bnaf[257] = {0};
+    int8_t anaf[257] = {0};
+    int8_t bnaf[257] = {0};
     pt_prj_t Q;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -11222,7 +11223,7 @@ static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[32],
 static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[32],
                            const pt_aff_t *P) {
     int i, j, d, diff, is_neg;
-    char rnaf[52] = {0};
+    int8_t rnaf[52] = {0};
     pt_prj_t Q, lut;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -11298,7 +11299,7 @@ static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[32],
  */
 static void fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[32]) {
     int i, j, k, d, diff, is_neg = 0;
-    char rnaf[52] = {0};
+    int8_t rnaf[52] = {0};
     pt_prj_t Q, R;
     pt_aff_t lut;
 
@@ -11407,6 +11408,7 @@ static void point_mul(unsigned char outx[32], unsigned char outy[32],
     fiat_id_GostR3410_2001_TestParamSet_to_bytes(outy, P.Y);
 }
 
+
 #include <openssl/ec.h>
 
 static const unsigned char const_zb[32] = {0};