[Rt-commit] rt branch, 4.2/smime-v2, updated. rt-4.0.4-347-gbe31ec9

Ruslan Zakirov ruz at bestpractical.com
Wed Dec 28 19:11:18 EST 2011


The branch, 4.2/smime-v2 has been updated
       via  be31ec9a0aabf815b2041b9f33ea645b6b65458c (commit)
       via  24e173d1a2424ab116a3ed01fbfae999bf0c2cf4 (commit)
       via  773d6f1b3d909b6e948aff79c7df184e38cbf7cf (commit)
       via  81d9a63cea8e1ea098c0571ef58720925b8ac633 (commit)
       via  d2d88a9cab7de7152bd2636d520587400158b58a (commit)
       via  f0b954ff7250ca211591e9e0f1797c90d068c402 (commit)
       via  2383c2475c2884a9fd9972bae05f506581ff7ad6 (commit)
       via  71df649e51ec50b79623f50adc73c3ad90b86c98 (commit)
       via  429597bfe550da59f456336ef8d18eaa1b303ca9 (commit)
      from  adccbd695104c87fd177dc4134ecb3c624a08f0a (commit)

Summary of changes:
 .gitignore                                         |    1 +
 lib/RT/Test.pm                                     |   28 ++++++++++-----
 t/data/smime/keys/demoCA/index.txt                 |    4 +-
 t/data/smime/keys/demoCA/index.txt.attr            |    2 +-
 t/data/smime/keys/demoCA/index.txt.attr.old        |    1 -
 t/data/smime/keys/demoCA/index.txt.old             |    2 -
 .../keys/demoCA/newcerts/8A6ACD51BE94A015.pem      |   36 ++++++++++----------
 .../keys/demoCA/newcerts/8A6ACD51BE94A016.pem      |   36 ++++++++++----------
 t/data/smime/keys/demoCA/serial.old                |    1 -
 t/data/smime/keys/root at example.com.crt             |   36 ++++++++++----------
 t/data/smime/keys/root at example.com.pem             |   36 ++++++++++----------
 t/data/smime/keys/sender at example.com.crt           |   36 ++++++++++----------
 t/data/smime/keys/sender at example.com.pem           |   36 ++++++++++----------
 t/mail/smime/incoming.t                            |   16 +++++---
 t/mail/smime/outgoing.t                            |   13 +------
 15 files changed, 143 insertions(+), 141 deletions(-)
 delete mode 100644 t/data/smime/keys/demoCA/index.txt.attr.old
 delete mode 100644 t/data/smime/keys/demoCA/index.txt.old
 delete mode 100644 t/data/smime/keys/demoCA/serial.old

- Log -----------------------------------------------------------------
commit 429597bfe550da59f456336ef8d18eaa1b303ca9
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Dec 28 22:31:57 2011 +0400

    delete backup files openssl creates in CA directory

diff --git a/t/data/smime/keys/demoCA/index.txt.attr.old b/t/data/smime/keys/demoCA/index.txt.attr.old
deleted file mode 100644
index 8f7e63a..0000000
--- a/t/data/smime/keys/demoCA/index.txt.attr.old
+++ /dev/null
@@ -1 +0,0 @@
-unique_subject = yes
diff --git a/t/data/smime/keys/demoCA/index.txt.old b/t/data/smime/keys/demoCA/index.txt.old
deleted file mode 100644
index 1433378..0000000
--- a/t/data/smime/keys/demoCA/index.txt.old
+++ /dev/null
@@ -1,2 +0,0 @@
-V	130207162053Z		8A6ACD51BE94A014	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=CA Owner/emailAddress=ca.owner at example.com
-V	110208162542Z		8A6ACD51BE94A015	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=sender/emailAddress=sender at example.com
diff --git a/t/data/smime/keys/demoCA/serial.old b/t/data/smime/keys/demoCA/serial.old
deleted file mode 100644
index 7c4c23b..0000000
--- a/t/data/smime/keys/demoCA/serial.old
+++ /dev/null
@@ -1 +0,0 @@
-8A6ACD51BE94A016

commit 71df649e51ec50b79623f50adc73c3ad90b86c98
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Dec 28 22:34:28 2011 +0400

    for simplicity allow non-unique subjects

diff --git a/t/data/smime/keys/demoCA/index.txt.attr b/t/data/smime/keys/demoCA/index.txt.attr
index 8f7e63a..3a7e39e 100644
--- a/t/data/smime/keys/demoCA/index.txt.attr
+++ b/t/data/smime/keys/demoCA/index.txt.attr
@@ -1 +1 @@
-unique_subject = yes
+unique_subject = no

commit 2383c2475c2884a9fd9972bae05f506581ff7ad6
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:00:34 2011 +0400

    update expiration date on SMIME certs
    
    hopefuly next 25 years is ok

diff --git a/t/data/smime/keys/demoCA/index.txt b/t/data/smime/keys/demoCA/index.txt
index 0afe6c7..9793965 100644
--- a/t/data/smime/keys/demoCA/index.txt
+++ b/t/data/smime/keys/demoCA/index.txt
@@ -1,3 +1,3 @@
 V	130207162053Z		8A6ACD51BE94A014	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=CA Owner/emailAddress=ca.owner at example.com
