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

Update SM4 CL function names

Browse Source
This commit is contained in:
Zhi Guan
2024-04-29 23:40:44 +08:00
parent eeb44dc633
commit 81c97dbec0
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmssl/sm4_cl.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2022 The GmSSL Project. All Rights Reserved. * Copyright 2014-2024 The GmSSL Project. All Rights Reserved.
* *
* Licensed under the Apache License, Version 2.0 (the License); you may * Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License. * not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ typedef struct {
int sm4_cl_set_encrypt_key(SM4_CL_CTX *ctx, const uint8_t key[16]); int sm4_cl_set_encrypt_key(SM4_CL_CTX *ctx, const uint8_t key[16]);
int sm4_cl_set_decrypt_key(SM4_CL_CTX *ctx, const uint8_t key[16]); int sm4_cl_set_decrypt_key(SM4_CL_CTX *ctx, const uint8_t key[16]);
int sm4_cl_ctr32_encrypt(SM4_CL_CTX *ctx, uint8_t iv[16], const uint8_t *in, size_t nblocks, uint8_t *out); int sm4_cl_ctr32_encrypt_blocks(SM4_CL_CTX *ctx, uint8_t iv[16], const uint8_t *in, size_t nblocks, uint8_t *out);
void sm4_cl_cleanup(SM4_CL_CTX *ctx); void sm4_cl_cleanup(SM4_CL_CTX *ctx);

6
src/sm4_cl.c
View File

@@ -198,7 +198,7 @@ static int sm4_cl_set_key(SM4_CL_CTX *ctx, const uint8_t key[16], int enc)
free(log); free(log);
goto end; goto end;
} }
if (!(ctx->kernel = clCreateKernel(ctx->program, "sm4_ctr32_encrypt", &err))) { if (!(ctx->kernel = clCreateKernel(ctx->program, "sm4_ctr32_encrypt_blocks", &err))) {
cl_error_print(err); cl_error_print(err);
goto end; goto end;
} }
@@ -243,7 +243,7 @@ int sm4_cl_set_decrypt_key(SM4_CL_CTX *ctx, const uint8_t key[16])
return sm4_cl_set_key(ctx, key, 0); return sm4_cl_set_key(ctx, key, 0);
} }
int sm4_cl_ctr32_encrypt(SM4_CL_CTX *ctx, uint8_t iv[16], const uint8_t *in, size_t nblocks, uint8_t *out) int sm4_cl_ctr32_encrypt_blocks(SM4_CL_CTX *ctx, uint8_t iv[16], const uint8_t *in, size_t nblocks, uint8_t *out)
{ {
int ret = -1; int ret = -1;
cl_int err; cl_int err;
@@ -330,7 +330,7 @@ __constant unsigned char SBOX[256] = {
0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48,
}; };
__kernel void sm4_ctr32_encrypt(__global const unsigned int *rkey, __global const unsigned int *ctr, __global unsigned char *data) __kernel void sm4_ctr32_encrypt_blocks(__global const unsigned int *rkey, __global const unsigned int *ctr, __global unsigned char *data)
{ {
unsigned int x0, x1, x2, x3, x4, i, t; unsigned int x0, x1, x2, x3, x4, i, t;
uint global_id = get_global_id(0); uint global_id = get_global_id(0);

22
tests/sm4_cltest.c
View File

@@ -18,7 +18,7 @@
#include <gmssl/error.h> #include <gmssl/error.h>
static int test_sm4_cl_ctr32_encrypt(void) static int test_sm4_cl_ctr32_encrypt_blocks(void)
{ {
const char *key_hex = "0123456789abcdeffedcba9876543210"; const char *key_hex = "0123456789abcdeffedcba9876543210";
const char *iv_hex = "0123456789abcdeffedcba9876543210"; const char *iv_hex = "0123456789abcdeffedcba9876543210";
@@ -56,7 +56,7 @@ static int test_sm4_cl_ctr32_encrypt(void)
} }
memcpy(ctr, iv, sizeof(iv)); memcpy(ctr, iv, sizeof(iv));
if (sm4_cl_ctr32_encrypt(&ctx, ctr, buf, nblocks, buf) != 1) { if (sm4_cl_ctr32_encrypt_blocks(&ctx, ctr, buf, nblocks, buf) != 1) {
error_print(); error_print();
goto end; goto end;
} }
@@ -75,7 +75,7 @@ end:
return ret; return ret;
} }
static int test_sm4_cl_ctr32_encrypt_speed(void) static int speed_sm4_cl_ctr32_encrypt_blocks(void)
{ {
const uint8_t key[16] = { const uint8_t key[16] = {
0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
@@ -96,7 +96,7 @@ static int test_sm4_cl_ctr32_encrypt_speed(void)
uint8_t ctr[16]; uint8_t ctr[16];
size_t nblocks = 1024*1024; size_t nblocks = 1024*1024;
uint8_t *buf = NULL; uint8_t *buf = NULL;
clock_t start, end; clock_t begin, end;
double seconds; double seconds;
size_t i; size_t i;
@@ -113,15 +113,15 @@ static int test_sm4_cl_ctr32_encrypt_speed(void)
goto end; goto end;
} }
start = clock(); begin = clock();
if (sm4_cl_ctr32_encrypt(&ctx, ctr, buf, nblocks, buf) != 1) { if (sm4_cl_ctr32_encrypt_blocks(&ctx, ctr, buf, nblocks, buf) != 1) {
error_print(); error_print();
goto end; goto end;
} }
end = clock(); end = clock();
seconds = (double)(end - start)/CLOCKS_PER_SEC; seconds = (double)(end - begin)/CLOCKS_PER_SEC;
fprintf(stderr, "sm4_cl_encrypt: %f-MiB per seconds\n", 16/seconds); fprintf(stderr, "%s: %f-MiB per seconds\n", __FUNCTION__, 16/seconds);
ret = 1; ret = 1;
end: end:
@@ -132,8 +132,10 @@ end:
int main(void) int main(void)
{ {
if (test_sm4_cl_ctr32_encrypt() != 1) goto err; if (test_sm4_cl_ctr32_encrypt_blocks() != 1) goto err;
if (test_sm4_cl_ctr32_encrypt_speed() != 1) goto err; #if ENABLE_TEST_SPEED
if (speed_sm4_cl_ctr32_encrypt_blocks() != 1) goto err;
#endif
printf("%s all tests passed\n", __FILE__); printf("%s all tests passed\n", __FILE__);
return 0; return 0;
err: err: