diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-11-10 16:41:12 +0000 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-11-11 23:28:58 +0000 |
commit | e9477a08d2d1f528b1f127f1d563d77e2cf24a22 (patch) | |
tree | 9e2c278792c869e0b3b5a9e4c81a1afa1b8e2ab4 /test | |
parent | a163908a12546834f355c40c87b6cb859302b1c6 (diff) |
Handle UTC vs specified-timezone for certificate extractors. Bug 1541
Diffstat (limited to 'test')
-rw-r--r-- | test/confs/2002 | 1 | ||||
-rw-r--r-- | test/confs/2102 | 4 | ||||
-rw-r--r-- | test/confs/5750 | 1 | ||||
-rw-r--r-- | test/confs/5760 | 1 | ||||
-rw-r--r-- | test/log/2102 | 5 | ||||
-rw-r--r-- | test/log/5760 | 8 |
6 files changed, 13 insertions, 7 deletions
diff --git a/test/confs/2002 b/test/confs/2002 index 9f664e8f7..69fc749ff 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +timezone = UTC # ----- Main settings ----- diff --git a/test/confs/2102 b/test/confs/2102 index 7d5d13a5a..88453ed66 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -8,6 +8,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +timezone = UTC # ----- Main settings ----- @@ -53,7 +54,8 @@ 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 = SA <${certextract {sig_algorithm}{$tls_in_peercert}}> diff --git a/test/confs/5750 b/test/confs/5750 index 3898530b4..a0bce0282 100644 --- a/test/confs/5750 +++ b/test/confs/5750 @@ -11,6 +11,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +timezone = UTC # ----- Main settings ----- diff --git a/test/confs/5760 b/test/confs/5760 index d07aa8d90..3417a2d32 100644 --- a/test/confs/5760 +++ b/test/confs/5760 @@ -11,6 +11,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +timezone = UTC # ----- Main settings ----- diff --git a/test/log/2102 b/test/log/2102 index 68a21bb27..da79a8165 100644 --- a/test/log/2102 +++ b/test/log/2102 @@ -14,9 +14,10 @@ 1999-03-02 09:44:33 SN <CN=server2.example.com> 1999-03-02 09:44:33 IN <CN=clica Signing Cert,O=example.com> 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 +0000> 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 <Jan 1 12:34:06 2038 +0000> 1999-03-02 09:44:33 SA <sha1WithRSAEncryption> 1999-03-02 09:44:33 SG < 6c:37:41:26:4d:5d:f4:b5:31:10:67:ca:fb:64:b6:22:98:62:\n f7:1e:95:7b:6c:e6:74:47:21:f4:5e:89:36:3e:b9:9c:8a:c5:\n 52:bb:c4:af:12:93:26:3b:d7:3d:e0:56:71:1e:1d:21:20:02:\n ed:f0:4e:d5:5e:45:42:fd:3c:38:41:54:83:86:0b:3b:bf:c5:\n 47:39:ff:15:ea:93:dc:fd:c7:3d:18:58:59:ca:dd:2a:d8:b9:\n f9:2f:b9:76:93:f4:ae:e3:91:56:80:2f:8c:04:2f:ad:57:ef:\n d2:51:19:f4:b4:ef:32:9c:ac:3a:7c:0d:b8:39:db:b1:e3:30:\n 73:1a\n> 1999-03-02 09:44:33 SAN <DNS=server2.example.com> diff --git a/test/log/5760 b/test/log/5760 index 691ccdae7..37757791b 100644 --- a/test/log/5760 +++ b/test/log/5760 @@ -9,8 +9,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 ver <2> 1999-03-02 09:44:33 10HmaX-0005vi-00 SN <CN=clica CA,O=example.com> 1999-03-02 09:44:33 10HmaX-0005vi-00 IN <CN=clica CA,O=example.com> -1999-03-02 09:44:33 10HmaX-0005vi-00 NB <Nov 1 12:34:04 2012 GMT> -1999-03-02 09:44:33 10HmaX-0005vi-00 NA <Jan 1 12:34:04 2038 GMT> +1999-03-02 09:44:33 10HmaX-0005vi-00 NB <Nov 1 12:34:04 2012 +0000> +1999-03-02 09:44:33 10HmaX-0005vi-00 NA <Jan 1 12:34:04 2038 +0000> 1999-03-02 09:44:33 10HmaX-0005vi-00 SA <sha1WithRSAEncryption> 1999-03-02 09:44:33 10HmaX-0005vi-00 SG < 89:fd:fb:cb:b2:42:d6:aa:f2:c0:44:a2:14:e5:ab:22:50:41:\n e6:64:e7:1c:5a:20:b6:0f:fe:b0:88:c5:cf:b3:e5:f8:0e:87:\n eb:ac:07:d6:9d:6a:20:f6:dd:13:ee:b8:3f:cf:d9:cd:d4:a8:\n 72:50:5a:a2:14:4e:ee:3a:78:e2:a7:f4:ae:d7:ee:77:48:1f:\n 75:a7:68:2f:ee:e2:7c:ac:2f:e4:88:02:e8:3b:db:f9:35:04:\n 05:46:35:0b:f2:35:03:21:b6:1e:82:7d:94:e0:63:4b:60:71:\n 2d:19:45:21:f2:85:b4:c3:d0:77:a2:24:32:36:f3:50:68:38:\n 98:e6\n> 1999-03-02 09:44:33 10HmaX-0005vi-00 (no SAN) @@ -32,8 +32,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 ver <2> 1999-03-02 09:44:33 10HmaY-0005vi-00 SN <CN=server1.example.com> 1999-03-02 09:44:33 10HmaY-0005vi-00 IN <CN=clica Signing Cert,O=example.com> -1999-03-02 09:44:33 10HmaY-0005vi-00 NB <Nov 1 12:34:05 2012 GMT> -1999-03-02 09:44:33 10HmaY-0005vi-00 NA <Jan 1 12:34:05 2038 GMT> +1999-03-02 09:44:33 10HmaY-0005vi-00 NB <Nov 1 12:34:05 2012 +0000> +1999-03-02 09:44:33 10HmaY-0005vi-00 NA <Jan 1 12:34:05 2038 +0000> 1999-03-02 09:44:33 10HmaY-0005vi-00 SA <sha1WithRSAEncryption> 1999-03-02 09:44:33 10HmaY-0005vi-00 SG < 56:3a:a4:3c:cb:eb:b8:27:c2:90:08:74:13:88:dc:48:c6:b5:\n 2c:e5:26:be:5b:91:d4:67:e7:3c:49:12:d7:47:30:df:98:db:\n 58:ed:18:a8:7d:4b:db:97:48:f5:5c:7f:70:b9:37:63:33:f1:\n 24:62:72:92:60:f5:6e:da:b6:bc:73:c8:c2:dc:d6:95:9a:bd:\n 16:16:a2:ef:0a:f1:d7:41:68:f6:ad:98:5a:d0:ff:d9:1b:51:\n 9f:59:ce:2f:3d:84:d0:ee:e8:2b:eb:9b:32:1a:0e:02:3e:cc:\n 30:89:44:09:2a:75:81:46:a7:b6:ed:7d:41:eb:5a:63:fa:9c:\n 58:ef\n> 1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=server1.example.com;DNS=alternatename2.server1.example.com;DNS=alternatename.server1.example.com> |