GOST EC armv7 aarch64 fixes

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

diff --git a/ecp_id_tc26_gost_3410_2012_512_paramSetA.c b/ecp_id_tc26_gost_3410_2012_512_paramSetA.c
index 6947a8a032c81f5289e0a93bbff44f76a970a378..8667cc74ef2e7109a649cc2ec9483348ab4c3fac 100644 (file)
--- a/ecp_id_tc26_gost_3410_2012_512_paramSetA.c
+++ b/ecp_id_tc26_gost_3410_2012_512_paramSetA.c
@@ -4239,9 +4239,9 @@ static int scalar_get_bit(const unsigned char in[64], 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[103], const unsigned char in[64]) {
+static void scalar_rwnaf(int8_t out[103], const unsigned char in[64]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = (in[0] & (DRADIX_WNAF - 1)) | 1;
     for (i = 0; i < 102; i++) {
@@ -4261,9 +4261,9 @@ static void scalar_rwnaf(char out[103], const unsigned char in[64]) {
  * Compute "textbook" wnaf representation of a scalar.
  * NB: not constant time
  */
-static void scalar_wnaf(char out[513], const unsigned char in[64]) {
+static void scalar_wnaf(int8_t out[513], const unsigned char in[64]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = in[0] & (DRADIX_WNAF - 1);
     for (i = 0; i < 513; i++) {
@@ -4283,8 +4283,8 @@ static void scalar_wnaf(char out[513], const unsigned char in[64]) {
 static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[64],
                               const unsigned char b[64], const pt_aff_t *P) {
     int i, d, is_neg, is_inf = 1, flipped = 0;
-    char anaf[513] = {0};
-    char bnaf[513] = {0};
+    int8_t anaf[513] = {0};
+    int8_t bnaf[513] = {0};
     pt_prj_t Q;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -4350,7 +4350,7 @@ static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[64],
 static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[64],
                            const pt_aff_t *P) {
     int i, j, d, diff, is_neg;
-    char rnaf[103] = {0};
+    int8_t rnaf[103] = {0};
     pt_prj_t Q, lut;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -4426,7 +4426,7 @@ static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[64],
  */
 static void fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[64]) {
     int i, j, k, d, diff, is_neg = 0;
-    char rnaf[103] = {0};
+    int8_t rnaf[103] = {0};
     pt_prj_t Q, R;
     pt_aff_t lut;
 
@@ -4528,6 +4528,7 @@ static void point_mul(unsigned char outx[64], unsigned char outy[64],
     fiat_id_tc26_gost_3410_2012_512_paramSetA_to_bytes(outy, P.Y);
 }
 
+
 #include <openssl/ec.h>
 
 static const unsigned char const_zb[64] = {0};
@@ -12195,9 +12196,9 @@ static int scalar_get_bit(const unsigned char in[64], 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[103], const unsigned char in[64]) {
+static void scalar_rwnaf(int8_t out[103], const unsigned char in[64]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = (in[0] & (DRADIX_WNAF - 1)) | 1;
     for (i = 0; i < 102; i++) {
@@ -12217,9 +12218,9 @@ static void scalar_rwnaf(char out[103], const unsigned char in[64]) {
  * Compute "textbook" wnaf representation of a scalar.
  * NB: not constant time
  */
-static void scalar_wnaf(char out[513], const unsigned char in[64]) {
+static void scalar_wnaf(int8_t out[513], const unsigned char in[64]) {
     int i;
-    char window, d;
+    int8_t window, d;
 
     window = in[0] & (DRADIX_WNAF - 1);
     for (i = 0; i < 513; i++) {
@@ -12239,8 +12240,8 @@ static void scalar_wnaf(char out[513], const unsigned char in[64]) {
 static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[64],
                               const unsigned char b[64], const pt_aff_t *P) {
     int i, d, is_neg, is_inf = 1, flipped = 0;
-    char anaf[513] = {0};
-    char bnaf[513] = {0};
+    int8_t anaf[513] = {0};
+    int8_t bnaf[513] = {0};
     pt_prj_t Q;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -12306,7 +12307,7 @@ static void var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[64],
 static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[64],
                            const pt_aff_t *P) {
     int i, j, d, diff, is_neg;
-    char rnaf[103] = {0};
+    int8_t rnaf[103] = {0};
     pt_prj_t Q, lut;
     pt_prj_t precomp[DRADIX / 2];
 
@@ -12382,7 +12383,7 @@ static void var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[64],
  */
 static void fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[64]) {
     int i, j, k, d, diff, is_neg = 0;
-    char rnaf[103] = {0};
+    int8_t rnaf[103] = {0};
     pt_prj_t Q, R;
     pt_aff_t lut;
 
@@ -12484,6 +12485,7 @@ static void point_mul(unsigned char outx[64], unsigned char outy[64],
     fiat_id_tc26_gost_3410_2012_512_paramSetA_to_bytes(outy, P.Y);
 }
 
+
 #include <openssl/ec.h>
 
 static const unsigned char const_zb[64] = {0};