Support SM3 third-party implementation

This commit is contained in:
Zhi Guan
2024-01-04 09:37:12 +08:00
parent 92818b3fe5
commit b0c5208a68
5 changed files with 163 additions and 13 deletions

View File

@@ -13,7 +13,7 @@
#include <string.h>
#include <stdlib.h>
#include <gmssl/sm2.h>
#include <gmssl/sm3.h>
#include <gmssl/sm3_digest.h>
#include <gmssl/hex.h>
#include <gmssl/error.h>
@@ -75,7 +75,7 @@ int sm3_main(int argc, char **argv)
FILE *outfp = stdout;
uint8_t id_bin[64];
size_t id_bin_len;
SM3_CTX sm3_ctx;
SM3_DIGEST_CTX sm3_ctx;
uint8_t dgst[32];
int i;
@@ -171,7 +171,10 @@ bad:
goto end;
}
sm3_init(&sm3_ctx);
if (sm3_digest_init(&sm3_ctx, NULL, 0) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
if (pubkeyfile) {
SM2_KEY sm2_key;
@@ -191,20 +194,33 @@ bad:
sm2_compute_z(z, (SM2_POINT *)&sm2_key, id, strlen(id));
}
sm3_update(&sm3_ctx, z, sizeof(z));
if (sm3_digest_update(&sm3_ctx, z, sizeof(z)) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
}
if (in_str) {
sm3_update(&sm3_ctx, (uint8_t *)in_str, strlen(in_str));
if (sm3_digest_update(&sm3_ctx, (uint8_t *)in_str, strlen(in_str)) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
} else {
uint8_t buf[4096];
size_t len;
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
sm3_update(&sm3_ctx, buf, len);
if (sm3_digest_update(&sm3_ctx, buf, len) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
}
memset(buf, 0, sizeof(buf));
}
sm3_finish(&sm3_ctx, dgst);
if (sm3_digest_finish(&sm3_ctx, dgst) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
memset(&sm3_ctx, 0, sizeof(sm3_ctx));
if (outformat > 1) {

View File

@@ -14,7 +14,7 @@
#include <string.h>
#include <gmssl/mem.h>
#include <gmssl/hex.h>
#include <gmssl/sm3.h>
#include <gmssl/sm3_digest.h>
static const char *usage = "-key hex [-in file | -in_str str] [-bin|-hex] [-out file]";
@@ -63,7 +63,7 @@ int sm3hmac_main(int argc, char **argv)
size_t keylen;
FILE *infp = stdin;
FILE *outfp = stdout;
SM3_HMAC_CTX ctx;
SM3_DIGEST_CTX ctx;
uint8_t mac[SM3_HMAC_SIZE];
size_t i;
@@ -142,18 +142,31 @@ bad:
goto end;
}
sm3_hmac_init(&ctx, key, keylen);
if (sm3_digest_init(&ctx, key, keylen) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
if (in_str) {
sm3_hmac_update(&ctx, (uint8_t *)in_str, strlen(in_str));
if (sm3_digest_update(&ctx, (uint8_t *)in_str, strlen(in_str)) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
} else {
uint8_t buf[4096];
size_t len;
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
sm3_hmac_update(&ctx, buf, len);
if (sm3_digest_update(&ctx, buf, len) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
}
memset(buf, 0, sizeof(buf));
}
sm3_hmac_finish(&ctx, mac);
if (sm3_digest_finish(&ctx, mac) != 1) {
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
if (outformat > 1) {
if (fwrite(mac, 1, sizeof(mac), outfp) != sizeof(mac)) {