diff options
| -rw-r--r-- | test/confs/2002 | 8 | ||||
| -rw-r--r-- | test/confs/2102 | 3 | ||||
| -rw-r--r-- | test/log/2002 | 8 | ||||
| -rw-r--r-- | test/log/2102 | 3 |
4 files changed, 14 insertions, 8 deletions
diff --git a/test/confs/2002 b/test/confs/2002 index 535be91eb..ccbe6f192 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -49,16 +49,18 @@ check_recipient: logwrite = SN <${certextract {subject} {$tls_in_peercert}}> logwrite = IN <${certextract {issuer} {$tls_in_peercert}}> logwrite = IN/O <${certextract {issuer,O} {$tls_in_peercert}}> - logwrite = NB <${certextract {notbefore} {$tls_in_peercert}}> + logwrite = NB/r <${certextract {notbefore,raw} {$tls_in_peercert}}> + logwrite = NB <${certextract {notbefore} {$tls_in_peercert}}> logwrite = NB/i <${certextract {notbefore,int}{$tls_in_peercert}}> - logwrite = NA <${certextract {notafter} {$tls_in_peercert}}> + logwrite = NA/i <${certextract {notafter,int} {$tls_in_peercert}}> + logwrite = NA <${certextract {notafter} {$tls_in_peercert}}> logwrite = SA <${certextract {sig_algorithm}{$tls_in_peercert}}> logwrite = SG <${certextract {signature} {$tls_in_peercert}}> logwrite = ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}} # logwrite = ${certextract {ocsp_uri} {$tls_in_peercert} {OCU <$value>}{(no OCU)}} logwrite = ${certextract {crl_uri} {$tls_in_peercert} {CRU <$value>}{(no CRU)}} logwrite = md5 fingerprint ${md5:$tls_in_peercert} - logwrite = sha1 fingerprint ${sha1:$tls_in_peercert} + logwrite = sha1 fingerprint ${sha1:$tls_in_peercert} logwrite = sha256 fingerprint ${sha256:$tls_in_peercert} logwrite = der_b64 ${base64:$tls_in_peercert} diff --git a/test/confs/2102 b/test/confs/2102 index 4223430a3..8b2083959 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -55,7 +55,8 @@ check_recipient: logwrite = NB/r <${certextract {notbefore,raw} {$tls_in_peercert}}> logwrite = NB <${certextract {notbefore} {$tls_in_peercert}}> logwrite = NB/i <${certextract {notbefore,int}{$tls_in_peercert}}> - logwrite = NA <${certextract {notafter} {$tls_in_peercert}}> + logwrite = NA/i <${certextract {notafter,int} {$tls_in_peercert}}> + logwrite = NA <${certextract {notafter} {$tls_in_peercert}}> logwrite = SA <${certextract {sig_algorithm}{$tls_in_peercert}}> logwrite = SG <${certextract {signature} {$tls_in_peercert}}> logwrite = ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}} diff --git a/test/log/2002 b/test/log/2002 index 112ec8faa..572a7e689 100644 --- a/test/log/2002 +++ b/test/log/2002 @@ -23,15 +23,17 @@ 1999-03-02 09:44:33 SN <CN=server2.example.com> 1999-03-02 09:44:33 IN <O=example.com,CN=clica Signing Cert> 1999-03-02 09:44:33 IN/O <example.com> -1999-03-02 09:44:33 NB <Nov 1 12:34:06 2012 GMT> +1999-03-02 09:44:33 NB/r <Nov 1 12:34:06 2012 GMT> +1999-03-02 09:44:33 NB <Nov 1 12:34:06 2012 GMT> 1999-03-02 09:44:33 NB/i <1351773246> -1999-03-02 09:44:33 NA <Jan 1 12:34:06 2038 GMT> +1999-03-02 09:44:33 NA/i <2145962046> +1999-03-02 09:44:33 NA <Jan 1 12:34:06 2038 GMT> 1999-03-02 09:44:33 SA <RSA-SHA256> 1999-03-02 09:44:33 SG <71 b2 af 7b 95 28 55 f3 39 e3 8d 32 43 e9 2f 68 28 ef 03 76 3c 3a 6a 7a d7 6e 47 4e 69 25 67 fb 7a eb bc bb 69 9c 3f e8 b7 78 d0 a9 78 0c 7a 46 8d 01 de cc c6 fd 13 be 8d 99 ba 12 ee eb df e9 65 98 4c e9 ff 2e fe 71 5e 11 fe 48 81 66 91 a7 f5 70 8a 9c 63 36 b7 ac 69 95 06 5e 54 9b 53 ff a9 d9 07 34 67 f5 f0 05 f7 16 eb 28 89 8e 98 27 58 5f 61 c3 3f 72 f5 dc 2f b7 67 48 87 18 c6 72> 1999-03-02 09:44:33 SAN <DNS=server2.example.com> 1999-03-02 09:44:33 CRU <http://crl.example.com/latest.crl> 1999-03-02 09:44:33 md5 fingerprint 6EF976EBB1B8D9F761FC9B90C0A932F2 -1999-03-02 09:44:33 sha1 fingerprint 937464090D55415838493903E638821D15251017 +1999-03-02 09:44:33 sha1 fingerprint 937464090D55415838493903E638821D15251017 1999-03-02 09:44:33 sha256 fingerprint 5D5FAB3264B5DC5101A548BF1F80FED4AF1FEB8108E08EE4BE012CCC0BD39395 1999-03-02 09:44:33 der_b64 MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDExMjM0MDZaFw0zODAxMDExMjM0MDZaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKyfVyM2/OEp07jUT275Z443TxznHO7R/gOy2YSg8boviB72gXWcnvPD7JJ19zT4dAX7ycYhJJHvnfurI9sxlbeC12v1Vci9auGtSdyTfiFE6sHj5WG85eRLPyp9Bh10oHF5f5/O8ql5oY6Mp64fgzkQww6adLTJhMXdYum4pYS7AgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBxsq97lShV8znjjTJD6S9oKO8Ddjw6anrXbkdOaSVn+3rrvLtpnD/ot3jQqXgMekaNAd7Mxv0Tvo2ZuhLu69/pZZhM6f8u/nFeEf5IgWaRp/VwipxjNresaZUGXlSbU/+p2Qc0Z/XwBfcW6yiJjpgnWF9hwz9y9dwvt2dIhxjGcg== 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="CN=server2.example.com" S=sss diff --git a/test/log/2102 b/test/log/2102 index 4257a3b61..76020bd04 100644 --- a/test/log/2102 +++ b/test/log/2102 @@ -27,7 +27,8 @@ 1999-03-02 09:44:33 NB/r <Nov 1 12:34:06 2012 GMT> 1999-03-02 09:44:33 NB <Nov 1 12:34:06 2012 +0000> 1999-03-02 09:44:33 NB/i <1351773246> -1999-03-02 09:44:33 NA <Jan 1 12:34:06 2038 +0000> +1999-03-02 09:44:33 NA/i <2145962046> +1999-03-02 09:44:33 NA <Jan 1 12:34:06 2038 +0000> 1999-03-02 09:44:33 SA <sha256WithRSAEncryption> 1999-03-02 09:44:33 SG < 71:b2:af:7b:95:28:55:f3:39:e3:8d:32:43:e9:2f:68:28:ef:\n 03:76:3c:3a:6a:7a:d7:6e:47:4e:69:25:67:fb:7a:eb:bc:bb:\n 69:9c:3f:e8:b7:78:d0:a9:78:0c:7a:46:8d:01:de:cc:c6:fd:\n 13:be:8d:99:ba:12:ee:eb:df:e9:65:98:4c:e9:ff:2e:fe:71:\n 5e:11:fe:48:81:66:91:a7:f5:70:8a:9c:63:36:b7:ac:69:95:\n 06:5e:54:9b:53:ff:a9:d9:07:34:67:f5:f0:05:f7:16:eb:28:\n 89:8e:98:27:58:5f:61:c3:3f:72:f5:dc:2f:b7:67:48:87:18:\n c6:72\n> 1999-03-02 09:44:33 SAN <DNS=server2.example.com> |