abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename POINT_AFFINE to AFFINE_POINT

Browse Source
This commit is contained in:
Zhi Guan
2024-04-16 22:51:38 +08:00
parent 4e66f911d0
commit 6028d1e10b
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/gmssl/sm2_z256.h
View File

@@ -102,12 +102,12 @@ int sm2_z256_point_print(FILE *fp, int fmt, int ind, const char *label, const SM
typedef struct { typedef struct {
uint64_t x[4]; uint64_t x[4];
uint64_t y[4]; uint64_t y[4];
} SM2_Z256_POINT_AFFINE; } SM2_Z256_AFFINE_POINT;
void sm2_z256_point_copy_affine(SM2_Z256_POINT *R, const SM2_Z256_POINT_AFFINE *P); void sm2_z256_point_copy_affine(SM2_Z256_POINT *R, const SM2_Z256_AFFINE_POINT *P);
void sm2_z256_point_add_affine(SM2_Z256_POINT *r, const SM2_Z256_POINT *a, const SM2_Z256_POINT_AFFINE *b); void sm2_z256_point_add_affine(SM2_Z256_POINT *r, const SM2_Z256_POINT *a, const SM2_Z256_AFFINE_POINT *b);
void sm2_z256_point_sub_affine(SM2_Z256_POINT *R, const SM2_Z256_POINT *A, const SM2_Z256_POINT_AFFINE *B); void sm2_z256_point_sub_affine(SM2_Z256_POINT *R, const SM2_Z256_POINT *A, const SM2_Z256_AFFINE_POINT *B);
int sm2_z256_point_affine_print(FILE *fp, int fmt, int ind, const char *label, const SM2_Z256_POINT_AFFINE *P); int sm2_z256_point_affine_print(FILE *fp, int fmt, int ind, const char *label, const SM2_Z256_AFFINE_POINT *P);
void sm2_z256_point_mul_generator(SM2_Z256_POINT *R, const uint64_t k[4]); void sm2_z256_point_mul_generator(SM2_Z256_POINT *R, const uint64_t k[4]);
void sm2_z256_point_mul(SM2_Z256_POINT *R, const uint64_t k[4], const SM2_Z256_POINT *P); void sm2_z256_point_mul(SM2_Z256_POINT *R, const uint64_t k[4], const SM2_Z256_POINT *P);

10
include/gmssl/sm9.h
View File

@@ -186,6 +186,16 @@ int sm9_z256_point_to_uncompressed_octets(const SM9_Z256_POINT *P, uint8_t octe
int sm9_z256_point_from_uncompressed_octets(SM9_Z256_POINT *P, const uint8_t octets[65]); int sm9_z256_point_from_uncompressed_octets(SM9_Z256_POINT *P, const uint8_t octets[65]);
typedef struct {
uint64_t X[4];
uint64_t Y[4];
} SM9_Z256_AFFINE_POINT;
void sm9_z256_point_copy_affine(SM9_Z256_POINT *R, const SM9_Z256_AFFINE_POINT *P);
void sm9_z256_point_add_affine(SM9_Z256_POINT *R, const SM9_Z256_POINT *P, const SM9_Z256_AFFINE_POINT *Q);
void sm9_z256_point_sub_affine(SM9_Z256_POINT *R, const SM9_Z256_POINT *P, const SM9_Z256_AFFINE_POINT *Q);
typedef struct { typedef struct {
sm9_z256_fp2_t X; sm9_z256_fp2_t X;
sm9_z256_fp2_t Y; sm9_z256_fp2_t Y;

14
src/sm2_z256.c
View File

@@ -1394,16 +1394,16 @@ int sm2_z256_point_print(FILE *fp, int fmt, int ind, const char *label, const SM
} }
void sm2_z256_point_copy_affine(SM2_Z256_POINT *R, const SM2_Z256_POINT_AFFINE *P) void sm2_z256_point_copy_affine(SM2_Z256_POINT *R, const SM2_Z256_AFFINE_POINT *P)
{ {
memcpy(R, P, sizeof(SM2_Z256_POINT_AFFINE)); memcpy(R, P, sizeof(SM2_Z256_AFFINE_POINT));
sm2_z256_copy(R->Z, SM2_Z256_MODP_MONT_ONE); sm2_z256_copy(R->Z, SM2_Z256_MODP_MONT_ONE);
} }
// 这是一个比较容易并行的算法 // 这是一个比较容易并行的算法
// r, a, b 都转换为实际输入的值 // r, a, b 都转换为实际输入的值
#ifndef ENABLE_SM2_Z256_ARMV8 #ifndef ENABLE_SM2_Z256_ARMV8
void sm2_z256_point_add_affine(SM2_Z256_POINT *r, const SM2_Z256_POINT *a, const SM2_Z256_POINT_AFFINE *b) void sm2_z256_point_add_affine(SM2_Z256_POINT *r, const SM2_Z256_POINT *a, const SM2_Z256_AFFINE_POINT *b)
{ {
uint64_t U2[4], S2[4]; uint64_t U2[4], S2[4];
uint64_t Z1sqr[4]; uint64_t Z1sqr[4];
@@ -1486,9 +1486,9 @@ void sm2_z256_point_add_affine(SM2_Z256_POINT *r, const SM2_Z256_POINT *a, const
#endif #endif
void sm2_z256_point_sub_affine(SM2_Z256_POINT *R, void sm2_z256_point_sub_affine(SM2_Z256_POINT *R,
const SM2_Z256_POINT *A, const SM2_Z256_POINT_AFFINE *B) const SM2_Z256_POINT *A, const SM2_Z256_AFFINE_POINT *B)
{ {
SM2_Z256_POINT_AFFINE neg_B; SM2_Z256_AFFINE_POINT neg_B;
sm2_z256_copy(neg_B.x, B->x); sm2_z256_copy(neg_B.x, B->x);
sm2_z256_modp_neg(neg_B.y, B->y); sm2_z256_modp_neg(neg_B.y, B->y);
@@ -1496,7 +1496,7 @@ void sm2_z256_point_sub_affine(SM2_Z256_POINT *R,
sm2_z256_point_add_affine(R, A, &neg_B); sm2_z256_point_add_affine(R, A, &neg_B);
} }
int sm2_z256_point_affine_print(FILE *fp, int fmt, int ind, const char *label, const SM2_Z256_POINT_AFFINE *P) int sm2_z256_point_affine_print(FILE *fp, int fmt, int ind, const char *label, const SM2_Z256_AFFINE_POINT *P)
{ {
uint8_t affine[64]; uint8_t affine[64];
uint64_t a[4]; uint64_t a[4];
@@ -1512,7 +1512,7 @@ int sm2_z256_point_affine_print(FILE *fp, int fmt, int ind, const char *label, c
} }
extern const uint64_t sm2_z256_pre_comp[37][64 * 4 * 2]; extern const uint64_t sm2_z256_pre_comp[37][64 * 4 * 2];
static SM2_Z256_POINT_AFFINE (*g_pre_comp)[64] = (SM2_Z256_POINT_AFFINE (*)[64])sm2_z256_pre_comp; static SM2_Z256_AFFINE_POINT (*g_pre_comp)[64] = (SM2_Z256_AFFINE_POINT (*)[64])sm2_z256_pre_comp;
/* /*