abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-19 11:23:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1893 from wangtsiao/master

Browse Source 
修复 PEM 读取没有限制 base64 解码输出长度的问题
This commit is contained in:
Zhi Guan
2026-06-13 17:29:42 +08:00
committed by GitHub
parent da02b6af9d c5674af7f5
commit 9ec15f6012
5 changed files with 241 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
tests/base64test.c
View File

@@ -61,9 +61,78 @@ static int test_base64(void)
return 1;
}
struct base64_one_byte_buffer {
uint8_t data[1];
uint8_t canary[8];
};
static int test_base64_decode_update_ex_padding(void)
{
const uint8_t in[] = "AA==";
struct base64_one_byte_buffer buf;
uint8_t original_canary[sizeof(buf.canary)];
BASE64_CTX ctx;
int len = 0;
int ret;
memset(&buf, 0xff, sizeof(buf));
memset(buf.canary, 0xcc, sizeof(buf.canary));
memcpy(original_canary, buf.canary, sizeof(original_canary));
base64_decode_init(&ctx);
ret = base64_decode_update_ex(&ctx, in, sizeof(in) - 1,
buf.data, &len, sizeof(buf.data));
if (ret != 0 || len != 1 || buf.data[0] != 0) {
error_print();
return -1;
}
if (memcmp(buf.canary, original_canary, sizeof(original_canary)) != 0) {
error_print();
return -1;
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
struct base64_two_byte_buffer {
uint8_t data[2];
uint8_t canary[8];
};
static int test_base64_decode_update_ex_maxout(void)
{
const uint8_t in[] = "AAAA";
struct base64_two_byte_buffer buf;
uint8_t original_canary[sizeof(buf.canary)];
BASE64_CTX ctx;
int len = 0;
int ret;
memset(&buf, 0xcc, sizeof(buf));
memcpy(original_canary, buf.canary, sizeof(original_canary));
base64_decode_init(&ctx);
ret = base64_decode_update_ex(&ctx, in, sizeof(in) - 1,
buf.data, &len, sizeof(buf.data));
if (ret != -1 || len != 0) {
error_print();
return -1;
}
if (memcmp(buf.canary, original_canary, sizeof(original_canary)) != 0) {
error_print();
return -1;
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
int main(void)
{
if (test_base64() != 1) goto err;
if (test_base64_decode_update_ex_padding() != 1) goto err;
if (test_base64_decode_update_ex_maxout() != 1) goto err;
printf("%s all tests passed\n", __FILE__);
return 0;
err:

103
tests/pemtest.c
View File

@@ -235,11 +235,114 @@ static int test_pem_windows_style_without_last_newline(void)
return 1;
}
struct pem_bounded_buffer {
uint8_t data[16];
uint8_t canary[32];
};
static int test_pem_read_maxlen(void)
{
FILE *fp;
const char *file = "test_pem_read_maxlen.pem";
struct pem_bounded_buffer buf;
uint8_t original_canary[sizeof(buf.canary)];
size_t len = 0;
int ret;
int i;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fputs("-----BEGIN TEST-----\n", fp);
for (i = 0; i < 64; i++) {
fputc('A', fp);
}
fputs("\n-----END TEST-----\n", fp);
fclose(fp);
memset(&buf, 0, sizeof(buf));
memset(buf.canary, 0xcc, sizeof(buf.canary));
memcpy(original_canary, buf.canary, sizeof(original_canary));
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
ret = pem_read(fp, "TEST", buf.data, &len, sizeof(buf.data));
fclose(fp);
if (ret == 1) {
error_print();
return -1;
}
if (len > sizeof(buf.data)) {
error_print();
return -1;
}
if (memcmp(buf.canary, original_canary, sizeof(original_canary)) != 0) {
error_print();
return -1;
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
struct pem_one_byte_buffer {
uint8_t data[1];
uint8_t canary[8];
};
static int test_pem_read_padding_maxlen(void)
{
FILE *fp;
const char *file = "test_pem_read_padding_maxlen.pem";
struct pem_one_byte_buffer buf;
uint8_t original_canary[sizeof(buf.canary)];
size_t len = 0;
int ret;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fputs("-----BEGIN TEST-----\n", fp);
fputs("AA==\n", fp);
fputs("-----END TEST-----\n", fp);
fclose(fp);
memset(&buf, 0xff, sizeof(buf));
memset(buf.canary, 0xcc, sizeof(buf.canary));
memcpy(original_canary, buf.canary, sizeof(original_canary));
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
ret = pem_read(fp, "TEST", buf.data, &len, sizeof(buf.data));
fclose(fp);
if (ret != 1 || len != sizeof(buf.data) || buf.data[0] != 0) {
error_print();
return -1;
}
if (memcmp(buf.canary, original_canary, sizeof(original_canary)) != 0) {
error_print();
return -1;
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
int main(void)
{
if (test_pem_unix_style() != 1) { error_print(); return 1; }
if (test_pem_unix_style_without_last_newline() != 1) { error_print(); return 1; }
if (test_pem_windows_style() != 1) { error_print(); return 1; }
if (test_pem_windows_style_without_last_newline() != 1) { error_print(); return 1; }
if (test_pem_read_maxlen() != 1) { error_print(); return 1; }
if (test_pem_read_padding_maxlen() != 1) { error_print(); return 1; }
return 0;
}