abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-16 18:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore the original sm9 header file name.

Browse Source
This commit is contained in:
Zhi Guan
2024-04-14 11:15:05 +08:00
parent 771fe867ef
commit ef03ddc680
11 changed files with 91 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sm9_z256_key.c
View File

@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <gmssl/sm3.h>
#include <gmssl/sm4.h>
#include <gmssl/sm9_z256.h>
#include <gmssl/sm9.h>
#include <gmssl/mem.h>
#include <gmssl/oid.h>
#include <gmssl/rand.h>
@@ -23,9 +23,6 @@
#include <gmssl/error.h>
extern const sm9_z256_t SM9_Z256_ZERO;
extern const sm9_z256_t SM9_Z256_N;
// generate h1 in [1, n-1]
int sm9_z256_hash1(sm9_z256_t h1, const char *id, size_t idlen, uint8_t hid)
{
@@ -99,7 +96,7 @@ int sm9_sign_master_key_from_der(SM9_SIGN_MASTER_KEY *msk, const uint8_t **in, s
}
memset(msk, 0, sizeof(*msk));
sm9_z256_from_bytes(msk->ks, ks);
if (sm9_z256_cmp(msk->ks, SM9_Z256_N) >= 0) {
if (sm9_z256_cmp(msk->ks, sm9_z256_order()) >= 0) {
error_print();
return -1;
}
@@ -251,7 +248,7 @@ int sm9_enc_master_key_from_der(SM9_ENC_MASTER_KEY *msk, const uint8_t **in, siz
memset(msk, 0, sizeof(*msk));
sm9_z256_from_bytes(msk->ke, ke);
if (sm9_z256_cmp(msk->ke, SM9_Z256_N) >= 0) {
if (sm9_z256_cmp(msk->ke, sm9_z256_order()) >= 0) {
error_print();
return -1;
}
@@ -364,7 +361,7 @@ int sm9_sign_master_key_generate(SM9_SIGN_MASTER_KEY *msk)
return -1;
}
// k = rand(1, n-1)
if (sm9_z256_rand_range(msk->ks, SM9_Z256_N) != 1) {
if (sm9_z256_rand_range(msk->ks, sm9_z256_order()) != 1) {
error_print();
return -1;
}
@@ -376,7 +373,7 @@ int sm9_sign_master_key_generate(SM9_SIGN_MASTER_KEY *msk)
int sm9_enc_master_key_generate(SM9_ENC_MASTER_KEY *msk)
{
// k = rand(1, n-1)
if (sm9_z256_rand_range(msk->ke, SM9_Z256_N) != 1) {
if (sm9_z256_rand_range(msk->ke, sm9_z256_order()) != 1) {
error_print();
return -1;
}