Raise key length defaults

Extend RSA keylength to 2048 bits by default,
as the previous default of 1024 bit is considered
weak since 12/31/2010.

Also unify the message_md to the openssl builtin
default.

Fixes bug 1103002

Change-Id: I619fc32b62beab4458ee6f21bf8dc7499fe400d7

examples/pki/certs/cacert.pem

@@ -1,18 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAjqgAwIBAgIJAJ+8kJVQMu5VMA0GCSqGSIb3DQEBBQUAMIGeMQowCAYD
+MIID1jCCAr6gAwIBAgIJAIIMP4MORlofMA0GCSqGSIb3DQEBBQUAMIGeMQowCAYD
 VQQFEwE1MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVN1bm55
 dmFsZTESMBAGA1UEChMJT3BlblN0YWNrMREwDwYDVQQLEwhLZXlzdG9uZTElMCMG
 CSqGSIb3DQEJARYWa2V5c3RvbmVAb3BlbnN0YWNrLm9yZzEUMBIGA1UEAxMLU2Vs
-ZiBTaWduZWQwIBcNMTMwNTI4MTM0OTMxWhgPMjA3MTExMjAxMzQ5MzFaMIGeMQow
+ZiBTaWduZWQwIBcNMTMwNzA5MTUyMDE3WhgPMjA3MjAxMDExNTIwMTdaMIGeMQow
 CAYDVQQFEwE1MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVN1
 bm55dmFsZTESMBAGA1UEChMJT3BlblN0YWNrMREwDwYDVQQLEwhLZXlzdG9uZTEl
 MCMGCSqGSIb3DQEJARYWa2V5c3RvbmVAb3BlbnN0YWNrLm9yZzEUMBIGA1UEAxML
-U2VsZiBTaWduZWQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANP4aC8OC1gE
-7zIoMIndBoR+SFmiC+FQ7JTQBa4rLhT63Zkw8Mb9W+x51mnphsX9QjXT/Fh4e617
-UQDto2bF3FgVfxj8teMHA4UBLDjlJIJWak+ZAROYwL8cZHOtFcjv5BxR6PXhSywu
-fHZKNvqIv321L7TCuV6w05jrMegH7zQpAgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB
-Af8wDQYJKoZIhvcNAQEFBQADgYEAhz2Q++D6bbLa/MamMK/k+MPiFEj46d/RsSDS
-4XIDK5xsn7sXO0UW830IwtyUIrMuFSGix5oKmPgyJGSVZHjLsVT+4bh8puMvE4ic
-QuWhLJmwDaTv11Q9FYIB3jEbvprx+PvqAydkHBdw8zCDwXmpo/Arc1Br7gKuR5WS
-gkRQZIw=
+U2VsZiBTaWduZWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoI/uS
+HGedJfi0fOQUnC63ZcU+OelDQ2LTBBQifIb9OjTS/56xC95p9qB0BK6ZupqV11Y7
+3qLvOG6BkU9z1gSWl7ibXJhDSPeSTDyD9pxqkkNsVLBXxlMOMhAzro4XcpwoFRWA
+/YQ8QuSum898PdkjnRSc/la7Obr795K19XRrUmDB6gNxADfPOj98eSc23ROcGHRv
+mU4FXG8QGo7FAGUrsrg7mC58R7sI4IQCjiSQVuiDalSue70GsulI870WOxNI+ohw
+QnoFHXeVE0M7i0OzKCjUfePt/94xTyMwdHv13J3GsG5jAT6iJ1nFYxsBnnvhxlr3
+N3GEj/HFMOYYvDp9AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBANUCtD0z9FVW1Mv6AdV/gsA36Ro6x3YwnzcNE/XXsHHtf7+emkdI
+P7hiYoI88LvHaiONJqumpIb6yot8BuMGmsQJNn3QVBXCIffbKiyk58HCjhceIEJP
+Z/y2dSSzDj3ooWsYQCYT8TRaBZayzwfBy8MsksIcRqFHkgXBXmIoU7OwfY6D0Wj/
+pc1kpU0FRptmncRIzXQtrFW78UmbBIqc81ixoKBiBlP7Vhta6VL6dsAuPuzMBwsz
+iXuDfzbbwvtXGn6GbFTHWHMZ2SxORDX/KGSKSvdYOnqmGMf2HCgEKQ3/6tKJ4m8d
+a6hC72VfAzN8yRYacV//HPkfCF9R2hew/xQ=
 -----END CERTIFICATE-----

examples/pki/certs/middleware.pem

@@ -1,33 +1,50 @@
 -----BEGIN CERTIFICATE-----
-MIICoTCCAgoCARAwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
+MIIDpjCCAo4CARAwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQK
 EwlPcGVuU3RhY2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZr
 ZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQwEgYDVQQDEwtTZWxmIFNpZ25lZDAgFw0x
-MzA1MjgxMzQ5MzFaGA8yMDcxMTEyMDEzNDkzMVowgZAxCzAJBgNVBAYTAlVTMQsw
+MzA3MDkxNTIwMTdaGA8yMDcyMDEwMTE1MjAxN1owgZAxCzAJBgNVBAYTAlVTMQsw
 CQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3Rh
 Y2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBv
-cGVuc3RhY2sub3JnMRIwEAYDVQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAKu9aaVODW0VF29oQXs/mN/PO9cXS4YtmwhIgV6TrvRTsSjm
-jAHf8hy4C0bCGNQfIWkyICp2JYNnhBkE52VYPMwY1sOyNebN4jV9WcPGoMlobxy2
-VBTAroom975qRG5HhEbGD27NLqXbJmM6b4+0JdlJn5iWT/7HtbSUnz1p2oVRAgMB
-AAEwDQYJKoZIhvcNAQEFBQADgYEAV3fx8dy+iHQWmho5cN9nO+XZOYFCehfSf8JO
-pAAStYx9lt4IolZ68OOP0hVJZAj5mf1gU9wiMaoFVOSVyqOg4Ss0LLkyojaVO5Q2
-QQHQbWqUU5OY5IcKN2yArFSHDqyVjmNQjnyfiViomeSNkreIQnP61l6JGNMJEim5
-DYYH/rw=
+cGVuc3RhY2sub3JnMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDBggS/MFecY0PwcPirGzwcLV1IirPOkmzz27kp9Gnn
+ITfDDKTgG7OF+qnMj8dDk1T2PI1vd6CdrG52XKMQoNSuuOB6HDN9a+59Ic58zSI5
+1LXLWK1pqrApvPoFOkzPU15c01OLXGtUWQwWi6Gl/+CDPBG13xJ6clCFMF4XhHcK
+mTgHnr3tWd2dn+6nlTHjmfWJNUtl/o/sB2oHhXA2rnqPEXBLOZEkc4UFrzvs8hb1
+pzIoVbfsCWdT+airiWv1DWCR/OLa7lFIsD3eWR+SWb63/lAm7YwonaK1yXvO+5cH
+/VYhCQXKaCEs59G8Ak1+9vW4L33z425KmNjfy35qR9IHAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGu0Wx43oviFUcLop0fPc0bVtL/016AOPhz5DC+rvqz0xO/pNmQy
+yX+s+/afS7Bf8o990QGBViOVjZ2HHXWF2wgc+EEYSAJoBNO5CoRNqAqH56th78hy
+L0cScRWLPVxzJmYYHqhSULbeuOwD89gIG4MJAxq73M/7bNjDWzDKh0WTaXwSYZio
++L1aYmaxNXhz0SDNPoCQlUEJ3piEQUMTuMcfsAUcVDsNqVVCKvb1wo3fLTmzEY/m
+sRyLVemwlLSSOMiyjCUsUNmbNn3v2eNQW+52e6RPGQhlGoKM50Ny39oqpX9Kphmb
++Oyx4T1ktcvzmdDw8JZt/Q173AWblY7v+VU=
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKu9aaVODW0VF29o
-QXs/mN/PO9cXS4YtmwhIgV6TrvRTsSjmjAHf8hy4C0bCGNQfIWkyICp2JYNnhBkE
-52VYPMwY1sOyNebN4jV9WcPGoMlobxy2VBTAroom975qRG5HhEbGD27NLqXbJmM6
-b4+0JdlJn5iWT/7HtbSUnz1p2oVRAgMBAAECgYEAmehJgScNyTAZrHGWHUnFSu2B
-ByWNPVYplabEqWlYZQWLwse5uQRlCW+2S1cuwQqU+p09TlBLFhPywiku5hfJgvZx
-EzjAJHYFdrGreD5y9NKapuWfaSM/JZ2+3u1Cy+d/0MoLbAd6Bmc8YU2NH1VPCPGQ
-q2fKCweMrYaymmcD7wECQQDdUnFycODvaXWlYAaCVvOWllejNhA+uA1ljmhEAoEh
-ES12LdM7cDK9szq55WZ2UPNS/8huCMfPDtBRHy+twsSZAkEAxqYn1sK3WWX8bzu5
-Eu7cpcFvYTvoJYVChK7LjplpKACnRzcQztPi/aLS0UVtjyf7+zhZTNDexwhm0hWJ
-o58BeQJAXxMAaxH0fsRF5pHWmf0yTNkuso0R829rSdogDj8pK4ROjDrpR9pN4dHx
-g1P5bRAfRuNcPXCGLPuHH6IPAEzv2QJAe2PR8zBXuwwCVQV/3CbKn5sbmAYiGMxB
-mTEJ97WK//IH9dBafF5Y7LsqwBqkBvwLJOzHa1OCTZcGZxBBwoSN4QJAUy4DMkdb
-ENukagZ6ddkoQbJ7vDMuZfjl+R8B0YL10rLShhbcy4iLzs8ujqt4z1VznaAZBXaQ
-ctiy9/gBMhudwA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBggS/MFecY0Pw
+cPirGzwcLV1IirPOkmzz27kp9GnnITfDDKTgG7OF+qnMj8dDk1T2PI1vd6CdrG52
+XKMQoNSuuOB6HDN9a+59Ic58zSI51LXLWK1pqrApvPoFOkzPU15c01OLXGtUWQwW
+i6Gl/+CDPBG13xJ6clCFMF4XhHcKmTgHnr3tWd2dn+6nlTHjmfWJNUtl/o/sB2oH
+hXA2rnqPEXBLOZEkc4UFrzvs8hb1pzIoVbfsCWdT+airiWv1DWCR/OLa7lFIsD3e
+WR+SWb63/lAm7YwonaK1yXvO+5cH/VYhCQXKaCEs59G8Ak1+9vW4L33z425KmNjf
+y35qR9IHAgMBAAECggEBAJtMMWsO7QEBWWD6CVeo/9DNR3QUfMFoGjCLQks9cFCi
+BBJxb1C8apM33FXjfdPpxeHoLsoqg6iG3g/3wJZzvLyMevsE7v3VRQz/uKvIJZOr
+9ko/3MxUxBR7KVxQsZwiGDT/FKlffnOvE1h0r0J93Dz2VHBVmorSe3SooJrXIIJL
+l1tmDz/jww25zkmLsi7tTnc3s5DmiMSqJ+jQ7w7FNyy9p0IDdkWe4A2W0R+26ges
+gXlSa/0wGB3VTxg+0vJNyCE5kCoMqnYYCRKCC+CHxpayU4klKR9WfdklEDunwgl2
+j7xkek1QcB9lufdWPT34oxR0PzEiVJCDwyHLRUZb4EECgYEA6UE0878hckQ7rQHq
+l1deplUvi5LEYq4VmLbUKNPgr1wnXkmzo++g7OAcbWqh24eP+Von7z57/zDzgS4m
+6IiJnqFLOpO5bCSRi0/KvC5Difax8DNBYpKdFrwI+uJ7TnC+Q1rPxeQ1sOKEfjZM
+GrTK1QsWKfLO5W/5TCwUxPX1ztkCgYEA1GCaI2XyKQes5VPY7BJlahZrNYNkumqw
+odDBrCjmuWn9En6KdiWrh/I4JSJtd2Ho/xv/YevuYFb69HkXnpPvqc2kKI/1dkor
+gyMXObHoG33VT13flsQ+Rxhwz0OlJmCm5YN7eHfGKeQRjJTMn8Hyfmo0yAigeHxu
+CpAD3aO9298CgYEAzV2I5pZAN1/V/sPyLJ9TCTV1L/jfiVZmU1edQfkSGLMVQlG3
+pT2kvQmwXbGFokgfvdXf1Sd5erw5mGHvBcq5B/5QwtkvZwRnVHXDNJ2y/zRBhA9M
+oSIextZ1PZbMI8rl6V16E2ySzRMSviDGLrlA4APr1rEd8in9H1CsVKGNczkCgYB4
+W6rfBsZ/VDc63BLibuaEgeIOOMGcGBy0B8/Kln9zcsqWcZpcrKqSZ8ZD3Uf2UUmv
+UhmgUAoPFRwx8nJdT2+SZtVym2s7t3sDXZ6q9tUYx25dBVFSazL0Lbi47ZgpsLrE
+9YfC1PY8BWGgry9sFokr9VqmRqVSwwnF+KoIMOTHNwKBgGlDKYKCWMxFh90oTfLi
+53jF+go4rS7flhO7XHOkRGjbTlEztSzvu2peaA8zRfyBlkxkKQjMi+988zr4/NrH
+64hJ6s05pfnE5ql2B7CV2WvHchhngh8wsHv4nJruGaTn6jWw7C9GliCVMF4XEbpK
+9CTObSYrUfv1HBbe/yOQoqz6
 -----END PRIVATE KEY-----