-V	110208162542Z		8A6ACD51BE94A015	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=sender/emailAddress=sender at example.com
-V	110208163008Z		8A6ACD51BE94A016	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=Enoch Root/emailAddress=root at example.com
+V	360818214620Z		8A6ACD51BE94A015	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=sender/emailAddress=sender at example.com
+V	360818214642Z		8A6ACD51BE94A016	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=Enoch Root/emailAddress=root at example.com
diff --git a/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A015.pem b/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A015.pem
index 657491f..e3a9165 100644
--- a/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A015.pem
+++ b/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A015.pem
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:25:42 2010 GMT
-            Not After : Feb  8 16:25:42 2011 GMT
+            Not Before: Dec 28 21:46:20 2011 GMT
+            Not After : Aug 18 21:46:20 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=sender/emailAddress=sender at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:a8:38:41:90:1d:e7:cd:2b:cb:62:cf:ad:ff:70:
                     f6:44:5d:f3:4b:7e:21:75:b6:5c:e1:7e:c2:27:3b:
                     85:eb:72:9b:5a:94:0a:69:1d:83:ca:c5:91:b2:3f:
@@ -30,28 +30,28 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        53:90:db:6d:d0:aa:0f:cb:32:94:2e:a5:bc:d1:0d:27:7c:85:
-        d8:08:6c:52:fe:b1:4d:18:94:c2:10:ff:4f:8f:71:2b:81:bf:
-        a3:aa:11:3e:6e:72:5f:4a:1a:38:a0:3f:5f:2c:89:d6:af:c5:
-        6c:ff:59:63:13:2d:fb:5a:2f:58:b2:77:3e:52:83:07:01:c6:
-        4e:cf:19:9c:9a:f3:17:ac:63:c2:00:f3:18:b9:27:a6:d5:1a:
-        14:11:d6:f0:db:9b:de:e4:ad:cd:29:01:fd:38:c1:21:9c:fa:
-        a2:0b:5e:6d:5d:14:54:ce:0a:3c:f7:af:0f:e6:7f:c7:39:00:
-        b3:33
+        93:a7:14:3d:7f:47:6c:ec:71:34:29:19:e4:e0:0e:17:79:50:
+        df:58:31:d6:fb:b1:93:4a:a7:3f:95:44:62:fb:ea:eb:86:dc:
+        94:46:ff:2d:e5:73:37:e4:d3:d5:60:29:86:ea:75:1f:77:dc:
+        db:ed:f2:30:a7:b9:8d:ba:5f:06:55:6c:f9:95:c8:a1:32:ab:
+        33:0a:21:a2:70:86:9d:22:5b:99:53:3f:1b:3f:15:54:61:f9:
+        d3:3c:da:fa:c8:82:43:79:67:e2:a8:7e:78:1c:73:24:b4:a3:
+        76:e5:15:4e:4c:9f:32:f5:45:71:c5:46:79:28:7b:8e:fa:56:
+        0d:53
 -----BEGIN CERTIFICATE-----
 MIICqzCCAhSgAwIBAgIJAIpqzVG+lKAVMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjI1NDJaFw0xMTAyMDgx
-NjI1NDJaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2MjBaFw0zNjA4MTgy
+MTQ2MjBaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMTBnNlbmRlcjEh
 MB8GCSqGSIb3DQEJARYSc2VuZGVyQGV4YW1wbGUuY29tMFwwDQYJKoZIhvcNAQEB
 BQADSwAwSAJBAKg4QZAd580ry2LPrf9w9kRd80t+IXW2XOF+wic7hetym1qUCmkd
 g8rFkbI/BHJh5LjrW861EHfYp9+LyVoUFWECAwEAAaN7MHkwCQYDVR0TBAIwADAs
 BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
 VR0OBBYEFPM05sNReJKbk0mOTjC8GIgkaTQJMB8GA1UdIwQYMBaAFI0bLb29JOgZ
-Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAFOQ223Qqg/LMpQupbzRDSd8
-hdgIbFL+sU0YlMIQ/0+PcSuBv6OqET5ucl9KGjigP18sidavxWz/WWMTLftaL1iy
-dz5SgwcBxk7PGZya8xesY8IA8xi5J6bVGhQR1vDbm97krc0pAf04wSGc+qILXm1d
-FFTOCjz3rw/mf8c5ALMz
+Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAJOnFD1/R2zscTQpGeTgDhd5
+UN9YMdb7sZNKpz+VRGL76uuG3JRG/y3lczfk09VgKYbqdR933Nvt8jCnuY26XwZV
+bPmVyKEyqzMKIaJwhp0iW5lTPxs/FVRh+dM82vrIgkN5Z+KofngccyS0o3blFU5M
+nzL1RXHFRnkoe476Vg1T
 -----END CERTIFICATE-----
