Merge pull request #1930 from jwillemsen/jwi-sslcert

Generated new certificates, old ones expired

(cherry picked from commit 3f1236a89ac9381be2ece19ff833f6a6b5f4ae15)

10 files changed, 332 insertions, 212 deletions

diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
index 7c9af9920c1..1921d9ea10d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIDfTCCAmWgAwIBAgIUQ2HUuuPwxy7ChX8dJUETFpwf/mwwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZzEImzIbS4eidyWnt
+Rxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6R3tO
+0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg4TKs
+SmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2KSI4
+1BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshwIw2I
+ypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1zxmjG
+yUOdAgMBAAGjUzBRMB0GA1UdDgQWBBQdbqSqh4WXVO84H9hXbOtcbFlTYTAfBgNV
+HSMEGDAWgBQdbqSqh4WXVO84H9hXbOtcbFlTYTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAxwOsIDBW0WyHfvVrYltysf+BOPEA8j4C3jfMy8170
+n0cCl+yyXrpQjCdSCkClc1mdH2uRbKlzitL0/pQntGk2ejBO6JqqtftUiLpiU8yM
+GiQJCgnW0a2uHQPnEBotmr/FK0kfQy5SfWk7BS3FDwbCdAAMUFeED7e94Nd+I3tl
+dITYI5jUrafpf/evMhTkB5EdQx1Y3FYdRPYSEBqO64bBWz7xE8ZmNqb993fIfrTR
+tJ00U0Mitd+4zDNhmJGtPF96FRAbr5HW25r1CCIc8TubsbggrqqjYaxxvKRJ0wH8
+Qxr2KZNxjrQgnryJuB0UfLQNv8VzVKMK6aUaOxxGJTHq
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
index 1ac5a1ae820..a574db7b541 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
index 4debafe74d4..71984e28a51 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMIjTrAy7JyH8lWQ
-d6Qkhxe0fouwWk00/L0TlT289TjNI18lUTDNCrA7bu6mmOvIHrAK0803GdOmVRG0
-DgnuLkiTZ280LdoN43ukDQK0QYODY9iQQPEGEgNiI+tBd/cn05lGrssoTshjyT3Y
-BBQ9AuAUfMzWC1ti4GnWxCa6PoNxAgMBAAECgYBIbuv5CccGUCK2kgRRld9hlNJy
-RAYtMEvsL9ZLBqln3AIKid3VG2uVfVdSa446ypvIiwGjW5+jPDgZNtjWE6voeNCy
-gJNvxfJzADznzastxdivkLirBqGdFdNa73wL8bPgxun3WNe9owsHNtx+UhbEsmJ6
-ESCFcNThsk1gUoA5AQJBAPlVC1A7KbYAtTvEg5pcPwcLkE2as/ZkVMww3eYi18Gx
-qlH4/S2i5Bah8YneMImYuObjnPZMbaq4VFH6Ht/sgzkCQQDHVGWizrZGhmyXxhaL
-+1fSlnTNw/l6QEy5Cd4hbQp7yQrb+TRXZhje9zLS3MIWcdRU2MDGokHWiSF2ZJMj
-5On5AkBwzUsLB1k9oGBeI/AuW+Gf/FlS4tTcelPq9YjO36ChXxHheDaC+RkcLDQs
-3bsz5UZyHzQaMkXDYRW06OYjBMvxAkBriOB8AMDdM1AKYVdwlVw/w+Onzn4cseuy
-N9yac9UgCsnM+ph+PhpUz0+f6nDa4vYGABmgD5EtSDXBRWkMCEchAkAE6v3PKzOe
-ryn/BKaLX6Z0OTCVIcZWu40onGME40t8f7xCoF65611A6rmj/9KddZf8WCgmQLFJ
-GzcLNDmr4ccC
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3xU5YemdyBOfp
+mVIiLqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtv
+i5qFFM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4M
+ZXNcKv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDO
+B9cz1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xe
+O7cIxVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO
+7pbrZIe7AgMBAAECggEBAKs49ORPN+7uTz5Bklsy5SFBkUf5/qhq78Ywxg4SXh6o
+kZGrxp+b+wvBibhA+eYvUJF0EfUmB/Wd4uAtTI1Oc5nWw2zUPzvOMPx/1ljJqlgO
+6Vy5xhwubvHv2s5id0NnTj+oBfd5vIH5kukN5Uws64oT5gDPPOzeVo2nvTt8OiW9
+cZzPCvcqv6wF0hhwAFEeSht9IsyDhwHUF5ffO4XpjxBeEKLdlVdOOg6lsbM7SxJk
+Gd6+GQNTuWnA3ADWododJ7GqVXyt6lBazUYUo8ltXylr52il0DHn9lgk42x+rkmo
+KYSgZBdn3DFc4j+I9wDGs5fRqqQGdhDkYiJIOelnneECgYEA5vmRbyOGeKPcVRuO
+Woai+7GJ67m+gIlJCmFEMqwZACsU2yxpYVx2HH1vy9tk1GTae/FVzBjMbnaA2pL+
+U8PPVafgvrL6AFqHpvsyutQun3PuMugxSU2HC+rIxEo49v4hLZpYaVY0B2ZDG8AV
+liYwL5yjqQEVnUf8feeqTAdSlikCgYEAy65163SFURCmBdEMNgT4mwVzHWiTKcxN
+OZzBjItnCrJkq8Jyar7fN/DNifBsGqoh6GRLlp+7yyDQyx3D7ZswrcDs88Uizs55
+LdeLPtcRGvBnX4PhzzvexsCP2NuhUyxhkvMdDDUsjZ9AOuUHQKaY0etpRhh4iOhO
+1r6sggX2w0MCgYBC9YCy3nKiUKaUSavIFJX1L2/TVYKjkqkJCE+T/Q42XUbrjwFx
+xzM6aSbay1x8skwgeEMuKtZBA7uxIcH3GKHnrAZcYlhVd+kxgEshnFdzxFD+kw+O
+t5n523OebAH9oIiPxtnwl5v3tS6pQdNANwvrEZbkbLsOYIsTGPDmn4zSmQKBgAg5
+NP2aqL9LIsjdVdbggIERyUIItNhdLUkEMTRRdImUBkiBA0mYBz8k88d784FoGRJe
+6kZckKJ04rkwrHZta5u4TFjTPsKGx5G4QCD7Ye9qgWHz2ywYyLfRkn048NyA0De0
+pRmXFANryJYYJSDRGR5wmMGBv2wXpQc6j5B4WSwtAoGBAOKHHWOdS3ZkvUjtd4Nt
+YMk1nG/k6iozIh6bz06Cry4EkDE9Qi7zLe8FP2hRAJkbF1clbrhfOGyfoNjZ/Zjt
+ouKkl2HWcJSKVbMLM3GTktjdnOoowAznzQSGAdTxl+zJEctTpPDy5M+HzbsHmjmi
+fVCV7vbCgOjxuGpyFz+Nv0kC
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAOTaZ2YfN2i1MA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAwiNOsDLsnIfyVZB3pCSHF7R+i7BaTTT8vROVPbz1
-OM0jXyVRMM0KsDtu7qaY68gesArTzTcZ06ZVEbQOCe4uSJNnbzQt2g3je6QNArRB
-g4Nj2JBA8QYSA2Ij60F39yfTmUauyyhOyGPJPdgEFD0C4BR8zNYLW2LgadbEJro+
-g3ECAwEAAaNQME4wHQYDVR0OBBYEFAsfrcafDjLQI6O72xwcdZhCWTJ5MB8GA1Ud
-IwQYMBaAFAsfrcafDjLQI6O72xwcdZhCWTJ5MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAEokrFPraZtDbP0yMfHSjnQeQK5uu19hHPxE30qXHWSNH2L+m
-J882d1aSrkZYauZbfhx4iJhusGgsh/64I9UIdlKKXDSTcEti1CrLbBEtfkgdsoYs
-QcXXCoEvHw/IVF2tT05+j6HfQRZy5J/8qTyCFfpz7HVhjKNG71cy38kkfLg=
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
index af092fb60c5..e69147e73f9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAMbGhxdklZZcMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0xMjA4MjgwOTEyNDlaFw0yMjA4MjYw
-OTEyNDlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEArCdzE7kixfdqothlf8iOtfM23jlN+njYUn1nmaCy
-R8LL7S5FZNX9M3SHEwAHLxwRjOM+0B8IRFHlGfptbUhQ/NIm6m9YPo17PigNG3p7
-OLym9MDJ6gstX8gFvwIS5CI1u7fDlfhTp5pxr/2MqYeExVR2OPRBFQ1A6VpKKaMn
-GFsCAwEAAaNQME4wHQYDVR0OBBYEFAlDj/Cyl+QUdOrQMyqasHJoFKrXMB8GA1Ud
-IwQYMBaAFAlDj/Cyl+QUdOrQMyqasHJoFKrXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEALdQDVKo5exyv9KK+8Zzjngc/gO3Zd5+eY9NJGxNUzY63lEv0
-nIPXZ+8To/E2FLiSDrdc8VhcXe4S+3/3EyNlPVx4+v9N9AlAffmhp5wJ8OCFPjkS
-DqRhqHmLoCu3fcCvf2IjPSYxlgZcTy7Lm39yyOsLOFR6KdTH4iKYOJ8qtiM=
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
index a0264ef1abd..bfe1f853da9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKwncxO5IsX3aqLY
-ZX/IjrXzNt45Tfp42FJ9Z5mgskfCy+0uRWTV/TN0hxMABy8cEYzjPtAfCERR5Rn6
-bW1IUPzSJupvWD6Nez4oDRt6ezi8pvTAyeoLLV/IBb8CEuQiNbu3w5X4U6eaca/9
-jKmHhMVUdjj0QRUNQOlaSimjJxhbAgMBAAECgYAIJVG3pDH2BhAAppae5kGCcICv
-IS0EZgVuWcq2JTlqVdhKX78e11VEwwXFK2Iro3tdHD+Tn3RHr0xU31mgKyTRzcfg
-elZkI7FqEELS+P3kd/U43pCaHmNZ6eZ4JkAkWEDIPXCGkYkf5/sWfoPnua8rjeHf
-1RppyM1gFFfCTq0oaQJBANxljEq+Xl6GUAGM2ZWCreqsN4vL7SZ3CzdBVT5p3sjV
-YOlm4KxKrj/elF/Cx7B+KL+NYjnytFmsF3vVZjCaNCcCQQDH9tdlqhl4DcyT5PQ5
-7ho6mdW+PZSg5Ya80chk8ly9wGgpWyOViJDqDdOUWC95gDGrfnNAhMpFMYRfv8Bb
-ZZatAkAK8yCdNggKOjIPYagNvYhWeGfqEh+eIZv1CtHpX+kpoTBHaE0RQkSV98D3
-YP36zsnHeoa+ykgbjGk+RcPl9kNRAkEAuoL6ldD6wIfecXP0eLQlstMaEr/NieWM
-r0Hc8Is/BZ4ZibmAj1E6GZWb65n1bhasPZFMXrl9EN0G42gvOxCeYQJAFA2/sc/z
-WSAz9qTBr6uJo/ZCptBTBN2qf7JXd24t2Hrl2xV69ey22gFLrmvn4C3tXOeHhWuN
-9AsMMQrC7dUU0Q==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZzEImzIbS4eid
+yWntRxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6
+R3tO0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg
+4TKsSmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2
+KSI41BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshw
+Iw2IypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1z
+xmjGyUOdAgMBAAECggEASUM+4+Kb+wr4V2mh1xD93LcUdr3PJo7ZwFxIjKQwIt1g
+gDYlt99T4DXJX4QEFLR8Va4zPOsbfJX1JfU1LRdrrYLYZjS5cQHyNqQmu9Pd/Dyf
+0f5LjxZb2jRYNA7Agf/JQMb2NCNj4i83zFfaXq5Wc0T3EBJ9ql/rttJoAVppaa22
+IE8NjmIk9PYM+7tP5ZMjG2/pm3TsaxsR//pklVPtnz8RH7n9qd4QLrHTfMTWVKXb
+g1ErdzFHKFLh9wpgy177I//ReE4qlNthrboGI2F4lhnEBsJee0YT8fBylUwxKnQi
+I6PNz3td8olGsOq1B5WCDpbV7tKbVY55SwxQT9KL4QKBgQDGr5nhNRE35/GYEeD5
+tCkNEELe6IPrQjd5OlutuAzRBQQP9apkSMMfx4SaJB3NYWC0lS+aXSRQgYRSl/4s
+Z71bmDCUoOZ1W7XpMsYvLq/585mJ2amsNDOXzcEqHafrVyn/AYGClfqgzl81gxLc
+7iuZM2Ow4UO1+joPBqXpoCHzyQKBgQDGKczhh9/NkpiMPJx692nsYWvFdeDmgzUn
+CQnYL6iRKXv53TJjh1Tl9x6RNfGgUwwTkn9s1pKMOMRhPH1sQ8mmOAQkBJ11BqI4
+MaF9B4o3xyaBbd61Qsw7iEN0ZMeCyxelwDcvl0BJ3LXrAI3HXnjUSso2vrHqfStb
+Kwdko4rzNQKBgFj2zf9CRMh0qf/+mW8V1X/M9TRchp0z1CULFXvuuoZpKY1/4eDv
+l7dGHkDqxRFudd/GIT+MTzNhGv/koOH/PZGizrXuaeLIwuZ9XrJHxHI2Oly4Qroh
+0aw6bDDQgJznNZ3CbdwsDcItRgJvA2Y7mvgJQ60y4J++QHrz7hxzIGDJAoGAUpkX
+yiXtlm11YnbdLrA0GZBd8Jd63/puzE+LJ+5tj9w/zd1yZGQDcjt4JUTb61zSWtIk
+hQRHX2VGDdW93cO/qKYOq8i0rRPPyCZ/znK3HRrIpQhb3SfzoxjgLQLY2l63A6LE
+HfUomeECfurjLefl628lLH5+AGSeDsk3sq4se8UCgYBspQ70kknXqUZmVs+bCewZ
+LYaZnPkWaKhQDPgd+hddJfoHEz7Koljad7BMKe+1MGo/hIxvxFpOFvIB6LFKY7HG
+cA273ZncnD8u//wLLnjQrZR5GXvj1VYEpRcEeql7bAPdsD9CoyHCD6bh1ZWqBqqf
+IxzRIPaJwoaZA2Dfe7t6eQ==
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
index e9b17485db7..2de95d001d7 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
index 84697501f07..58a298d6c34 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
index 71cde978fe0..cece95b57e3 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAL8I5RYJxG02Nkyk
-nNBVxGPlFZvByqz7rFxeiPfJqIAjnMftzAQRYFua3PUdVxZEKMBeMvCFv9B17c4g
-XMZajxQyIt83505/vMRCCvt49QhG1AqX3X9t7djCHnXfv1SmfU/Nw08Rn6O44zng
-9Meq44S32T8xPpKuLQxXa/GTFVRPAgMBAAECgYEAhyTow9V3E3fFpCTUFwKF49Gd
-nsnS8ts8jUAHj5wmyzfmYv3UVZBhZYzCAdmW0Va4qZY6XTORhgzXhfoZB+3qxzhU
-y8vFzjYdHKoDZyfsOXa/74UqctHHOGE4uY0t9ANY4c/eRDYtQ1Xm1Ze0LYmRgtZI
-/7c1tbULjZD69j/zM/kCQQD7Y3JkbW1ta19GsjHxJQpY1dhxaZfGlLEfeDDb1LAX
-wlOJbu8WMXt2Ow4wfyLajZo2lknsLYR+PL7mBxpUy8JTAkEAwooE4MNsC9hEcpYc
-E8ohnb6j6X5084qM8xaWLEbp9+3qizdNk3jAHwqXW79sNRJ9LtoXTGy0QfF950oF
-WXqelQJBAKonQrtVEfc48PFCFem5/4nnnKwPI8smw8igKrnw+Qvr3W0tqCimb4G0
-MUOEGkxCAjqmePyiRobHiRLbhegVTr8CQQCaBs8/6lp0smHXW9SVMpgVHmkHKTGN
-1igtG7gBDJCY1Y27dij810E+EpOud8xD5QSqgNCrmPHLuFmYM7oyk2xVAkEApncl
-77y5+vjjOBuVIOujfls52NQIliK5DwwrG9s2rnvPcQ8UGeNb9cpWxBnr8ENALj6Y
-dO8d7Zudp94vU/mSkg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQd7Xhe06WRK9K
+DLsQwDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw
+3pu1PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1d
+Zismckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35
+M44Mi6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT
+4PzUJplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0
+G/N/YaVHAgMBAAECggEAT4Npj0B+ABjglyj17PS1zYBXuxlsZ7qqk3wtJfsFjGmJ
+btcc1rM5q/Wow4pOEzYZTBWJnBMsjJbItFSkJWRvP70jGOWRiEKyPueXbuD8G7qf
+x5I1kpSSncOLbZZBkd5eUTbjoKJOsKoChQ5kJPzw95Io8pCPNjt/xpzOUc2/wJRS
+xS2/raReRe+1xLzacgSOyFsQ1SEHeC+LjhHchLL7OvRMpUSXM+fg8bwSAvUoOyUb
+WCKGpk5myAKUXZpL3hrzK7cnIAvjNlfpMRpnKbWaKUKNb8XlEfiaGnkA754sRobJ
+EUilb4k9LC2F98sBhYh+DKkr5F9tsIhsRf/XqJdTqQKBgQD55j6D4kxqTmsfYxPE
+ngIDKHyMVsYmmlMsV9lkRO/dl0na4CS4reBO0BJ08vwd4p+shEvPB+l7FwXMhfF3
+laRJWRUKe2Mc3QLVDDd8YNZ9OMkcbOS/BHyLWIfXgZO5FVXOSlaG9sQI9hbbNIoY
+sq6OduxU8JMMaIPJt+THAr7bywKBgQDVjoltdzeVM7XI7fDmzgpl1FrKKLjbnHk1
+FjiJBHTsqNrvyvWWyRwZh5XSYNHtPs3gA72v/xKtuAo00Xz+v5VzOs60DKyrvFA6
+HL4ilqMoRVotsuxssg8RSiKNUkJPesZ6W3g41RR/kvbeB6k3au9YlBzsKT3yFfX2
+FxMTstpk9QKBgQDO3GMfdPJghW1zW+Z/OXTc/GStHx+D0PfMmyPfNpmASr3eKvD6
+1yP42ZCNsp40duZKPnEqfZguRk6MkMvje8G03cLnHGBdAi5YAXbkxJyIp7sChrmL
+zcDy8GPyZtbLvPd8fljF+/sml98vsXwnGbIZSCQ147c17EY7crg0bPdkpQKBgCue
+g39yXE4DU9wIja3247TM3QZxruBcY31uXnnOCTvVeXKFGAiGZ1DnmrhvwjEdJNve
+p73s8Zm9/4euSkOWSiZRGqs384TYX+KewE88SXMOR08SPqws6lrzs37+EEE/qI6R
+ZErnatpr4DSViACjvONwzT+HZPmvdp+fMuxRGb6JAoGBAKrCbGUDfEJdBfHpfU2G
+8P4kW+eAU4tMl9BeMhWmYB2aUIkHgcivQKNNBLSYnKt9B/0fe2qoyPteyFOi/mur
+68IIc0aZm8ut8rw3QguX6HnKa6Lmxz7KO3/rrcDY1iOUbvu9rLncqWipTsavurRi
+GDdTB467Bg1cPkS+1u3hZa2k
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
index 285f66707b9..2ff8794143d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
index 570f605a1a0..65ef88f36da 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOAjx/Urmya7Gnrr
-uobLLvy28zojXBd/1HocK3ZEQNutLs6X3Iz2GSO6uVUP6/A8J4CTtjLK2WVCdldH
-lx1Mjzgfz9X+3A0Ycr+KUGRqtorowb+OQgTqHoNscpyOh8KD1/RdnfC/8eGi4aM/
-dRhsbVJmh1rN5xUAbnBsGBwLK6oBAgMBAAECgYAuEWyhyYqkFUTGCvlVhyFrM7ce
-NfJRqiZjyrJsJm8mN5wtPi1Ik7RrEY/SGemmgNalqLaEDglMtLJaEg7PKNMulWpN
-FIP1uBfA6Kv8vTJvf3PWNiZ9E70Yxsj9xxYDiIhwaNd8UMDMu9i4ipOkZkUWGkTr
-bPESK4sSytRh8K3+2QJBAPYLGJnqNVb+e8b5Z5S8bNiQaP5ZWUgUSlsUhcpcI5sy
-h3HQhTK/Z0sbGANpW8OVa3RM3SP43mJk+FD2WY11+/MCQQDpNcX4Gea7FBRRZ9Zi
-hGLTgLXRAeLR2oxQFs8KCZb0RyRMAjuKNg+FeXORQvxKZbY6qCga41I9PSgsBjAE
-TkM7AkALgb9Xy21NMT+msZlXimxowHA4nQMg7NoBYndTXHXJ11YgS4k/M1ZoW88G
-sdG51u4clU+uVABKh8BZQPw1MnRjAkEAvE1sBTE8yW+kHDsAstl8RpTVueaQ86tI
-wl44XD10AtfyqeDfnHCcRcTUGMWCmrvX0TL39wX34HSiHDH+0Ws0AwJAMuzL2UA4
-2aBTBcTe4CZu1zUHnJHQLKfWdDdjDQML8Dh9cOczibmNi3D4v9XDuCk8xOvzyG5d
-3VSuogRvmdH1GA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1pNAwDrGOATwa
+YmnfseWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1Oy
+PwyLR7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a
+/KT23Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzES
+l5h8AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbX
+u7teHDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9
+PrJH+S+fAgMBAAECggEASxYFJUh9pxjlknaKE3lDVGdKiCKA9YBOh68rl1I1xAGb
+vBIrBwlMRJaQp0Iyrtx9igiPk89PkKhdWbpsYgrTakpGc9dLVdW31QcA0Uazbllq
+0RimsJTWXOZhy3oWDKLJ6zo3hTdDF5vRfzberlmh631rFpdVKWYT/0xrEJfAsntS
+akrYm+oFH83hLayJhf/hii/N6c9vjhE0Wa4cgnaEqQZnf50anZdGSp0J0LaLVj/o
+wypN0Bb74Rr9J8ks5WdngKWB4UDMjqx/sAlETJDnEoWTu1xdKRnLeU3Hq2RWCCJ/
+MOUGX6pOD3gldYysMMNBIoRBBBc/f1xDkCkaNHuXyQKBgQDw310b07h2dUKRJhYZ
+YbcEic1LodaG1QVDBT1cNHs/QG3+1gBQmxHLP+uf/mofADkR27ell9MgvyhUZirj
+LyTA3GWIW7OLRcg0Zrr4SmAFv5zXXbVfbigZapd+MJpUXPVKbUzX6zBy/2BDNG0x
+dplxkzSm2nAMdSOVyybCTYQPqwKBgQDBDTKkcRERPX1ajmfhrk5nF+YVrU7cWywv
+7TgohjSUbuYce+XsgIBVWkpHjdjsPly46v1acHPAVNez8bu38rUd0zlE42g6rpAc
+VR4XK8N5/iiIxCtpv4F1s8GqbYUm3nZI0j+08dfX1YuMUKPHicmEb4DQoo+qmXRJ
+dcLBRdH73QKBgQDOWnz4xvQDv8dMdDWAfx78q1WOUtJnZn2Agi+kG23urTLOm+Vf
+KMogtt0Ujy+46Ub7DqGRIrWEG1/gljptsMiq1OXC4NS7Hwg6JDxPU+BZbGNgee5V
+GBkQVSn9uIOufIjDv0mSvPEfw7pjOLnHI1SnYTY9L2vIsF3RCV5mHWRiywKBgHZX
+z9aslUjbR+/uYlIfl2JtbReWwUQmA+VxZz64Xp0ripalgSJE9+bazbQliXfxFsgp
+DZyWWO7rU7u0kV3HRC3/YRkQysFGZ4NmzmZn5pHvMwv8LZzKz+LGig8eykQ0lZA4
+iuMyah2eg8hFWtEkb0tnSzEapjVvkrDBptzyHzJlAoGBAM7yA/XnbKpaHJzAswgd
+Ks6FLHK/94e9aw3YjqR48FcFGtLuHOVSvXhT/WlwmQB6wUTDUWk+hEDTPJ4yeENd
+pgFpg2G3eDxWh3mzhOKJmyQM8OMCoohnOpBljceMADRUFum8CckJ7cy/HCU2p4do
+JQluDrECO1IkRC8UUTWpyMAA
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----