examples/pki/certs/signing_cert.pem

@@ -1,17 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICoDCCAgkCAREwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
+MIIDpTCCAo0CAREwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQK
 EwlPcGVuU3RhY2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZr
 ZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQwEgYDVQQDEwtTZWxmIFNpZ25lZDAgFw0x
-MzA1MjgxMzQ5MzFaGA8yMDcxMTEyMDEzNDkzMVowgY8xCzAJBgNVBAYTAlVTMQsw
+MzA3MDkxNTIwMTdaGA8yMDcyMDEwMTE1MjAxN1owgY8xCzAJBgNVBAYTAlVTMQsw
 CQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3Rh
 Y2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBv
-cGVuc3RhY2sub3JnMREwDwYDVQQDEwhLZXlzdG9uZTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAxokm1kFNm2ixp0ajnouA2TMAhWZ2p+WOaG90oWgorYhNM3kc
-l4HO1uCl5BQLCpxzgh3qC9y6KORDas91VcY2eArB9D2vibVKauYg6iOoILSZp27q
-Gz6b2LdS1Aob4NeBrql0z6J5FtSP+EtgMNxb5xa5QerPo8fjeVtM0XXzCj8CAwEA
-ATANBgkqhkiG9w0BAQUFAAOBgQC6JNiZe0Sm+GMbezlvmbiJ5SkxaDePbVEeb4dc
-8NuJNT9s3nwqA2em+1CVy/Hb4L5ML0vfiyWOcTaUr/yYgjO9gVTSmCvuIzjwYCBt
-hJoqCxz/2al1/LT1tlg7g90+wSbEXy6AI4RQmWVI9UI5+DGMYQ4RPM02oCHy/lKO
-9LQv3g==
+cGVuc3RhY2sub3JnMREwDwYDVQQDEwhLZXlzdG9uZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL8hXUtdVmiEV1HWWUpikLUwoiDbP2q3K5FZRXGzuHtI
+QUdX0v7NYB0k170auVWptLA6fWbu1l7XCJb1UA99JqvtSA6Xa/bRF48fTUaPxuPR
+si3W7DiK/AZc2+qpb9PekU7sHh/UxmThMFFTgnyLmtNS7yWsNFSHlpY/ssefpZcI
+1vjUnNH8clvMKRlhUMj3nPByG/3RTP1GxOgtg1z9BzVlFiYcvrJGnaWQF3+YvXE8
+xm6lda1dLz/Apqculznae3OKoNzmlhahgANqw4NPoSUiLEW2wwikFc7urfWSLvvS
+0iYcZDV7gbq7OKtHVN9TFj7GW1jRO8hfl0opB1yNwu8CAwEAATANBgkqhkiG9w0B
+AQUFAAOCAQEA0+uCgz9Mi8v0GvnxteniHdEadqjZwxDiheSDveTuei7bu46BU6js
+eWW8S23UsU24d9EhCLXKxjAxb5VM2NSfcEyJttQNQkEx9gTFvPwHn2yVL3hsrfTq
+f1C7X3vfG7WcZ1r/gEK7pvlijfnHrCr6kGDTLFeeFOnX9EnPHQZCt3b7rOsm8iev
+9IT2Ws/+yWDTo0nSMxXn3h1hxtcbC6xPFmsWb3dpVRm9kW0v7Fm9MU5gDb+zQoCZ
+BG6bnnDodXvnxzAYEqPIuCr3ks/YDqPwn+RrQ5zNxDPL5mS+wQ83PWLa/tAKaqmL
+n3vuDhYjfzS+pw8FnlzMnNO5dH9yNGjljg==
 -----END CERTIFICATE-----