diff --git a/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A016.pem b/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A016.pem
index 3085e41..e8aa87c 100644
--- a/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A016.pem
+++ b/t/data/smime/keys/demoCA/newcerts/8A6ACD51BE94A016.pem
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:30:08 2010 GMT
-            Not After : Feb  8 16:30:08 2011 GMT
+            Not Before: Dec 28 21:46:42 2011 GMT
+            Not After : Aug 18 21:46:42 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=Enoch Root/emailAddress=root at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:b2:77:b9:bc:09:7d:14:8e:6b:6f:7e:33:a9:95:
                     21:5d:f3:3c:91:61:f1:bc:5c:1d:7e:e7:54:25:e8:
                     cb:5f:b7:18:0e:23:26:00:42:09:bd:89:da:5c:06:
@@ -30,28 +30,28 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        95:5d:21:4f:cc:62:44:49:ad:f7:7f:75:ee:b0:e8:ec:0c:25:
-        39:72:4d:9d:98:86:99:81:81:02:a0:d1:2b:3e:2b:5c:01:14:
-        77:81:aa:be:a7:ff:9a:db:b4:b6:9c:b2:2e:d7:eb:4e:32:b8:
-        69:dd:7a:3f:3c:38:50:22:46:e5:21:1c:fc:d0:bf:04:79:5a:
-        5b:ac:53:77:33:be:27:63:6e:d7:47:e7:2f:75:15:84:db:9a:
-        08:c0:0a:b5:00:77:51:fe:64:df:97:95:ee:7f:2a:f8:83:72:
-        67:4a:c9:75:7e:a6:dd:e5:d6:83:c5:a6:b9:0d:0e:24:39:ca:
-        06:d7
+        95:58:dc:1e:2b:c2:92:18:af:ce:a5:24:19:5e:04:c9:a6:ca:
+        01:26:d0:65:6a:89:78:fa:a1:e3:94:fc:f3:b9:32:20:dc:9d:
+        91:aa:9f:44:8b:ef:86:5c:82:dc:99:ef:4a:c9:34:6f:f0:2e:
+        77:55:a4:ed:1f:b5:06:be:e2:7e:1c:22:76:08:cb:68:e0:e0:
+        4d:6c:86:8f:37:90:6d:1d:9c:0c:c7:6a:67:3f:3c:47:68:f4:
+        4e:22:78:80:11:7e:0a:08:8c:fe:df:32:db:a7:d3:6f:35:cb:
+        5a:ba:00:0f:a3:6b:1b:4f:05:1e:97:e2:c8:e0:7f:3f:7f:51:
+        c7:66
 -----BEGIN CERTIFICATE-----
 MIICrTCCAhagAwIBAgIJAIpqzVG+lKAWMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjMwMDhaFw0xMTAyMDgx
-NjMwMDhaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2NDJaFw0zNjA4MTgy
+MTQ2NDJaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEzARBgNVBAMTCkVub2NoIFJv
 b3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5jb20wXDANBgkqhkiG9w0B
 AQEFAANLADBIAkEAsne5vAl9FI5rb34zqZUhXfM8kWHxvFwdfudUJejLX7cYDiMm
 AEIJvYnaXAbLUghD9k7+3fgKipU1j0olFtrmvwIDAQABo3sweTAJBgNVHRMEAjAA
 MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
 BgNVHQ4EFgQUl9eAUsq74QJgk1NCohQS6O0fwHowHwYDVR0jBBgwFoAUjRstvb0k
-6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlV0hT8xiREmt93917rDo
-7AwlOXJNnZiGmYGBAqDRKz4rXAEUd4Gqvqf/mtu0tpyyLtfrTjK4ad16Pzw4UCJG
-5SEc/NC/BHlaW6xTdzO+J2Nu10fnL3UVhNuaCMAKtQB3Uf5k35eV7n8q+INyZ0rJ
-dX6m3eXWg8WmuQ0OJDnKBtc=
+6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlVjcHivCkhivzqUkGV4E
+yabKASbQZWqJePqh45T887kyINydkaqfRIvvhlyC3JnvSsk0b/Aud1Wk7R+1Br7i
+fhwidgjLaODgTWyGjzeQbR2cDMdqZz88R2j0TiJ4gBF+CgiM/t8y26fTbzXLWroA
+D6NrG08FHpfiyOB/P39Rx2Y=
 -----END CERTIFICATE-----
diff --git a/t/data/smime/keys/root at example.com.crt b/t/data/smime/keys/root at example.com.crt
index 3085e41..e8aa87c 100644
--- a/t/data/smime/keys/root at example.com.crt
+++ b/t/data/smime/keys/root at example.com.crt
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:30:08 2010 GMT
-            Not After : Feb  8 16:30:08 2011 GMT
+            Not Before: Dec 28 21:46:42 2011 GMT
+            Not After : Aug 18 21:46:42 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=Enoch Root/emailAddress=root at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:b2:77:b9:bc:09:7d:14:8e:6b:6f:7e:33:a9:95:
                     21:5d:f3:3c:91:61:f1:bc:5c:1d:7e:e7:54:25:e8:
                     cb:5f:b7:18:0e:23:26:00:42:09:bd:89:da:5c:06:
