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

Support PEM with Windows-style newline

Browse Source
This commit is contained in:
Zhi Guan
2022-12-30 10:37:50 +08:00
parent 8ff829dbcd
commit 7be0df2b82
2 changed files with 254 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/pem.c
View File

@@ -15,6 +15,27 @@
#include <gmssl/error.h>
static int remove_newline(char *line)
{
size_t len;
len = strlen(line);
if (len >= 2) {
if (line[len - 2] == '\r' && line[len - 1] == '\n') {
line[len - 2] = line[len - 1] = 0;
return 1;
}
}
if (len) {
if (line[len - 1] == '\n') {
line[len - 1] = 0;
return 1;
}
}
return 0; // No newline found, might not be an error
}
int pem_write(FILE* fp, const char* name, const uint8_t* data, size_t datalen)
{
int ret = 0;
@@ -51,8 +72,8 @@ int pem_read(FILE *fp, const char *name, uint8_t *data, size_t *datalen, size_t
int len;
BASE64_CTX ctx;
snprintf(begin_line, sizeof(begin_line), "-----BEGIN %s-----\n", name);
snprintf(end_line, sizeof(end_line), "-----END %s-----\n", name);
snprintf(begin_line, sizeof(begin_line), "-----BEGIN %s-----", name);
snprintf(end_line, sizeof(end_line), "-----END %s-----", name);
if (feof(fp)) {
return 0;
@@ -66,13 +87,11 @@ int pem_read(FILE *fp, const char *name, uint8_t *data, size_t *datalen, size_t
return -1;
}
}
remove_newline(line);
if (strcmp(line, begin_line) != 0) {
// FIXME: 这里是不是应该容忍一些错误呢？
fprintf(stderr, "%s %d: %s\n", __FILE__, __LINE__, line);
fprintf(stderr, "%s %d: %s\n", __FILE__, __LINE__, begin_line);
error_print();
return -1;
}
@@ -83,20 +102,11 @@ int pem_read(FILE *fp, const char *name, uint8_t *data, size_t *datalen, size_t
for (;;) {
if (!fgets(line, sizeof(line), fp)) {
if (feof(fp)){
//如果END xxx最后一行没有换行符，提前跳出循环
if (strncmp(line, end_line, strlen(end_line)-1) == 0) {
break;
} else {
error_print();
return -1;
}
}
else {
error_print();
return -1;
}
}
remove_newline(line);
if (strcmp(line, end_line) == 0) {
break;
}

226
tests/pemtest.c
View File

@@ -12,8 +12,234 @@
#include <string.h>
#include <stdlib.h>
#include <gmssl/pem.h>
#include <gmssl/hex.h>
#include <gmssl/error.h>
static const char *pem_unix_style =
"-----BEGIN CERTIFICATE-----\n"
"MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG\n"
"EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw\n"
"MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO\n"
"UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE\n"
"MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT\n"
"V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti\n"
"W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ\n"
"MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b\n"
"53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI\n"
"pDoiVhsLwg==\n"
"-----END CERTIFICATE-----\n";
static const char *pem_windows_style =
"-----BEGIN CERTIFICATE-----\r\n"
"MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG\r\n"
"EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw\r\n"
"MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO\r\n"
"UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE\r\n"
"MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT\r\n"
"V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti\r\n"
"W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ\r\n"
"MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b\r\n"
"53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI\r\n"
"pDoiVhsLwg==\r\n"
"-----END CERTIFICATE-----\r\n";
#define TEST_PEM_BASE64_DECODE 1
static const char *pem_bin_hex =
"308201B330820157A003020102020869E2FEC0170AC67B300C06082A811CCF550183750500302E310B30090603550406"
"1302434E310E300C060355040A0C054E52434143310F300D06035504030C06524F4F544341301E170D31323037313430"
"33313135395A170D3432303730373033313135395A302E310B300906035504061302434E310E300C060355040A0C054E"
"52434143310F300D06035504030C06524F4F5443413059301306072A8648CE3D020106082A811CCF5501822D03420004"
"30F09C6BAA6681C721B137F652705E2FDAEDA789F0FA2B64D4ACEB99B9EAA34E655309309562BEE0E22BB45740AA7453"
"57B43DBF586D92FE364EC22EB73775DBA35D305B301F0603551D230418301680144C32B197D9331BC4A605C1C6E58B62"
"5BF0977658300C0603551D13040530030101FF300B0603551D0F040403020106301D0603551D0E041604144C32B197D9"
"331BC4A605C1C6E58B625BF0977658300C06082A811CCF550183750500034800304502201B56D22DE397A77A01F07EDB"
"E775BE08A38F9763E49E6584ABF94C86D9F6E479022100DA1C3816C5616D9C2AC18C7D7AFD6DC4CE7EFF53F563A39C48"
"A43A22561B0BC2";
static int test_pem_unix_style(void)
{
FILE *fp;
const char *text = pem_unix_style;
size_t textlen = strlen(text);
const char *file = "test_unix_style.pem";
uint8_t buf[1024];
size_t len;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fwrite(text, 1, textlen, fp);
fclose(fp);
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
if (pem_read(fp, "CERTIFICATE", buf, &len, sizeof(buf)) != 1) {
error_print();
return -1;
}
fclose(fp);
if (TEST_PEM_BASE64_DECODE) {
uint8_t bin[1024];
size_t binlen;
hex_to_bytes(pem_bin_hex, strlen(pem_bin_hex), bin, &binlen);
if (len != binlen) {
error_print();
return -1;
}
if (memcmp(buf, bin, binlen) != 0) {
error_print();
return -1;
}
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_pem_unix_style_without_last_newline(void)
{
FILE *fp;
const char *text = pem_unix_style;
size_t textlen = strlen(text) - 1; // without last '\n'
const char *file = "test_unix_style_without_last_newline.pem";
uint8_t buf[1024];
size_t len;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fwrite(text, 1, textlen, fp);
fclose(fp);
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
if (pem_read(fp, "CERTIFICATE", buf, &len, sizeof(buf)) != 1) {
error_print();
return -1;
}
fclose(fp);
if (TEST_PEM_BASE64_DECODE) {
uint8_t bin[1024];
size_t binlen;
hex_to_bytes(pem_bin_hex, strlen(pem_bin_hex), bin, &binlen);
if (len != binlen) {
error_print();
return -1;
}
if (memcmp(buf, bin, binlen) != 0) {
error_print();
return -1;
}
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_pem_windows_style(void)
{
FILE *fp;
const char *text = pem_windows_style;
size_t textlen = strlen(text);
const char *file = "test_windows_style.pem";
uint8_t buf[1024];
size_t len;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fwrite(text, 1, textlen, fp);
fclose(fp);
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
if (pem_read(fp, "CERTIFICATE", buf, &len, sizeof(buf)) != 1) {
error_print();
return -1;
}
fclose(fp);
if (TEST_PEM_BASE64_DECODE) {
uint8_t bin[1024];
size_t binlen;
hex_to_bytes(pem_bin_hex, strlen(pem_bin_hex), bin, &binlen);
if (len != binlen) {
error_print();
return -1;
}
if (memcmp(buf, bin, binlen) != 0) {
error_print();
return -1;
}
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_pem_windows_style_without_last_newline(void)
{
FILE *fp;
const char *text = pem_windows_style;
size_t textlen = strlen(text) - 2; // without last '\r\n'
const char *file = "test_windows_style_without_last_newline.pem";
uint8_t buf[1024];
size_t len;
if (!(fp = fopen(file, "wb"))) {
error_print();
return -1;
}
fwrite(text, 1, textlen, fp);
fclose(fp);
if (!(fp = fopen(file, "rb"))) {
error_print();
return -1;
}
if (pem_read(fp, "CERTIFICATE", buf, &len, sizeof(buf)) != 1) {
error_print();
return -1;
}
fclose(fp);
if (TEST_PEM_BASE64_DECODE) {
uint8_t bin[1024];
size_t binlen;
hex_to_bytes(pem_bin_hex, strlen(pem_bin_hex), bin, &binlen);
if (len != binlen) {
error_print();
return -1;
}
if (memcmp(buf, bin, binlen) != 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; }
return 0;
}