examples/pki/certs/ssl_cert.pem

@@ -1,17 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICoTCCAgoCARAwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
+MIIDpjCCAo4CARAwDQYJKoZIhvcNAQEFBQAwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQK
 EwlPcGVuU3RhY2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZr
 ZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQwEgYDVQQDEwtTZWxmIFNpZ25lZDAgFw0x
-MzA1MjgxMzQ5MzFaGA8yMDcxMTEyMDEzNDkzMVowgZAxCzAJBgNVBAYTAlVTMQsw
+MzA3MDkxNTIwMTdaGA8yMDcyMDEwMTE1MjAxN1owgZAxCzAJBgNVBAYTAlVTMQsw
 CQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3Rh
 Y2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBv
-cGVuc3RhY2sub3JnMRIwEAYDVQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAKu9aaVODW0VF29oQXs/mN/PO9cXS4YtmwhIgV6TrvRTsSjm
-jAHf8hy4C0bCGNQfIWkyICp2JYNnhBkE52VYPMwY1sOyNebN4jV9WcPGoMlobxy2
-VBTAroom975qRG5HhEbGD27NLqXbJmM6b4+0JdlJn5iWT/7HtbSUnz1p2oVRAgMB
-AAEwDQYJKoZIhvcNAQEFBQADgYEAV3fx8dy+iHQWmho5cN9nO+XZOYFCehfSf8JO
-pAAStYx9lt4IolZ68OOP0hVJZAj5mf1gU9wiMaoFVOSVyqOg4Ss0LLkyojaVO5Q2
-QQHQbWqUU5OY5IcKN2yArFSHDqyVjmNQjnyfiViomeSNkreIQnP61l6JGNMJEim5
-DYYH/rw=
+cGVuc3RhY2sub3JnMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDBggS/MFecY0PwcPirGzwcLV1IirPOkmzz27kp9Gnn
+ITfDDKTgG7OF+qnMj8dDk1T2PI1vd6CdrG52XKMQoNSuuOB6HDN9a+59Ic58zSI5
+1LXLWK1pqrApvPoFOkzPU15c01OLXGtUWQwWi6Gl/+CDPBG13xJ6clCFMF4XhHcK
+mTgHnr3tWd2dn+6nlTHjmfWJNUtl/o/sB2oHhXA2rnqPEXBLOZEkc4UFrzvs8hb1
+pzIoVbfsCWdT+airiWv1DWCR/OLa7lFIsD3eWR+SWb63/lAm7YwonaK1yXvO+5cH
+/VYhCQXKaCEs59G8Ak1+9vW4L33z425KmNjfy35qR9IHAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGu0Wx43oviFUcLop0fPc0bVtL/016AOPhz5DC+rvqz0xO/pNmQy
+yX+s+/afS7Bf8o990QGBViOVjZ2HHXWF2wgc+EEYSAJoBNO5CoRNqAqH56th78hy
+L0cScRWLPVxzJmYYHqhSULbeuOwD89gIG4MJAxq73M/7bNjDWzDKh0WTaXwSYZio
++L1aYmaxNXhz0SDNPoCQlUEJ3piEQUMTuMcfsAUcVDsNqVVCKvb1wo3fLTmzEY/m
+sRyLVemwlLSSOMiyjCUsUNmbNn3v2eNQW+52e6RPGQhlGoKM50Ny39oqpX9Kphmb
++Oyx4T1ktcvzmdDw8JZt/Q173AWblY7v+VU=
 -----END CERTIFICATE-----