@@ -30,28 +30,28 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        95:5d:21:4f:cc:62:44:49:ad:f7:7f:75:ee:b0:e8:ec:0c:25:
-        39:72:4d:9d:98:86:99:81:81:02:a0:d1:2b:3e:2b:5c:01:14:
-        77:81:aa:be:a7:ff:9a:db:b4:b6:9c:b2:2e:d7:eb:4e:32:b8:
-        69:dd:7a:3f:3c:38:50:22:46:e5:21:1c:fc:d0:bf:04:79:5a:
-        5b:ac:53:77:33:be:27:63:6e:d7:47:e7:2f:75:15:84:db:9a:
-        08:c0:0a:b5:00:77:51:fe:64:df:97:95:ee:7f:2a:f8:83:72:
-        67:4a:c9:75:7e:a6:dd:e5:d6:83:c5:a6:b9:0d:0e:24:39:ca:
-        06:d7
+        95:58:dc:1e:2b:c2:92:18:af:ce:a5:24:19:5e:04:c9:a6:ca:
+        01:26:d0:65:6a:89:78:fa:a1:e3:94:fc:f3:b9:32:20:dc:9d:
+        91:aa:9f:44:8b:ef:86:5c:82:dc:99:ef:4a:c9:34:6f:f0:2e:
+        77:55:a4:ed:1f:b5:06:be:e2:7e:1c:22:76:08:cb:68:e0:e0:
+        4d:6c:86:8f:37:90:6d:1d:9c:0c:c7:6a:67:3f:3c:47:68:f4:
+        4e:22:78:80:11:7e:0a:08:8c:fe:df:32:db:a7:d3:6f:35:cb:
+        5a:ba:00:0f:a3:6b:1b:4f:05:1e:97:e2:c8:e0:7f:3f:7f:51:
+        c7:66
 -----BEGIN CERTIFICATE-----
 MIICrTCCAhagAwIBAgIJAIpqzVG+lKAWMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjMwMDhaFw0xMTAyMDgx
-NjMwMDhaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2NDJaFw0zNjA4MTgy
+MTQ2NDJaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEzARBgNVBAMTCkVub2NoIFJv
 b3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5jb20wXDANBgkqhkiG9w0B
 AQEFAANLADBIAkEAsne5vAl9FI5rb34zqZUhXfM8kWHxvFwdfudUJejLX7cYDiMm
 AEIJvYnaXAbLUghD9k7+3fgKipU1j0olFtrmvwIDAQABo3sweTAJBgNVHRMEAjAA
 MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
 BgNVHQ4EFgQUl9eAUsq74QJgk1NCohQS6O0fwHowHwYDVR0jBBgwFoAUjRstvb0k
-6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlV0hT8xiREmt93917rDo
-7AwlOXJNnZiGmYGBAqDRKz4rXAEUd4Gqvqf/mtu0tpyyLtfrTjK4ad16Pzw4UCJG
-5SEc/NC/BHlaW6xTdzO+J2Nu10fnL3UVhNuaCMAKtQB3Uf5k35eV7n8q+INyZ0rJ
-dX6m3eXWg8WmuQ0OJDnKBtc=
+6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlVjcHivCkhivzqUkGV4E
+yabKASbQZWqJePqh45T887kyINydkaqfRIvvhlyC3JnvSsk0b/Aud1Wk7R+1Br7i
+fhwidgjLaODgTWyGjzeQbR2cDMdqZz88R2j0TiJ4gBF+CgiM/t8y26fTbzXLWroA
+D6NrG08FHpfiyOB/P39Rx2Y=
 -----END CERTIFICATE-----
diff --git a/t/data/smime/keys/root at example.com.pem b/t/data/smime/keys/root at example.com.pem
index 9c1591b..915eec5 100644
--- a/t/data/smime/keys/root at example.com.pem
+++ b/t/data/smime/keys/root at example.com.pem
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:30:08 2010 GMT
-            Not After : Feb  8 16:30:08 2011 GMT
+            Not Before: Dec 28 21:46:42 2011 GMT
+            Not After : Aug 18 21:46:42 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=Enoch Root/emailAddress=root at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:b2:77:b9:bc:09:7d:14:8e:6b:6f:7e:33:a9:95:
                     21:5d:f3:3c:91:61:f1:bc:5c:1d:7e:e7:54:25:e8:
                     cb:5f:b7:18:0e:23:26:00:42:09:bd:89:da:5c:06:
