Merge pull request #386 from patriot1burke/master

fixes

jaxrs/security/resteasy-crypto/python_encrypted_signed.txt

@@ -1,29 +1,29 @@
 Content-Type: application/pkcs7-mime;name=smime.p7m;smime-type=enveloped-data
 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
-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
+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

jaxrs/security/resteasy-crypto/smime_signed.txt

@@ -1,10 +1,10 @@
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1;  boundary="----=_Part_19_999316942.1378324820312"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1;  boundary="----=_Part_15_1234147830.1378328351856"
 
-------=_Part_19_999316942.1378324820312
+------=_Part_15_1234147830.1378328351856
 Content-Type: application/xml
 
 <customer name="bill"/>
-------=_Part_19_999316942.1378324820312
+------=_Part_15_1234147830.1378328351856
 Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -13,9 +13,9 @@ Content-Description: S/MIME Cryptographic Signature
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAMYIBVzCCAVMC
 AQEwUjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
 ZXQgV2lkZ2l0cyBQdHkgTHRkAgkA7oW81OriflAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzEL
-BgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMDkwNDIwMDAyMFowIwYJKoZIhvcNAQkEMRYE
-FAJWFGwqddBF/ZGoA7RLuS8va26TMA0GCSqGSIb3DQEBAQUABIGAe0VE6bmT55upNXWcLl1uL/P1
-5kUe0o6wVvg/VgMhWYBmtmeaYT48ZMOvrrICUxLQT1kceSaB8lntuW5Lqisrp5n114ZKqilM6ZLU
-WAORc0B9+5ossbcX6F8skVC6pAcL6m7AC3alP79pTcJx1oEgUx2qayF2xsV00YuXddzRVfgAAAAA
+BgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMDkwNDIwNTkxMVowIwYJKoZIhvcNAQkEMRYE
+FAJWFGwqddBF/ZGoA7RLuS8va26TMA0GCSqGSIb3DQEBAQUABIGANvOnbsHrOPCrDdwrPwdDgMBB
+Ln5RchTGDvT9BPRZeOmUhBrGWLTNUSHBf4nBLWRFUfXcVgzGFFg2Z1yabVyYDCDKxM6yYrjTNNIm
+TDhyTOIJ8lw1B0bgfK/x6d4ksn2p+zcO382xbEB0XSSo+rjTldANywlfrklq8Tcj0H48QmgAAAAA
 AAA=
-------=_Part_19_999316942.1378324820312--
+------=_Part_15_1234147830.1378328351856--

jaxrs/security/resteasy-crypto/smime_signed_bad.txt

@@ -1,10 +1,10 @@
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1;  boundary="----=_Part_21_14606592.1378324820319"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1;  boundary="----=_Part_17_1717747145.1378328351867"
 
-------=_Part_21_14606592.1378324820319
+------=_Part_17_1717747145.1378328351867
 Content-Type: application/xml
 
 <customer name="bill"/>
-------=_Part_21_14606592.1378324820319
+------=_Part_17_1717747145.1378328351867
 Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -13,9 +13,9 @@ Content-Description: S/MIME Cryptographic Signature
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAMYIBVzCCAVMC
 AQEwUjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
 ZXQgV2lkZ2l0cyBQdHkgTHRkAgkA7oW81OriflAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzEL
-BgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMDkwNDIwMDAyMFowIwYJKoZIhvcNAQkEMRYE
-FAJWFGwqddBF/ZGoA7RLuS8va26TMA0GCSqGSIb3DQEBAQUABIGAWZWzHppiUCTFDmVjPZTWTI3f
-+DQ6Nvy3qb4Fz4P2zv5pjWnaT026TSgwX4Ugcu0NEKehzenUYqaQGyqBW9gdkv2bqOX7eqCL5PG1
-o6sqCJPXQv0A2o0pKbtAjwwpK6KZKWe6Gj4+3j41UE4dQPaQZKLGmW4zDDdIcYNw10ReresAAAAA
+BgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMDkwNDIwNTkxMVowIwYJKoZIhvcNAQkEMRYE
+FAJWFGwqddBF/ZGoA7RLuS8va26TMA0GCSqGSIb3DQEBAQUABIGAEpGG1jrLlVR8RZT777IC/Xei
+65pxv0/RKM5WRIg3cnlJDRkhmb0hGEFM+7UCC9rEx7VCYmV53WavOz5UF2hL/US5fGDcBWVNICkU
+ZZURXLmqrXkT5bEqYGnwnU3hV5A057XA4hfeiWL6Lxvxd6gvUwbhEGAaiRqhOS5EmtuYWawAAAAA
 AAA=
-------=_Part_21_14606592.1378324820319--
+------=_Part_17_1717747145.1378328351867--