examples/pki/cms/auth_token_revoked.pem

@@ -1,5 +1,5 @@
 -----BEGIN CMS-----
-MIIHVgYJKoZIhvcNAQcCoIIHRzCCB0MCAQExCTAHBgUrDgMCGjCCBeQGCSqGSIb3
+MIIH1wYJKoZIhvcNAQcCoIIHyDCCB8QCAQExCTAHBgUrDgMCGjCCBeQGCSqGSIb3
 DQEHAaCCBdUEggXReyJhY2Nlc3MiOiB7InNlcnZpY2VDYXRhbG9nIjogW3siZW5k
 cG9pbnRzIjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3Yx
 LzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJy
@@ -31,12 +31,14 @@ ImlkIjogInRlbmFudF9pZDEifX0sICJ1c2VyIjogeyJ1c2VybmFtZSI6ICJyZXZv
 a2VkX3VzZXJuYW1lMSIsICJyb2xlc19saW5rcyI6IFsicm9sZTEiLCJyb2xlMiJd
 LCAiaWQiOiAicmV2b2tlZF91c2VyX2lkMSIsICJyb2xlcyI6IFt7Im5hbWUiOiAi
 cm9sZTEifSwgeyJuYW1lIjogInJvbGUyIn1dLCAibmFtZSI6ICJyZXZva2VkX3Vz
-ZXJuYW1lMSJ9fX0NCjGCAUkwggFFAgEBMIGkMIGeMQowCAYDVQQFEwE1MQswCQYD
+ZXJuYW1lMSJ9fX0NCjGCAcowggHGAgEBMIGkMIGeMQowCAYDVQQFEwE1MQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVN1bm55dmFsZTESMBAGA1UE
 ChMJT3BlblN0YWNrMREwDwYDVQQLEwhLZXlzdG9uZTElMCMGCSqGSIb3DQEJARYW
 a2V5c3RvbmVAb3BlbnN0YWNrLm9yZzEUMBIGA1UEAxMLU2VsZiBTaWduZWQCAREw
-BwYFKw4DAhowDQYJKoZIhvcNAQEBBQAEgYCwTWpPlI+O6Ur8ied6usi2LZKTw1zu
-SVEgnJHJeyTVBhakJrxf6LEaU6A2rUh49XZIX9C/RqkK+Nkjspubt9uyTn2a1dVe
-LYFd5EenjYP0p4avboi/dxJvzMVdKwsTxCRygHCsTWcXtrGpM5QZzzxnQCvuFO7x
-jdEfyBrYYveRew==
+BwYFKw4DAhowDQYJKoZIhvcNAQEBBQAEggEAVTEPjCScb/oiC+RcYhEomhli9tK8
+VdW1mH0yuX5SiKPOmasQYn74GeCSrsqJO03RhJlWp7i2Jt95XWFogQFGDUL5CfSS
+bbSKKqoXj0i7TVa/Tt0QtX/MtbLdZjLLoBkiDYOK0aADKM7+Ix6qQlxLo2Iv9Ge7
+xXG1GMQA6a1RloHyQP1b2flT/sjUOrT0Wml6KrDwgfnDu2+sZs5q94MSD/DKdkEh
+7P2bSya5s0YfSaJjxMOC71Dq35gz8aP/OsOwdNjKaAyHBCdP5T6XquRar7OMQVzP
+gf7hogW8cnjsvge1ZFmUqWOUD1l2duqgXIy12rpC6SY2Fgd/Dt4lTOtZhQ==
 -----END CMS-----

examples/pki/cms/auth_token_scoped.pem

@@ -1,5 +1,5 @@
 -----BEGIN CMS-----
-MIIHQAYJKoZIhvcNAQcCoIIHMTCCBy0CAQExCTAHBgUrDgMCGjCCBc4GCSqGSIb3
+MIIHwQYJKoZIhvcNAQcCoIIHsjCCB64CAQExCTAHBgUrDgMCGjCCBc4GCSqGSIb3
 DQEHAaCCBb8EggW7eyJhY2Nlc3MiOiB7InNlcnZpY2VDYXRhbG9nIjogW3siZW5k
 cG9pbnRzIjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3Yx
 LzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJy
@@ -30,12 +30,15 @@ ZSwgImRlc2NyaXB0aW9uIjogbnVsbCwgIm5hbWUiOiAidGVuYW50X25hbWUxIiwg
 ImlkIjogInRlbmFudF9pZDEifX0sICJ1c2VyIjogeyJ1c2VybmFtZSI6ICJ1c2Vy
 X25hbWUxIiwgInJvbGVzX2xpbmtzIjogWyJyb2xlMSIsInJvbGUyIl0sICJpZCI6
 ICJ1c2VyX2lkMSIsICJyb2xlcyI6IFt7Im5hbWUiOiAicm9sZTEifSwgeyJuYW1l
-IjogInJvbGUyIn1dLCAibmFtZSI6ICJ1c2VyX25hbWUxIn19fQ0KMYIBSTCCAUUC
+IjogInJvbGUyIn1dLCAibmFtZSI6ICJ1c2VyX25hbWUxIn19fQ0KMYIByjCCAcYC
 AQEwgaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTES
 MBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3RhY2sxETAPBgNVBAsT
 CEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBvcGVuc3RhY2sub3Jn
 MRQwEgYDVQQDEwtTZWxmIFNpZ25lZAIBETAHBgUrDgMCGjANBgkqhkiG9w0BAQEF
-AASBgEPfxsK7jCPYJWQIWb5FncQfd0wAw6tUjo6lisJ3HRDx+hbfzMcWcxpUEOcp
-dQ05cTXAftLhtxSw5IP2TQp68zs/Y9fhwMSn4yFla5bvaqxQIgsdzpX6O8BnKfkD
-DYt2iOzbgrZawe3q8mOqxa+Vv65eDwBbsbIasqieMSjdmBiV
+AASCAQCeZq2APTH1BIYpM6zY/ny9bKQPtgLFLJNkkyRWY86W1J/jhOlvqovi4rBN
+GrgEbisuwuHr5MGjiKMZXZG+qH4eeXDIHQRc41xfgMchTuRXSuYC57CspKxPqx/d
+CwZaLytxsIwlnUKLMYuMurXi2iVrOUvA8089hCnn7qzjlHQZZHVAhqF4k+6bYdSB
+/8nKJcKSFHZezbirFzsq0EWn73tWSka5vbj7BTpnbpDyLNyshhyF7tRMwAOSe/5p
+USnTVxapA1/Fsxta5LWrOS7ruHnxkAQ9hZ1CVwVCK62QrpfOhOg821SYqLOim0JU
+1I7zNxwIDdBwyhOLd9Ao961Hzp3x
 -----END CMS-----

examples/pki/cms/auth_token_scoped_expired.pem

@@ -1,5 +1,5 @@
 -----BEGIN CMS-----
-MIIHQAYJKoZIhvcNAQcCoIIHMTCCBy0CAQExCTAHBgUrDgMCGjCCBc4GCSqGSIb3
+MIIHwQYJKoZIhvcNAQcCoIIHsjCCB64CAQExCTAHBgUrDgMCGjCCBc4GCSqGSIb3
 DQEHAaCCBb8EggW7eyJhY2Nlc3MiOiB7InNlcnZpY2VDYXRhbG9nIjogW3siZW5k
 cG9pbnRzIjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3Yx
 LzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJy
@@ -30,12 +30,15 @@ ZSwgImRlc2NyaXB0aW9uIjogbnVsbCwgIm5hbWUiOiAidGVuYW50X25hbWUxIiwg
 ImlkIjogInRlbmFudF9pZDEifX0sICJ1c2VyIjogeyJ1c2VybmFtZSI6ICJ1c2Vy
 X25hbWUxIiwgInJvbGVzX2xpbmtzIjogWyJyb2xlMSIsInJvbGUyIl0sICJpZCI6
 ICJ1c2VyX2lkMSIsICJyb2xlcyI6IFt7Im5hbWUiOiAicm9sZTEifSwgeyJuYW1l
-IjogInJvbGUyIn1dLCAibmFtZSI6ICJ1c2VyX25hbWUxIn19fQ0KMYIBSTCCAUUC
+IjogInJvbGUyIn1dLCAibmFtZSI6ICJ1c2VyX25hbWUxIn19fQ0KMYIByjCCAcYC
 AQEwgaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTES
 MBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3RhY2sxETAPBgNVBAsT
 CEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBvcGVuc3RhY2sub3Jn
 MRQwEgYDVQQDEwtTZWxmIFNpZ25lZAIBETAHBgUrDgMCGjANBgkqhkiG9w0BAQEF