@@ -30,30 +30,30 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        95:5d:21:4f:cc:62:44:49:ad:f7:7f:75:ee:b0:e8:ec:0c:25:
-        39:72:4d:9d:98:86:99:81:81:02:a0:d1:2b:3e:2b:5c:01:14:
-        77:81:aa:be:a7:ff:9a:db:b4:b6:9c:b2:2e:d7:eb:4e:32:b8:
-        69:dd:7a:3f:3c:38:50:22:46:e5:21:1c:fc:d0:bf:04:79:5a:
-        5b:ac:53:77:33:be:27:63:6e:d7:47:e7:2f:75:15:84:db:9a:
-        08:c0:0a:b5:00:77:51:fe:64:df:97:95:ee:7f:2a:f8:83:72:
-        67:4a:c9:75:7e:a6:dd:e5:d6:83:c5:a6:b9:0d:0e:24:39:ca:
-        06:d7
+        95:58:dc:1e:2b:c2:92:18:af:ce:a5:24:19:5e:04:c9:a6:ca:
+        01:26:d0:65:6a:89:78:fa:a1:e3:94:fc:f3:b9:32:20:dc:9d:
+        91:aa:9f:44:8b:ef:86:5c:82:dc:99:ef:4a:c9:34:6f:f0:2e:
+        77:55:a4:ed:1f:b5:06:be:e2:7e:1c:22:76:08:cb:68:e0:e0:
+        4d:6c:86:8f:37:90:6d:1d:9c:0c:c7:6a:67:3f:3c:47:68:f4:
+        4e:22:78:80:11:7e:0a:08:8c:fe:df:32:db:a7:d3:6f:35:cb:
+        5a:ba:00:0f:a3:6b:1b:4f:05:1e:97:e2:c8:e0:7f:3f:7f:51:
+        c7:66
 -----BEGIN CERTIFICATE-----
 MIICrTCCAhagAwIBAgIJAIpqzVG+lKAWMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjMwMDhaFw0xMTAyMDgx
-NjMwMDhaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2NDJaFw0zNjA4MTgy
+MTQ2NDJaMHsxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEzARBgNVBAMTCkVub2NoIFJv
 b3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5jb20wXDANBgkqhkiG9w0B
 AQEFAANLADBIAkEAsne5vAl9FI5rb34zqZUhXfM8kWHxvFwdfudUJejLX7cYDiMm
 AEIJvYnaXAbLUghD9k7+3fgKipU1j0olFtrmvwIDAQABo3sweTAJBgNVHRMEAjAA
 MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
 BgNVHQ4EFgQUl9eAUsq74QJgk1NCohQS6O0fwHowHwYDVR0jBBgwFoAUjRstvb0k
-6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlV0hT8xiREmt93917rDo
-7AwlOXJNnZiGmYGBAqDRKz4rXAEUd4Gqvqf/mtu0tpyyLtfrTjK4ad16Pzw4UCJG
-5SEc/NC/BHlaW6xTdzO+J2Nu10fnL3UVhNuaCMAKtQB3Uf5k35eV7n8q+INyZ0rJ
-dX6m3eXWg8WmuQ0OJDnKBtc=
+6BlirkzJKliQCBzRBSswDQYJKoZIhvcNAQEFBQADgYEAlVjcHivCkhivzqUkGV4E
+yabKASbQZWqJePqh45T887kyINydkaqfRIvvhlyC3JnvSsk0b/Aud1Wk7R+1Br7i
+fhwidgjLaODgTWyGjzeQbR2cDMdqZz88R2j0TiJ4gBF+CgiM/t8y26fTbzXLWroA
+D6NrG08FHpfiyOB/P39Rx2Y=
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
diff --git a/t/data/smime/keys/sender at example.com.crt b/t/data/smime/keys/sender at example.com.crt
index 657491f..e3a9165 100644
--- a/t/data/smime/keys/sender at example.com.crt
+++ b/t/data/smime/keys/sender at example.com.crt
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:25:42 2010 GMT
-            Not After : Feb  8 16:25:42 2011 GMT
+            Not Before: Dec 28 21:46:20 2011 GMT
+            Not After : Aug 18 21:46:20 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=sender/emailAddress=sender at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:a8:38:41:90:1d:e7:cd:2b:cb:62:cf:ad:ff:70:
                     f6:44:5d:f3:4b:7e:21:75:b6:5c:e1:7e:c2:27:3b:
                     85:eb:72:9b:5a:94:0a:69:1d:83:ca:c5:91:b2:3f:
@@ -30,28 +30,28 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        53:90:db:6d:d0:aa:0f:cb:32:94:2e:a5:bc:d1:0d:27:7c:85:
-        d8:08:6c:52:fe:b1:4d:18:94:c2:10:ff:4f:8f:71:2b:81:bf:
-        a3:aa:11:3e:6e:72:5f:4a:1a:38:a0:3f:5f:2c:89:d6:af:c5:
-        6c:ff:59:63:13:2d:fb:5a:2f:58:b2:77:3e:52:83:07:01:c6:
-        4e:cf:19:9c:9a:f3:17:ac:63:c2:00:f3:18:b9:27:a6:d5:1a:
-        14:11:d6:f0:db:9b:de:e4:ad:cd:29:01:fd:38:c1:21:9c:fa:
-        a2:0b:5e:6d:5d:14:54:ce:0a:3c:f7:af:0f:e6:7f:c7:39:00:
-        b3:33
+        93:a7:14:3d:7f:47:6c:ec:71:34:29:19:e4:e0:0e:17:79:50:
+        df:58:31:d6:fb:b1:93:4a:a7:3f:95:44:62:fb:ea:eb:86:dc:
+        94:46:ff:2d:e5:73:37:e4:d3:d5:60:29:86:ea:75:1f:77:dc:
+        db:ed:f2:30:a7:b9:8d:ba:5f:06:55:6c:f9:95:c8:a1:32:ab:
+        33:0a:21:a2:70:86:9d:22:5b:99:53:3f:1b:3f:15:54:61:f9:
+        d3:3c:da:fa:c8:82:43:79:67:e2:a8:7e:78:1c:73:24:b4:a3:
+        76:e5:15:4e:4c:9f:32:f5:45:71:c5:46:79:28:7b:8e:fa:56:
+        0d:53
 -----BEGIN CERTIFICATE-----
 MIICqzCCAhSgAwIBAgIJAIpqzVG+lKAVMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjI1NDJaFw0xMTAyMDgx
