abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-27 18:56:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update tests and tools

Browse Source
This commit is contained in:
Zhi Guan
2022-03-16 15:12:29 +08:00
parent 2c2425d230
commit ea4cc6585c
52 changed files with 3600 additions and 3216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pem.c
View File

@@ -67,7 +67,8 @@ int pem_write(FILE *fp, const char *name, const uint8_t *data, size_t datalen)
ret += fprintf(fp, "-----BEGIN %s-----\n", name);
ret += fprintf(fp, "%s", (char *)b64);
ret += fprintf(fp, "-----END %s-----\n", name);
return ret;
//return ret;
return 1;
}
int pem_read(FILE *fp, const char *name, uint8_t *data, size_t *datalen, size_t maxlen)
@@ -81,11 +82,19 @@ int pem_read(FILE *fp, const char *name, uint8_t *data, size_t *datalen, size_t
snprintf(begin_line, sizeof(begin_line), "-----BEGIN %s-----\n", name);
snprintf(end_line, sizeof(end_line), "-----END %s-----\n", name);
if (!fgets(line, sizeof(line), fp)) {
//FIXME: feof 判断是不是文件结束了呢
if (feof(fp)) {
return 0;
}
if (!fgets(line, sizeof(line), fp)) {
if (feof(fp))
return 0;
else {
error_print();
return -1;
}
}
if (strcmp(line, begin_line) != 0) {
// FIXME: 这里是不是应该容忍一些错误呢？
error_print();