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

Add -check_crl option to certverify

Browse Source
This commit is contained in:
Zhi Guan
2023-01-31 22:14:41 +08:00
parent b5df2121d3
commit 8397280779
6 changed files with 194 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tools/certverify.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
* Copyright 2014-2023 The GmSSL Project. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License.
@@ -13,9 +13,24 @@
#include <string.h>
#include <stdlib.h>
#include <gmssl/x509.h>
#include <gmssl/x509_crl.h>
static const char *options = "-in pem [-double_certs] -cacert pem\n";
static const char *usage =
" -in pem [-double_certs]"
" [-check_crl]"
" -cacert pem"
"\n";
static const char *options =
"Options\n"
"\n"
" -in pem Input certificate chain file in PEM format\n"
" -double_certs The first two certificates are SM2 signing and encryption entity certificate\n"
" -check_crl If the entity certificate has CRLDistributionPoints extension, Download and check againt the CRL\n"
" -cacert pem CA certificate\n"
"\n";
int certverify_main(int argc, char **argv)
{
@@ -39,6 +54,8 @@ int certverify_main(int argc, char **argv)
size_t enc_cert_len;
int rv;
int check_crl = 0;
argc--;
argv++;
@@ -49,7 +66,8 @@ int certverify_main(int argc, char **argv)
while (argc > 0) {
if (!strcmp(*argv, "-help")) {
printf("usage: %s %s\n", prog, options);
printf("usage: %s %s\n", prog, usage);
printf("%s\n", options);
ret = 0;
goto end;
} else if (!strcmp(*argv, "-in")) {
@@ -61,6 +79,8 @@ int certverify_main(int argc, char **argv)
}
} else if (!strcmp(*argv, "-double_certs")) {
double_certs = 1;
} else if (!strcmp(*argv, "-check_crl")) {
check_crl = 1;
} else if (!strcmp(*argv, "-cacert")) {
if (--argc < 1) goto bad;
cacertfile = *(++argv);
@@ -127,6 +147,12 @@ bad:
}
printf("Verification %s\n", rv ? "success" : "failure");
if (check_crl) {
if (x509_cert_check_crl(cert, certlen, cacert, cacertlen, SM2_DEFAULT_ID, strlen(SM2_DEFAULT_ID)) < 0) {
fprintf(stderr, "%s: certificate has been revoked\n", prog);
goto end;
}
}
if (double_certs) {
x509_name_print(stdout, 0, 0, "Certificate", subj, subj_len);
@@ -136,9 +162,19 @@ bad:
}
printf("Verification %s\n", rv ? "success" : "failure");
double_certs = 0;
if (check_crl) {
if (x509_cert_check_crl(enc_cert, enc_cert_len, cacert, cacertlen, SM2_DEFAULT_ID, strlen(SM2_DEFAULT_ID)) < 0) {
fprintf(stderr, "%s: certificate has been revoked\n", prog);
goto end;
}
}
}
x509_name_print(stdout, 0, 0, "Signed by", subject, subject_len);
check_crl = 0; // only check the entity CRL
memcpy(cert, cacert, cacertlen);
certlen = cacertlen;
}

19
tools/crlget.c
View File

@@ -15,6 +15,7 @@
#include <gmssl/pem.h>
#include <gmssl/x509.h>
#include <gmssl/x509_ext.h>
#include <gmssl/x509_crl.h>
#include <gmssl/http.h>
#include <gmssl/error.h>
@@ -42,9 +43,8 @@ int crlget_main(int argc, char **argv)
size_t certlen = 0;
char *outfile = NULL;
FILE *outfp = stdout;
const uint8_t *exts;
size_t extslen;
uint8_t *crl = NULL;
size_t crl_len = 0;
argc--;
argv++;
@@ -86,6 +86,9 @@ bad:
goto end;
}
/*
const uint8_t *exts;
size_t extslen;
if (x509_cert_get_exts(cert, certlen, &exts, &extslen) != 1) {
error_print();
goto end;
@@ -120,8 +123,6 @@ bad:
goto end;
}
uint8_t *crl = NULL;
size_t crl_len = 0;
if (http_get(uristr, NULL, &crl_len, 0) < 0) {
error_print();
@@ -135,6 +136,13 @@ bad:
error_print();
goto end;
}
*/
if (x509_crl_new_from_cert(&crl, &crl_len, cert, certlen) != 1) {
error_print();
goto end;
}
fwrite(crl, crl_len, 1, outfp);
@@ -145,3 +153,4 @@ end:
if (outfile && outfp) fclose(outfp);
return ret;
}