-NjI1NDJaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2MjBaFw0zNjA4MTgy
+MTQ2MjBaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMTBnNlbmRlcjEh
 MB8GCSqGSIb3DQEJARYSc2VuZGVyQGV4YW1wbGUuY29tMFwwDQYJKoZIhvcNAQEB
 BQADSwAwSAJBAKg4QZAd580ry2LPrf9w9kRd80t+IXW2XOF+wic7hetym1qUCmkd
 g8rFkbI/BHJh5LjrW861EHfYp9+LyVoUFWECAwEAAaN7MHkwCQYDVR0TBAIwADAs
 BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
 VR0OBBYEFPM05sNReJKbk0mOTjC8GIgkaTQJMB8GA1UdIwQYMBaAFI0bLb29JOgZ
-Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAFOQ223Qqg/LMpQupbzRDSd8
-hdgIbFL+sU0YlMIQ/0+PcSuBv6OqET5ucl9KGjigP18sidavxWz/WWMTLftaL1iy
-dz5SgwcBxk7PGZya8xesY8IA8xi5J6bVGhQR1vDbm97krc0pAf04wSGc+qILXm1d
-FFTOCjz3rw/mf8c5ALMz
+Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAJOnFD1/R2zscTQpGeTgDhd5
+UN9YMdb7sZNKpz+VRGL76uuG3JRG/y3lczfk09VgKYbqdR933Nvt8jCnuY26XwZV
+bPmVyKEyqzMKIaJwhp0iW5lTPxs/FVRh+dM82vrIgkN5Z+KofngccyS0o3blFU5M
+nzL1RXHFRnkoe476Vg1T
 -----END CERTIFICATE-----
diff --git a/t/data/smime/keys/sender at example.com.pem b/t/data/smime/keys/sender at example.com.pem
index 1001c9c..3da7b8b 100644
--- a/t/data/smime/keys/sender at example.com.pem
+++ b/t/data/smime/keys/sender at example.com.pem
@@ -6,13 +6,13 @@ Certificate:
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=CA Owner/emailAddress=ca.owner at example.com
         Validity
-            Not Before: Feb  8 16:25:42 2010 GMT
-            Not After : Feb  8 16:25:42 2011 GMT
+            Not Before: Dec 28 21:46:20 2011 GMT
+            Not After : Aug 18 21:46:20 2036 GMT
         Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=sender/emailAddress=sender at example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
+                Public-Key: (512 bit)
+                Modulus:
                     00:a8:38:41:90:1d:e7:cd:2b:cb:62:cf:ad:ff:70:
                     f6:44:5d:f3:4b:7e:21:75:b6:5c:e1:7e:c2:27:3b:
                     85:eb:72:9b:5a:94:0a:69:1d:83:ca:c5:91:b2:3f:
@@ -30,30 +30,30 @@ Certificate:
                 keyid:8D:1B:2D:BD:BD:24:E8:19:62:AE:4C:C9:2A:58:90:08:1C:D1:05:2B
 
     Signature Algorithm: sha1WithRSAEncryption
-        53:90:db:6d:d0:aa:0f:cb:32:94:2e:a5:bc:d1:0d:27:7c:85:
-        d8:08:6c:52:fe:b1:4d:18:94:c2:10:ff:4f:8f:71:2b:81:bf:
-        a3:aa:11:3e:6e:72:5f:4a:1a:38:a0:3f:5f:2c:89:d6:af:c5:
-        6c:ff:59:63:13:2d:fb:5a:2f:58:b2:77:3e:52:83:07:01:c6:
-        4e:cf:19:9c:9a:f3:17:ac:63:c2:00:f3:18:b9:27:a6:d5:1a:
-        14:11:d6:f0:db:9b:de:e4:ad:cd:29:01:fd:38:c1:21:9c:fa:
-        a2:0b:5e:6d:5d:14:54:ce:0a:3c:f7:af:0f:e6:7f:c7:39:00:
-        b3:33
+        93:a7:14:3d:7f:47:6c:ec:71:34:29:19:e4:e0:0e:17:79:50:
+        df:58:31:d6:fb:b1:93:4a:a7:3f:95:44:62:fb:ea:eb:86:dc:
+        94:46:ff:2d:e5:73:37:e4:d3:d5:60:29:86:ea:75:1f:77:dc:
+        db:ed:f2:30:a7:b9:8d:ba:5f:06:55:6c:f9:95:c8:a1:32:ab:
+        33:0a:21:a2:70:86:9d:22:5b:99:53:3f:1b:3f:15:54:61:f9:
+        d3:3c:da:fa:c8:82:43:79:67:e2:a8:7e:78:1c:73:24:b4:a3:
+        76:e5:15:4e:4c:9f:32:f5:45:71:c5:46:79:28:7b:8e:fa:56:
+        0d:53
 -----BEGIN CERTIFICATE-----
 MIICqzCCAhSgAwIBAgIJAIpqzVG+lKAVMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCENBIE93bmVyMSMwIQYJKoZIhvcNAQkB
-FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMDAyMDgxNjI1NDJaFw0xMTAyMDgx
-NjI1NDJaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
+FhRjYS5vd25lckBleGFtcGxlLmNvbTAeFw0xMTEyMjgyMTQ2MjBaFw0zNjA4MTgy
+MTQ2MjBaMHkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYD
 VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMTBnNlbmRlcjEh
 MB8GCSqGSIb3DQEJARYSc2VuZGVyQGV4YW1wbGUuY29tMFwwDQYJKoZIhvcNAQEB
 BQADSwAwSAJBAKg4QZAd580ry2LPrf9w9kRd80t+IXW2XOF+wic7hetym1qUCmkd
 g8rFkbI/BHJh5LjrW861EHfYp9+LyVoUFWECAwEAAaN7MHkwCQYDVR0TBAIwADAs
 BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
 VR0OBBYEFPM05sNReJKbk0mOTjC8GIgkaTQJMB8GA1UdIwQYMBaAFI0bLb29JOgZ
-Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAFOQ223Qqg/LMpQupbzRDSd8
-hdgIbFL+sU0YlMIQ/0+PcSuBv6OqET5ucl9KGjigP18sidavxWz/WWMTLftaL1iy
-dz5SgwcBxk7PGZya8xesY8IA8xi5J6bVGhQR1vDbm97krc0pAf04wSGc+qILXm1d
-FFTOCjz3rw/mf8c5ALMz
+Yq5MySpYkAgc0QUrMA0GCSqGSIb3DQEBBQUAA4GBAJOnFD1/R2zscTQpGeTgDhd5
+UN9YMdb7sZNKpz+VRGL76uuG3JRG/y3lczfk09VgKYbqdR933Nvt8jCnuY26XwZV
+bPmVyKEyqzMKIaJwhp0iW5lTPxs/FVRh+dM82vrIgkN5Z+KofngccyS0o3blFU5M
+nzL1RXHFRnkoe476Vg1T
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED

commit f0b954ff7250ca211591e9e0f1797c90d068c402
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:01:52 2011 +0400

    ignore a few smime files CA operations create

diff --git a/.gitignore b/.gitignore
index 4fbbaa6..63973ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 /lib/RT/Generated.pm
 /Makefile
 /t/data/gnupg/keyrings/random_seed
