1.修改签发证书时间,默认提前一天

3.修改url中对valid的解析问题
This commit is contained in:
fengweihao
2018-11-05 17:08:39 +08:00
parent 26cba8d900
commit c0dd5d1d3f
3 changed files with 45 additions and 45 deletions

View File

@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIDdzCCAl+gAwIBAgIJAM3sdp+ssKYAMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV MIIDizCCAnOgAwIBAgIJAK8/bkwMJ0lJMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
Q29tcGFueSBMdGQxDjAMBgNVBAMMBWluc2VjMB4XDTE4MTAyMzAzMjA1MloXDTE5 Q29tcGFueSBMdGQxGDAWBgNVBAMMD21lc2FsYWItdW50cnVzdDAeFw0xODEwMjMx
MTAyMzAzMjA1MlowUjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0 MTI2MzNaFw0yODEwMjAxMTI2MzNaMFwxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxE
eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEOMAwGA1UEAwwFaW5zZWMw ZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxGDAWBgNV
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9uRq4tMCqA4wNWk4nIogY BAMMD21lc2FsYWItdW50cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
yxFiJqQyl1dWuCGIK0QDuXcN2BeSfx1dCTW9Ul6JzojUCM6E0MXRbYfTSd1UwKzb ggEBANqgqDIsu2/lv+kU/HXP/AeCdBZiHKnLz3GP5D7ZRTmLJuTu3sqsabNjG0HB
AqlVuj20pFWAw6LOeMZ0xjC74hP2ADosmJg9KboOMhHYwRvLRP/IZcTNVFBxA3jo uqwIHNrxmN0upm+5AqaXVsCRoT7APW6DuGCNORWuUlS7GR4uMvYST6InGdMGE/4z
mMLAGgNOYio4aLtNNfbLS61I+OK/XPii7/IW3V5AqDVGSyNJJsiQX3HuetQhMtg4 40Wi4Z3aSikedWWzdNPA576LhH1UJ1M/hsaAnhFEa03WiHdzRVw2zyq1rCO3kIL6
iKtZWBHjGRaZIKJiKDRkCT+/yXXoEsr+nGk0PLWGFaeEsQgeQYA1vNuqSSHaTk9O kzYXN06Tb+TU9DV9P7VY2vcUiBEIJX1Sy7NKRUpHRI73SAc6WIgUzMKaZhjajfEV
1BNaLjAC3QrRRD9UnXjRW8psUdDml5R3NEiqPhar78ddDDMphXGN32Sy2TI1RoJr 9lAjPRS5pE4SFQ0sxSVrKG/GLfcwWyLkmVEsZFdOnFUgMI6WAXS93vvVSpl/ULET
AgMBAAGjUDBOMB0GA1UdDgQWBBQ6GT0R/WaBzKME9AYvw4mC3V12OzAfBgNVHSME hmY+ghE2MQXcLPSAT7uw/x21/nMCAwEAAaNQME4wHQYDVR0OBBYEFCNbrgeYEDsO
GDAWgBQ6GT0R/WaBzKME9AYvw4mC3V12OzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 uDZMtqpC3vUe6qnvMB8GA1UdIwQYMBaAFCNbrgeYEDsOuDZMtqpC3vUe6qnvMAwG
DQEBCwUAA4IBAQCmO/IfjwAyGOzYZAzDxc9uLdjkucqofTNUzyDav/I+35bmp8Q8 A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKvFa44WkG8dFlCv1N+ZGCz1
/jzz/U7Ld7ThSmhP8kkGHM39wlpQhef9CrndRYvMpCUNB64rhDHq0xX07XLJoVUD /sJ89/02OpZICHGTmp7q8HFbRCmUAV6oYS2wae5fyueOZwbLBhxWKJ8KSXHmgqzS
st4Qd8iWSHMF0cNM84FY+5L0DSVxKPlnqa+kRGwVumHuTbcrIzNwATiXrbOzCrdI Kox4uvNImJUbNbJ+6/Wxbb8Brf7Ev3DAZmVmsEpHcrM3k2Ww0YfU0HqrovUw32kk
QMh5R/XmI09/c6Lj3KNI1DM4wgDzU/Cye+t/dSXOdsfMUL7mhnBKxlsPf02pnx4f TPiFsoKJz1G0FH2fNSnWRMnOPDj1wm4Kx/225da4c78HSTEySDpkTkiJM5LoN+tp
1qyOISPskn/ACnYNce8R+LAZh1SdNb4ZGnSeY28YHc9HFGme1y01X2KvB12ifheK JGg6I9OUbbw7sANiN3IJYV5T7jkBDPpmzirN1+dXruDG8Xyob6I5dPiS3iqwAqQL
mcQTT7A7Vtee1H9ZnXHvvzAT6IkhMKnosYzv RiueQbuSa0F3/koUbZOs4jIiWGObVK+w1WS9/+ESxMGC5bMwIMo1jkyexj5MBQE=
-----END CERTIFICATE----- -----END CERTIFICATE-----

View File

@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----

View File

@@ -542,7 +542,7 @@ x509_modify_by_cert(X509 *cacrt, EVP_PKEY *cakey, X509 *origcrt, char *pkey,
!X509_set_subject_name(crt, subject) || !X509_set_subject_name(crt, subject) ||
!X509_set_issuer_name(crt, issuer) || !X509_set_issuer_name(crt, issuer) ||
ssl_x509_serial_copyrand(crt, origcrt) == -1 || ssl_x509_serial_copyrand(crt, origcrt) == -1 ||
!X509_gmtime_adj(X509_get_notBefore(crt), 0) || !X509_gmtime_adj(X509_get_notBefore(crt), (long)(sizeof_seconds(-1))) ||
!X509_time_adj_ex(X509_get_notAfter(crt), days, 0, NULL) || !X509_time_adj_ex(X509_get_notAfter(crt), days, 0, NULL) ||
!X509_set_pubkey(crt, key)) !X509_set_pubkey(crt, key))
goto errout; goto errout;
@@ -1430,7 +1430,7 @@ thread_decode_uri(const char *uri, X509 **origin,
id = evhttp_find_header(&params, "keyring_id"); id = evhttp_find_header(&params, "keyring_id");
if (id) if (id)
*keyring_id = atoi(id); *keyring_id = atoi(id);
_valid = evhttp_find_header(&params, "is_vaild"); _valid = evhttp_find_header(&params, "is_valid");
if (_valid) if (_valid)
*is_valid = atoi(_valid); *is_valid = atoi(_valid);
_sni = evhttp_find_header(&params, "sni"); _sni = evhttp_find_header(&params, "sni");