-AASBgAo6fTuvdeQcLH4s/44uS0dtleGqe8LbMmIlZM5OVBTlylIAfqS52+V8o4b0
-7AvkuNEJHcexm+Jwbf9PLnIAnv+Ug6Um9ORid2PtV8DDpljTxaPZoU9693Zd26UN
-kGJIRcISq3KuaDjKM1cwVJKpviXNvIIOBQK2qXOa+t5TWrvo
+AASCAQC0GgjW7R1NE3YklyvYz1boa92RRgKZFeybKS9OUwNbLn8yDrIg31kTadqQ
+4OZ1ZhgvvBp0LA0slWw+ILJh6G2HUbDBb7LA3QiuEj4e3nRwTZD2KnEt17CeTRkx
++723OcJRcmU46bPGYYMg5/5Ub7iVpBHLgAVHUhZv7QRZF9l4kDF+oD23iz/k7Bgo
+iL2SFtF2sIkJecLWhqOxqhpv5tkt8bbep5/wMNd4TEvI1XcbDPecgnSD7UYDXeQV
+x+ClwauIjKon+AYUfD7n2x0fMnwzFqg5BgZQ0phYMZ1WR9v+x5T63ApSOx+mZGyF
+Oar8cJ04RM+vX5ctn8Dtueg2uG68
 -----END CMS-----

examples/pki/cms/auth_token_unscoped.pem

@@ -1,17 +1,19 @@
 -----BEGIN CMS-----
-MIICpwYJKoZIhvcNAQcCoIICmDCCApQCAQExCTAHBgUrDgMCGjCCATUGCSqGSIb3
+MIIDKAYJKoZIhvcNAQcCoIIDGTCCAxUCAQExCTAHBgUrDgMCGjCCATUGCSqGSIb3
 DQEHAaCCASYEggEieyJhY2Nlc3MiOiB7InRva2VuIjogeyJleHBpcmVzIjogIjIx
 MTItMDgtMTdUMTU6MzU6MzRaIiwgImlkIjogIjAxZTAzMmM5OTZlZjQ0MDZiMTQ0
 MzM1OTE1YTQxZTc5In0sICJzZXJ2aWNlQ2F0YWxvZyI6IHt9LCAidXNlciI6IHsi
 dXNlcm5hbWUiOiAidXNlcl9uYW1lMSIsICJyb2xlc19saW5rcyI6IFtdLCAiaWQi
 OiAiYzljODllM2JlM2VlNDUzZmJmMDBjNzk2NmY2ZDNmYmQiLCAicm9sZXMiOiBb
 eyduYW1lJzogJ3JvbGUxJ30seyduYW1lJzogJ3JvbGUyJ30sXSwgIm5hbWUiOiAi
-dXNlcl9uYW1lMSJ9fX0xggFJMIIBRQIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkG
+dXNlcl9uYW1lMSJ9fX0xggHKMIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkG
 A1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNV
 BAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEW
 FmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgER
-MAcGBSsOAwIaMA0GCSqGSIb3DQEBAQUABIGAmkWkhTZKeMWedDlqHJ1CjJ10gk+8
-0f+M34c2elgKlmztTdvbAt/mnJlPuHYMXz10NK8sT4TJrOGEVXBp6Vx+FAiasu5S
-qunDGJtPEo42OW+C7H6KVx176mnb3bpBgyR0JHenTiRRn6qVkXp4R0tlHWdz/HV5
-HDyyxhNp785xygI=
+MAcGBSsOAwIaMA0GCSqGSIb3DQEBAQUABIIBAFSRTOffOREb8ZSu/z8Qvg0RHQRl
+sSIPYB7XsFyotbNqcZI1VTf82C3xAxtiudSY1BoqC6tWkgSNLxsTxgoXNgfGlgPv
+xkJs8hDPC5QCS2zEMglX5KScrC4LIlGF0b5fKy4pjg2xQEy7uS+Qwh6yWNncXqSO
+xcwQYeh6tRxRp0hqrxArg0FBs37wHhBjIutv2TsCDXGC2DgGk5KSk5BgKDgMaunU
+CeAmq8waLxCR96PSKpz3GFYdm38EZ93G61Bv1yClSzWjBKdWXLJw/d7MQ19y8qqg
+UZ2hvAtdVC/FWZXTcbL4y44NAw/vKW06juO58m+fQJXIg/hXHDTT0OwQGfU=
 -----END CMS-----

examples/pki/cms/auth_v3_token_revoked.pem

@@ -1,5 +1,5 @@
 -----BEGIN CMS-----
-MIIHtQYJKoZIhvcNAQcCoIIHpjCCB6ICAQExCTAHBgUrDgMCGjCCBkMGCSqGSIb3
+MIIINgYJKoZIhvcNAQcCoIIIJzCCCCMCAQExCTAHBgUrDgMCGjCCBkMGCSqGSIb3
 DQEHAaCCBjQEggYweyJ0b2tlbiI6DQogICAgeyJjYXRhbG9nIjogW3siZW5kcG9p
 bnRzIjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3YxLzY0
 YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJyZWdp
@@ -33,12 +33,14 @@ bl9uYW1lMSJ9fSwNCiAgICAgInVzZXIiOiB7Im5hbWUiOiAicmV2b2tlZF91c2Vy
 bmFtZTEiLCAiaWQiOiAicmV2b2tlZF91c2VyX2lkMSIsICJkb21haW4iOiB7Imlk
 IjogImRvbWFpbl9pZDEiLCAibmFtZSI6ICJkb21haW5fbmFtZTEifX0sDQogICAg
 ICJyb2xlcyI6IFt7Im5hbWUiOiAicm9sZTEifSwgeyJuYW1lIjogInJvbGUyIn1d