+/t/data/smime/keys/demoCA/*.old
 /t/data/configs/apache2.2+fastcgi.conf
 /t/data/configs/apache2.2+mod_perl.conf
 /t/tmp/

commit d2d88a9cab7de7152bd2636d520587400158b58a
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:02:55 2011 +0400

    accept user in RT::Test->import_smime_key
    
    imports key into user's CF, instead of "keyring"

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 2958221..dda83ea 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1319,22 +1319,32 @@ sub trust_gnupg_key {
 sub import_smime_key {
     my $self = shift;
     my $key  = shift;
+    my $user = shift;
 
     my $path = find_relocatable_path( 'data', 'smime', 'keys' );
     die "can't find the dir where smime keys are stored"
         unless $path;
 
-    my $keyring = RT->Config->Get('SMIME')->{'Keyring'};
-    die "SMIME keyring '$keyring' doesn't exist"
-        unless $keyring && -e $keyring;
-
-    $key .= ".pem";
+    $key .= ".pem" unless $key =~ /\.(pem|crt|key)$/;
 
     my $content = RT::Test->file_content( [ $path, $key ] );
-    open my $fh, '>:raw', File::Spec->catfile($keyring, $key)
-        or die "can't open file: $!";
-    print $fh $content;
-    close $fh;
+
+    if ( $user ) {
+        my ($status, $msg) = $user->AddCustomFieldValue(
+            Field => 'SMIME Key',
+            Value => $content,
+        );
+        die "Couldn't set CF: $msg" unless $status;
+    } else {
+        my $keyring = RT->Config->Get('SMIME')->{'Keyring'};
+        die "SMIME keyring '$keyring' doesn't exist"
+            unless $keyring && -e $keyring;
+
+        open my $fh, '>:raw', File::Spec->catfile($keyring, $key)
+            or die "can't open file: $!";
+        print $fh $content;
+        close $fh;
+    }
 
     return;
 }

commit 81d9a63cea8e1ea098c0571ef58720925b8ac633
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:04:54 2011 +0400

    add_mail_catcher was dropped, we always catch mail in tests

diff --git a/t/mail/smime/incoming.t b/t/mail/smime/incoming.t
index ecf449b..b2ea3f6 100644
--- a/t/mail/smime/incoming.t
+++ b/t/mail/smime/incoming.t
@@ -12,9 +12,6 @@ use IPC::Run3 'run3';
 use String::ShellQuote 'shell_quote';
 use RT::Tickets;
 
-# catch any outgoing emails
-RT::Test->set_mail_catcher;
-
 my $keys = RT::Test::get_abs_relocatable_dir(
     (File::Spec->updir()) x 2,
     qw(data smime keys),
diff --git a/t/mail/smime/outgoing.t b/t/mail/smime/outgoing.t
index 1d3ac23..bf9ea6d 100644
--- a/t/mail/smime/outgoing.t
+++ b/t/mail/smime/outgoing.t
@@ -12,9 +12,6 @@ plan skip_all => 'openssl executable is required.'
 use IPC::Run3 'run3';
 use RT::Interface::Email;
 
-# catch any outgoing emails
-RT::Test->set_mail_catcher;
-
 my $keys = RT::Test::get_abs_relocatable_dir(
     (File::Spec->updir()) x 2,
     qw(data smime keys),

commit 773d6f1b3d909b6e948aff79c7df184e38cbf7cf
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:06:06 2011 +0400

    use root at example.com for testing as he has a key

diff --git a/t/mail/smime/incoming.t b/t/mail/smime/incoming.t
index b2ea3f6..c4c5f3e 100644
--- a/t/mail/smime/incoming.t
+++ b/t/mail/smime/incoming.t
@@ -67,6 +67,13 @@ my $queue = RT::Test->load_or_create_queue(
 );
 ok $queue && $queue->id, 'loaded or created queue';
 
+my $user = RT::Test->load_or_create_user(
+    Name => 'root at example.com',
+    EmailAddress => 'root at example.com',
+);
+RT::Test->import_smime_key('root at example.com.crt', $user);
+RT::Test->add_rights( Principal => $user, Right => 'SuperUser', Object => RT->System );
+
 my $mail = RT::Test->open_mailgate_ok($url);
 print $mail <<EOF;
 From: root\@localhost
@@ -99,7 +106,7 @@ RT::Test->close_mailgate_ok($mail);
     run3(
         shell_quote(
             qw(openssl smime -encrypt  -des3),
-            -from    => 'root at localhost',
+            -from    => 'root at example.com',
             -to      => 'rt@' . $RT::rtname,
             -subject => "Encrypted message for queue",
             File::Spec->catfile( $keys, 'sender at example.com.crt' ),
@@ -110,7 +117,7 @@ RT::Test->close_mailgate_ok($mail);
     );
 
     my ($status, $tid) = RT::Test->send_via_mailgate( $buf );
-    ok !$status, "executed gate";
+    is ($status >> 8, 0, "The mail gateway exited normally");
 
     my $tick = RT::Ticket->new( $RT::SystemUser );
     $tick->Load( $tid );
@@ -148,7 +155,7 @@ RT::Test->close_mailgate_ok($mail);
             '|',
             shell_quote(
                 qw(openssl smime -encrypt -des3),
-                -from    => 'root at localhost',
+                -from    => 'root at example.com',
                 -to      => 'rt@' . RT->Config->Get('rtname'),
                 -subject => "Encrypted and signed message for queue",
                 File::Spec->catfile( $keys, 'sender at example.com.crt' ),

commit 24e173d1a2424ab116a3ed01fbfae999bf0c2cf4
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:07:07 2011 +0400

    use new feature in ->import_smime_key

diff --git a/t/mail/smime/outgoing.t b/t/mail/smime/outgoing.t
index bf9ea6d..6c76491 100644
--- a/t/mail/smime/outgoing.t
+++ b/t/mail/smime/outgoing.t
@@ -78,13 +78,7 @@ my $user;
     ok($user->Load('root'), "Loaded user 'root'");
     is($user->EmailAddress, 'root at localhost');
 
-    open my $fh, '<:raw', File::Spec->catfile($keys, 'root at example.com.crt')
-        or die $!;
-    my ($status, $msg) = $user->AddCustomFieldValue(
-        Field => 'SMIME Key',
-        Value => do { local $/; <$fh> },
-    );
-    ok $status, "added user's key" or diag "error: $msg";
+    RT::Test->import_smime_key( 'root at example.com.crt' => $user );
 }
 
 RT::Test->clean_caught_mails;

commit be31ec9a0aabf815b2041b9f33ea645b6b65458c
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Dec 29 04:07:51 2011 +0400

    follow pattern in testing result of send_via_mailgate
    
    it's not correct test, but it should be fixed in a
    different branch. Bug reported.

diff --git a/t/mail/smime/outgoing.t b/t/mail/smime/outgoing.t
index 6c76491..b108456 100644
--- a/t/mail/smime/outgoing.t
+++ b/t/mail/smime/outgoing.t
@@ -97,7 +97,7 @@ END
     my ($status, $id) = RT::Test->send_via_mailgate(
         $mail, queue => $queue->Name,
     );
-    is $status, 0, "successfuly executed mailgate";
+    is $status >> 8, 0, "successfuly executed mailgate";
 
     my $ticket = RT::Ticket->new($RT::SystemUser);
     $ticket->Load( $id );

-----------------------------------------------------------------------


More information about the Rt-commit mailing list