summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2018-11-05 17:08:39 +0800
committerfengweihao <[email protected]>2018-11-05 17:08:39 +0800
commitc0dd5d1d3f8a25112ca0c87d661aa615157d8fc9 (patch)
tree42d476c04ae4a0f1de8fc3dbf2951ea76530ee3b
parent26cba8d900af70266ffc6dc07a10f7e70ab40ca4 (diff)
1.修改签发证书时间,默认提前一天
3.修改url中对valid的解析问题
-rw-r--r--ca/mesalab-insec-cert.cer36
-rw-r--r--ca/mesalab-insec-cert.key50
-rw-r--r--src/cert_session.c4
3 files changed, 45 insertions, 45 deletions
diff --git a/ca/mesalab-insec-cert.cer b/ca/mesalab-insec-cert.cer
index c776676..67afe2f 100644
--- a/ca/mesalab-insec-cert.cer
+++ b/ca/mesalab-insec-cert.cer
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIJAM3sdp+ssKYAMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+MIIDizCCAnOgAwIBAgIJAK8/bkwMJ0lJMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
-Q29tcGFueSBMdGQxDjAMBgNVBAMMBWluc2VjMB4XDTE4MTAyMzAzMjA1MloXDTE5
-MTAyMzAzMjA1MlowUjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0
-eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEOMAwGA1UEAwwFaW5zZWMw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9uRq4tMCqA4wNWk4nIogY
-yxFiJqQyl1dWuCGIK0QDuXcN2BeSfx1dCTW9Ul6JzojUCM6E0MXRbYfTSd1UwKzb
-AqlVuj20pFWAw6LOeMZ0xjC74hP2ADosmJg9KboOMhHYwRvLRP/IZcTNVFBxA3jo
-mMLAGgNOYio4aLtNNfbLS61I+OK/XPii7/IW3V5AqDVGSyNJJsiQX3HuetQhMtg4
-iKtZWBHjGRaZIKJiKDRkCT+/yXXoEsr+nGk0PLWGFaeEsQgeQYA1vNuqSSHaTk9O
-1BNaLjAC3QrRRD9UnXjRW8psUdDml5R3NEiqPhar78ddDDMphXGN32Sy2TI1RoJr
-AgMBAAGjUDBOMB0GA1UdDgQWBBQ6GT0R/WaBzKME9AYvw4mC3V12OzAfBgNVHSME
-GDAWgBQ6GT0R/WaBzKME9AYvw4mC3V12OzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQCmO/IfjwAyGOzYZAzDxc9uLdjkucqofTNUzyDav/I+35bmp8Q8
-/jzz/U7Ld7ThSmhP8kkGHM39wlpQhef9CrndRYvMpCUNB64rhDHq0xX07XLJoVUD
-st4Qd8iWSHMF0cNM84FY+5L0DSVxKPlnqa+kRGwVumHuTbcrIzNwATiXrbOzCrdI
-QMh5R/XmI09/c6Lj3KNI1DM4wgDzU/Cye+t/dSXOdsfMUL7mhnBKxlsPf02pnx4f
-1qyOISPskn/ACnYNce8R+LAZh1SdNb4ZGnSeY28YHc9HFGme1y01X2KvB12ifheK
-mcQTT7A7Vtee1H9ZnXHvvzAT6IkhMKnosYzv
+Q29tcGFueSBMdGQxGDAWBgNVBAMMD21lc2FsYWItdW50cnVzdDAeFw0xODEwMjMx
+MTI2MzNaFw0yODEwMjAxMTI2MzNaMFwxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxE
+ZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxGDAWBgNV
+BAMMD21lc2FsYWItdW50cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANqgqDIsu2/lv+kU/HXP/AeCdBZiHKnLz3GP5D7ZRTmLJuTu3sqsabNjG0HB
+uqwIHNrxmN0upm+5AqaXVsCRoT7APW6DuGCNORWuUlS7GR4uMvYST6InGdMGE/4z
+40Wi4Z3aSikedWWzdNPA576LhH1UJ1M/hsaAnhFEa03WiHdzRVw2zyq1rCO3kIL6
+kzYXN06Tb+TU9DV9P7VY2vcUiBEIJX1Sy7NKRUpHRI73SAc6WIgUzMKaZhjajfEV
+9lAjPRS5pE4SFQ0sxSVrKG/GLfcwWyLkmVEsZFdOnFUgMI6WAXS93vvVSpl/ULET
+hmY+ghE2MQXcLPSAT7uw/x21/nMCAwEAAaNQME4wHQYDVR0OBBYEFCNbrgeYEDsO
+uDZMtqpC3vUe6qnvMB8GA1UdIwQYMBaAFCNbrgeYEDsOuDZMtqpC3vUe6qnvMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKvFa44WkG8dFlCv1N+ZGCz1
+/sJ89/02OpZICHGTmp7q8HFbRCmUAV6oYS2wae5fyueOZwbLBhxWKJ8KSXHmgqzS
+Kox4uvNImJUbNbJ+6/Wxbb8Brf7Ev3DAZmVmsEpHcrM3k2Ww0YfU0HqrovUw32kk
+TPiFsoKJz1G0FH2fNSnWRMnOPDj1wm4Kx/225da4c78HSTEySDpkTkiJM5LoN+tp
+JGg6I9OUbbw7sANiN3IJYV5T7jkBDPpmzirN1+dXruDG8Xyob6I5dPiS3iqwAqQL
+RiueQbuSa0F3/koUbZOs4jIiWGObVK+w1WS9/+ESxMGC5bMwIMo1jkyexj5MBQE=
-----END CERTIFICATE-----
diff --git a/ca/mesalab-insec-cert.key b/ca/mesalab-insec-cert.key
index 04cca25..faae6de 100644
--- a/ca/mesalab-insec-cert.key
+++ b/ca/mesalab-insec-cert.key
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/src/cert_session.c b/src/cert_session.c
index a74d56d..8e5d367 100644
--- a/src/cert_session.c
+++ b/src/cert_session.c
@@ -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_issuer_name(crt, issuer) ||
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_set_pubkey(crt, key))
goto errout;
@@ -1430,7 +1430,7 @@ thread_decode_uri(const char *uri, X509 **origin,
id = evhttp_find_header(&params, "keyring_id");
if (id)
*keyring_id = atoi(id);
- _valid = evhttp_find_header(&params, "is_vaild");
+ _valid = evhttp_find_header(&params, "is_valid");
if (_valid)
*is_valid = atoi(_valid);
_sni = evhttp_find_header(&params, "sni");