-DQogICAgfQ0KfQ0KMYIBSTCCAUUCAQEwgaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
+DQogICAgfQ0KfQ0KMYIByjCCAcYCAQEwgaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQK
 EwlPcGVuU3RhY2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZr
 ZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQwEgYDVQQDEwtTZWxmIFNpZ25lZAIBETAH
-BgUrDgMCGjANBgkqhkiG9w0BAQEFAASBgDcPIVP0gTYC5z+gnEqzof1QvciIUY4q
-lGNQ+G/7wdajcrCb5Cy3NWrAN/Cgnsz06ilhTIHs2LfbgROG8C4MMLHvIccQ81Uo
-kPnEFtSnBwNvhHhzMwCdA0crwpf+0KzpW/8LBtFrrka3fwUJYngq6tARWZVt5UGn
-PolkJuSwsztW
+BgUrDgMCGjANBgkqhkiG9w0BAQEFAASCAQAxURAlLIcOBe1c/R1O4QaaUpAkgh7B
+9zSXWqnuU7YaElrYWf0SwGKBMZUQErzOCHkn8Tb25zzGc3R05njJSygkLQtdk23r
+rqN3WK9XRJbYa0RqTIdP3emePESuiKWEHR63yfgK2neFeT2X8ja1VeCufLpiKH3U
+V/v9vPBKAiocavDGzcmsJGob2mNkkdm8cX1FRKSZar9jxIZ7yvC+Zb85fzGWEgbV
++lRmbPXmK4ThUoDUG9hLblgPdHGjEpJRi3kQXsy9iKtECLl9gn6Mr4i2GAYLG2xg
+CDaA2j98oN6g//7ho5pc9sg57Hfg8rEKu8N5Wk1ZWE49xGMo6Vknxue6
 -----END CMS-----

examples/pki/cms/auth_v3_token_scoped.pem

@@ -1,5 +1,5 @@
 -----BEGIN CMS-----
-MIIHewYJKoZIhvcNAQcCoIIHbDCCB2gCAQExCTAHBgUrDgMCGjCCBgkGCSqGSIb3
+MIIH/AYJKoZIhvcNAQcCoIIH7TCCB+kCAQExCTAHBgUrDgMCGjCCBgkGCSqGSIb3
 DQEHAaCCBfoEggX2eyJ0b2tlbiI6IA0KCXsiY2F0YWxvZyI6IFt7ImVuZHBvaW50
 cyI6IFt7ImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2
 ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsICJyZWdpb24iOiAicmVnaW9u
@@ -32,11 +32,14 @@ bmFtZSI6ICJkb21haW5fbmFtZTEifX0sDQoJICJ1c2VyIjogeyJuYW1lIjogInVz
 ZXJfbmFtZTEiLCAiaWQiOiAidXNlcl9pZDEiLCAiZG9tYWluIjogeyJpZCI6ICJk
 b21haW5faWQxIiwgIm5hbWUiOiAiZG9tYWluX25hbWUxIn19LA0KCSAicm9sZXMi
 OiBbeyJuYW1lIjogInJvbGUxIn0sIHsibmFtZSI6ICJyb2xlMiJ9XQ0KCSB9DQp9
-DQoxggFJMIIBRQIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJ
+DQoxggHKMIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJ
 BgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFj
 azERMA8GA1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9w
 ZW5zdGFjay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0G
-CSqGSIb3DQEBAQUABIGAxb2GSHoV7yzFDoW6sJwRK49xgMO3bpcU6s+yxUh4auLR
-MQ8Wso1xzDPnG2Xp886u0Wvw9dUC2s1qTD1aXKDdaHY0FUXC3pWUypR+6Ky5M7WP
-YJvDJfD0fdPX44SHwXo9Zy+DcU4zcRCucC4/5zn5w30qd1t1mwvd8GNdxvUqmZ8=
+CSqGSIb3DQEBAQUABIIBAICxNgyMnXQRLjYCXZYaRkkzQiVeSKKhXqYSvwYBgMjy
+JiDUbxHQmOZ5OY5OuCFyrrGNDw8v0JCuycVnr6dzLGMgeoVRtmRG5MhUV3aNK4gV
+zwrgASjFeoUftNnmlsqkes3kMnTd5OuTrrTcWeVOfVX+fMoJzGHMt0huGX/tpUv0
+t4E9QDFXR4yTMswUXJDOjZHfyj/nZtSWT0ozSCQ44UUSPWYJafuT5XNH5Dw53rjH
+NUpbUyWE23SrnG8YophNLeYDU9bh1z4RbgYXCm3x/IqfkdcAZJ4n/NshocRsheWo
+1hfzdub5Ugnq7FjBPqkyyMg6iOPevaYAwYjc5lFcoq8=
 -----END CMS-----