mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-06-19 19:33:38 +08:00
Fix bugs
This commit is contained in:
@@ -819,7 +819,7 @@ endif()
|
|||||||
#
|
#
|
||||||
set(CPACK_PACKAGE_NAME "GmSSL")
|
set(CPACK_PACKAGE_NAME "GmSSL")
|
||||||
set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
|
set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
|
||||||
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1082")
|
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1083")
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
|
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
|
||||||
set(CPACK_NSIS_MODIFY_PATH ON)
|
set(CPACK_NSIS_MODIFY_PATH ON)
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ extern "C" {
|
|||||||
|
|
||||||
|
|
||||||
#define GMSSL_VERSION_NUM 30200
|
#define GMSSL_VERSION_NUM 30200
|
||||||
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1082"
|
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1083"
|
||||||
|
|
||||||
int gmssl_version_num(void);
|
int gmssl_version_num(void);
|
||||||
const char *gmssl_version_str(void);
|
const char *gmssl_version_str(void);
|
||||||
|
|||||||
@@ -171,6 +171,10 @@ bad:
|
|||||||
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
|
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
|
||||||
ghash_update(&ghash_ctx, buf, len);
|
ghash_update(&ghash_ctx, buf, len);
|
||||||
}
|
}
|
||||||
|
if (ferror(infp)) {
|
||||||
|
fprintf(stderr, "gmssl %s: read failure : %s\n", prog, strerror(errno));
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
}
|
}
|
||||||
ghash_finish(&ghash_ctx, dgst);
|
ghash_finish(&ghash_ctx, dgst);
|
||||||
|
|||||||
@@ -137,6 +137,10 @@ bad:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SPHINCS+ requires two passes over the input data (prepare then update),
|
||||||
|
// so stdin streaming is not directly supported here. If infp == stdin,
|
||||||
|
// input should be buffered into memory with calloc/malloc before the first pass.
|
||||||
|
// TODO: buffer input to support stdin in a future version
|
||||||
rewind(infp);
|
rewind(infp);
|
||||||
while (1) {
|
while (1) {
|
||||||
uint8_t buf[1024];
|
uint8_t buf[1024];
|
||||||
|
|||||||
@@ -123,6 +123,10 @@ bad:
|
|||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (ferror(infp)) {
|
||||||
|
fprintf(stderr, "%s: read failure : %s\n", prog, strerror(errno));
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
if (zuc_encrypt_finish(&zuc_ctx, outbuf, &outlen) != 1) {
|
if (zuc_encrypt_finish(&zuc_ctx, outbuf, &outlen) != 1) {
|
||||||
fprintf(stderr, "%s: inner error\n", prog);
|
fprintf(stderr, "%s: inner error\n", prog);
|
||||||
goto end;
|
goto end;
|
||||||
|
|||||||
Reference in New Issue
Block a user