Merge branch 'main' into nested-proxy-props

.vscode/settings.json

@@ -14,6 +14,7 @@
         "Browsable",
         "istr",
         "ostr",
+        "soversion",
         "unregisters",
         "Upcall"
     ],

certs/cacert.pem

@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID1jCCAr6gAwIBAgIIUmyVFUPQ9f0wDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
-BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
-SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
-BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
-MzIxOFoXDTI0MTAyOTExMzIxOFowgYsxFTATBgNVBAMMDEljZSBUZXN0cyBDQTEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAy6/rqeQ+McDn/mXQwNGk+cNftOIJb99Cdpl4dFuMzD7XBK36l1Ijo/Ro/d03
-7ZJr2BzAY/DlseyuvX9qXeQ2jsvzwlumNuEv09ILbCqn27rGt3Gu8RpvSt6ehVic
-PXJR3dA/TCZW+iK8WDmDOWtD8DO9jSiN0+qneWixCqWFX5DeBFQoORF3dIjJa62B
-LLPaWK1EW01/6R/Las92NKRqXuQ3TkAT1bpsQBjrJFNGSSdwwcteGGpPfzwSw9gW
-IuKuS4f0/xZVx6rG9Jzcxm/J2owidhZqqKEvaNiIghMXax6Cldh9Iq2qUS3FS3Ye
-T4ZuT/7cEVGu5RPyNnTKgGirhwIDAQABozwwOjAMBgNVHRMEBTADAQH/MB0GA1Ud
-DgQWBBQfsKt279iGWWp5DRYKF9f9b/F1+TALBgNVHQ8EBAMCAYYwDQYJKoZIhvcN
-AQELBQADggEBAI4qKKqx/edLOQKdcdH+2QAxrmsnZDSMmnlVGl51WBatFw+9GskH
-YeIabYdihTx/aDbdoLW5FDVYQQEfBhnvo7uwfhoYR8DapuPFCfeyf5hED+FIpXHo
-jVgeL3DrTccPQX3VaCu0ID5FN4EA3Jbp9/Kt+uwQUlHVeMrHQNfo4En/yoJoJowz
-26iWrmi2ZdnxuK9WZ0HhENODLp86oNvkgqu9iOR5vJVcJOtKMAiSHmemLOZdaAeM
-7UwNTu+cYTC6N2LH31K6qCwJkk3YJg89uCKhd6YkMZvmQlTrnqM39Hg+V8LKl3x/
-2iDrWoik199Rh9p/Z1qqitqeOnWK3EzNevA=
+MIID1zCCAr+gAwIBAgIJAOEljxS7Rxo7MA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
+VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
+IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
+BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEwMjIx
+NTAzNDdaFw0yNzAxMjUxNTAzNDdaMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0Ex
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALwDfXcWkEV2F7+RCDCuZ3csXZBDKVb4Q8CYzcyf5+Rw7LymTEzwAqCbr6wp
+ZVjAgszrfh8/j2BET+et0neXLvAEupGBOEDeHWgkFmkbAixif5pakYSTq4IzRhHd
+nj/qqDtEuP7yImSjDn/P+fjonRgg8p0lmoDuAleZfIrkAjdT5ishI3Otu4FgCoCw
+E/Vm/Mydka0ELddwziyb3Ra27OtwbBTsL2Db6wjKccNHSm+idQFN875tHy243FL8
+1bsyQxYE6Qt6aho7TpORJ8TavpQBDAqL9CYW1hpM6ikzBKhC3eI/5fLpGVY0QgBR
+AU1P3tyiIcmeyDKzNMvc6HtWqO0CAwEAAaM8MDowDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUeYltiMNIe+n7TMBXCMfftqLdCbcwCwYDVR0PBAQDAgGGMA0GCSqGSIb3
+DQEBCwUAA4IBAQAdyoZfklBNQOuUoulsEmDAMippkKlxJluaYjZAGFOgT6Sv3s/T
+q/Ps3bz+pQRQ0LI6N9BTuaYjFr9d4Dhp4GGoed1AB1TdQOFUwnzLFt3BLOI18ZNc
+1uvJqv9qZsGOm0PLvOFKQu4+btoeVPgXEJSui0wkeLuXYoiKPlKiYLc16l4pJunm
+yhaYO4KVAkBSp4XExFm1sT2xhtTGKfOuWT7ORYwWtaWqidx27Jj6kESFuhrizddm
+VAY4ejoM1Ya+5QNs8kNICfgMWzowBSNNJ1K6H4f75LSxHahNjgM/peRRfaiL58wj
+WP0OHvX1jopVQi5z3NSGC/dVlV+xZVQ7fqiP
 -----END CERTIFICATE-----

certs/server.pem

@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
-MzIxOFoXDTI0MTAyOTExMzIxOFowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEMMAoG
+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
-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
+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
-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
-x+P/Keu4P/M4IZLHdQiYgSbV9lFe04z5cBo=
+LmNvbYIJAOEljxS7Rxo7MAsGA1UdDwQEAwIF4DAaBgNVHREEEzARhwR/AAABggls
+b2NhbGhvc3QwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3
+DQEBCwUAA4IBAQCDVb8YeArBZAaDO9UgG32GL+4bnw/x3OAVKnSg8ShaoW3LbWcq
+wYmdWKcdshuB9+Og6/CZ4II0ju4B8WveH2aSxdbmOyxqUIYCKy497rNO+u1lLuOc
+Xlmh04g55+K7i2vOqRg/TFoolNajQ0YmqWxPU8NB9fT+GxQGoJ2lPzExAsMfbD33
+0t6lUBCnXbECu5P4P0sUT61wGwm6syh9oMnfEZxqkepkgKUq3tID1MziOb1ynAU8
+Y+V8vAHAlRvlbdnJSf4VmbkQZKfLJeHCNfIa1/4Y9neKkNupqeDWvNWgC32MExIQ
+hexjYfPQtVJgLgtmfzq+NlXk1Xxb1Y51ku3D
 -----END CERTIFICATE-----

cpp/config/templates.xml

@@ -27,7 +27,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,38a0:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,${node.ice.soversion}:createIceStorm">
 
         <adapter name="IceStorm.TopicManager"
                  id="${instance-name}.TopicManager"
@@ -74,7 +74,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,38a0:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,${node.ice.soversion}:createIceStorm">
 
         <adapter name="IceStorm.TopicManager"
                  id="${instance-name}${node-id}.TopicManager"

cpp/src/IceGrid/DescriptorHelper.cpp

@@ -365,6 +365,7 @@ Resolver::Resolver(
     _ignore.insert("node.machine");
     _ignore.insert("node.datadir");
     _ignore.insert("node.data");
+    _ignore.insert("node.ice.soversion");
 
     //
     // Deprecated variables
@@ -488,6 +489,15 @@ Resolver::Resolver(const shared_ptr<InternalNodeInfo>& info, const shared_ptr<Ic
     setReserved("node.machine", info->machine);
     setReserved("node.datadir", info->dataDir);
     setReserved("node.data", info->dataDir);
+    if (info->iceSoVersion)
+    {
+        setReserved("node.ice.soversion", *info->iceSoVersion);
+    }
+    else
+    {
+        // Since the node didn't supply this info, we're guessing it's a 3.7 node, but we don't know for sure.
+        setReserved("node.ice.soversion", "37");
+    }
 }
 
 string
@@ -958,11 +968,8 @@ Resolver::getProperties(const Ice::StringSeq& references, set<string>& resolved)
 map<string, string>
 Resolver::getReserved()
 {
-    //
-    // Allowed reserved variables (reserved variables can't be
-    // overrided, in this implementation an empty reserved variable is
-    // considered to be undefined (see getVariable))
-    //
+    // Allowed reserved variables (reserved variables can't be overridden, in this implementation an empty reserved
+    // variable is considered to be undefined (see getVariable))
     map<string, string> reserved;
     reserved["application"] = "";
     reserved["node"] = "";
@@ -973,6 +980,7 @@ Resolver::getReserved()
     reserved["node.machine"] = "";
     reserved["node.datadir"] = "";
     reserved["node.data"] = "";
+    reserved["node.ice.soversion"] = "";
     reserved["session.id"] = "";
     reserved["server"] = "";
     reserved["server.data"] = "${node.data}/servers/${server}/data";

cpp/src/IceGrid/Internal.ice

@@ -373,6 +373,10 @@ class InternalNodeInfo
 
     /// The path to the node data directory.
     string dataDir;
+
+    /// The Ice SO version of this node, for example 38. It is typically used to load the same version of the IceStorm
+    /// service in IceBox.
+    optional(1) string iceSoVersion;
 }
 
 /// Information about an IceGrid registry replica.

cpp/src/IceGrid/PlatformInfo.cpp

@@ -383,8 +383,16 @@ PlatformInfo::getRegistryInfo() const
 shared_ptr<InternalNodeInfo>
 PlatformInfo::getInternalNodeInfo() const
 {
-    return make_shared<
-        InternalNodeInfo>(_name, _os, _hostname, _release, _version, _machine, _nProcessorThreads, _dataDir);
+    return make_shared<InternalNodeInfo>(
+        _name,
+        _os,
+        _hostname,
+        _release,
+        _version,
+        _machine,
+        _nProcessorThreads,
+        _dataDir,
+        ICE_SO_VERSION);
 }
 
 shared_ptr<InternalReplicaInfo>

cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDz64PMKNJZ28pp
-rzayjourgUAfXbCpS3eeRvPf2UgXaDRW6YGQuTrAdr1HH7N1/2AlTDJXsdAXTc4n
-DcXso/AHd+Hc6ZeZSCG0z4rQnodgevl75MvJc62XqrS31XMxnIxPEy8cAjSn7IhU
-Rz86GaiaLsCjjPw2CVoJ30UTXVfSmV/gR0vlDhBWSRDPSlDkg7yov2/TPIMdi5vH
-QKHkhZzps9ZyS9ujLzu7dmhxnxecKUPUHq+UoWACtyEs+V1fWbISdPa5s390Sq03
-dkzYw4CUBRis/R1stBLm+VjXHd76X4Ab7I0GF6QnjMXPd/oBEAr6bVqeNSiU2pJs
-d9zD0eLVAgMBAAECggEAJcB3lV9jESfQp/NHoLKpwNlgEoq2ZzloMd3S7HwtaXwG
-D8aTuFHG21d1W573MGXeXF9y8jox1g2DgO1jiwjjg1Bla4LW5REyMFEn77p9guv9
-lZSXit4lybHQxxwY+F59o9Z5Bdl8i1nzTrH5QfWLMBPY2mddeMKRRjJhd0oM5+nq
-P9qPh9U5pe6bZiPGt82uzl1TU7xqDtUuPge4Z6y9ONZ5ptHwMBbt+1DMOrdCjdwZ
-fYwAL6Jc50i5jW99+CYfW4bEUyYEfBTLBM3k2auKQHdjz8b+rBIsei/4QRvXwkmK
-dIyYH9aSd5gHTfrJbyUepXIwLqFsg22fxFAd6uNBSQKBgQD7CfNLZQHj+qllm7Td
-QWIWb2b6vnjZSIIokyFVz6ImWup3389W7WeXjx1a7bPDfYBEs6yGntcGqpZfb0Iv
-2EeY35c/GldGhP409LIrCEYMgOUEWpneBnm9eM48fKOE/NzBMzX6I4qDHTfTu92U
-7f0X31MtFNwIhjnerTiP96Ok3QKBgQD4vYx7c7fqR5cuJr1DPY/P+tbT6b7d8x15
-jvGcZJz5hkUbiAquHPIFbGb+887T2tpnl2Hk7SuV5Nd8xEHqgnf6yFgSHfxOfGTD
-/IElM3jEcKsHbVQMj6RKM+aDm7kkT6RIEkxxES/fHp+nbWSWrrMGBTsi1WuliNKU
-vkJ0jem6WQKBgEIhLOX/ha/4qAcMLWjbgGtIjWggJNWYNDFcELv6JkzURk+ttYDA
-qTlTifgaBfDJbrCqZBhSX3JyHYqmVFkmMDYlMEJ/Pd5lylFI5GZRl6JTkgDDnSTP
-r+IpoKpuauTtd3mtc9qg4iwH1l0AcC57QuC3A8IsbIoSUcxG9U93fLRBAoGAPjrN
-xqTwwkAe5oDyoLvqGtJapLG5+rU0DpFgiQvy6cpZx8WFRoIfWpQAQJCmkgIS2g/Z
-gfiECwAxmRlQlGcHtUoiHoY59TjRzOaDONdjw2GcqEMF4A6fv6C0bwCqlRcHtrA9
-R5xRKbTzpGON4tTaHQt5/AEA6W0NogDnh1lpvCECgYAf6lRiRHFWemLNUlggP8NY
-LzGCkRFxNiZnZrkRGlHQc8x1ZOMVZz8Csx6Y2y6TCZedr92tZ7mLa8XzgR3mAIbL
-vJTg2mYF02H6u5ljt+XRkA2rWFbg2ouDj1U8LfmlNY3U1ETH3KzUpCVObEWqe2rc
-yF8iRmDSF/28HETrPazCiw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzVcR14Q6FHupc
+0TyY4eeMtWVYvYMXsZW5a2S0Ojs2dYQHPZZbduUTvGu9ENHF16sZQmnn3fYPXEUE
+BjwLXo4bXIAcj5SOcBusFeEMrJOz2XN0ApaMu9QkaQ9PHurgxRj5z8Qe/kx8nrvf
+yU8Z67jM7W9uKL5NRpOqnduwpRHs2lF1XpH765vQXwSrsqjRfLGP4clA4QgERc50
+35SpESo5wIwofIuR5CAM4QTSPC3xylmEa61xdvWk97gVukA+AvJbrGB8dyfcRDNj
+VDDveKyV4hscmOZ0UBVlXhnofGg4RZ16lbfALyUaFJJY+tlDhSbmYzJjI06txuTs
+oqJweS2BAgMBAAECggEAUbZ7QXDuIkbvZ6JpF4obbNg8WP5k7JdcjvN5m8tKrqpG
+Idx0lbFreJ4qgyfWRWzbB7PkuKNA2kfjJI3Iry+C1cHEl/7uJCa93R/M/u7lkBW9
+Tvdc7Lwq0fpS4OzH/emg0zbReIPLix7yoOnDkp5/AlUPqGSFLYXChAPQlcDpFX+y
+aUKyGT3vV1gFrqV8GLkk9Z05dVlK5Jnuo3wd33o29G7cdaF8J0GXJB0VDYHSzAaf
+Wbs2jWVLHLaNZQS9mfLzrPnXx01vcKrZIT4O20DQ/BDzPZ//pTUTeg07pI6FG2qm
+zX2HD4cE4fDdKQSMO8Pr4smySlze0VWhHtk79yoHdwKBgQDrl/GCOTOv5tv4pS6B
+5iSdVudtOBAWltNGNnfE9mD6+hLWBwmT4moJIxUTTSGvK6VopcKTSfsN4Idq7mNr
++4GQj0agBOCWtK6ToxBGWP0Lk3eVsetg3DsHgncNzQYLG3ErXY6icOatcKrMN5UV
+3lAPcktNLd09N7deiGLI9szOxwKBgQDC3ljA6FK/YufO971HotP5ICuxE7xlYaB4
+7dFlgkJT26w/FCYQ6dkH9dpADSO3kQkqbN4SXn03iLA4V6IuAgp6nQPLqYCJbfcx
+rsH/UIAyPn/5/ZKWdaJnH/3FvQNgzcXFdlmsmp3qFswQ2Cp5ord5yYsKrx+XaCj9
+vm3adS95dwKBgQCubX7H1aYpFBnFDDdUwZpWS6Nov9tZfi3KjEU8tNW0vDX59Jfo
+v/eV8D2IXtETqpL62c8n0dxot9ZLG1jM+BdDenDlxParXfbrJA3Gp9giG/qsAGCv
+BB9IPhX7R9Kzoou1eb1DE6gWvZYXQQfGeyR3az3JVK26x2eiPAQ3mlKkvQKBgGES
+sDXQxb/PPlisst6nr16v9vPsN/Js8qqrFZ+yhuYNTT3TBK9yPoonn8Q+h2dfWaiH
+uQx/g3MRpW87wG+Y1q2D4CspUf2kCPr36m4MJQBigBABkG9hRDiJCDrj0HX9q6KV
+NVC1aSr+lkNh267iLvH9Q0VcPamH2rukjEbCD5c7AoGBAJPE4jMaJ8hZklAkFSs7
+3OTOVttNFjM0EkKQA1JsW3zFPQCMNRPVTO8xFM9QRK7o8cXDBn7o0zhYmXnIBNtZ
+hK8AMEaP3sj62oxthIXJtfuXaGwiHxs4b1YTuPibhVjAKMNkMPm6Luo3dePBXrdf
+HILdXNsyGiNApCy6iHf58R2R
 -----END PRIVATE KEY-----

cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem

@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIJANM8bgbmPbKeMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTgyMDI1NTBaFw0yMjA3MTkyMDI1NTBaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-APPrg8wo0lnbymmvNrKOi6uBQB9dsKlLd55G89/ZSBdoNFbpgZC5OsB2vUcfs3X/
-YCVMMlex0BdNzicNxeyj8Ad34dzpl5lIIbTPitCeh2B6+Xvky8lzrZeqtLfVczGc
-jE8TLxwCNKfsiFRHPzoZqJouwKOM/DYJWgnfRRNdV9KZX+BHS+UOEFZJEM9KUOSD
-vKi/b9M8gx2Lm8dAoeSFnOmz1nJL26MvO7t2aHGfF5wpQ9Qer5ShYAK3ISz5XV9Z
-shJ09rmzf3RKrTd2TNjDgJQFGKz9HWy0Eub5WNcd3vpfgBvsjQYXpCeMxc93+gEQ
-CvptWp41KJTakmx33MPR4tUCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBTs8KUrZ7/U
-nC4PVvV9dUwvz5h0nTCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhrKxQ8
-MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG
-9w0BAQsFAAOCAQEAW6XL6QFHkrDfqJ0X9SpoDqzxfHImq9h40A2pkQGWKPclIalS
-6mx5izlFs0p2t51EJGyMhoFWajbNTUNBk//18JEJAV3RHldMSqTSU/MUVmaM971d
-38vgmcNngw+Fnlmj3904cYNvzzE3iHwjN150TdYgSIWXeBvrK4Ai13zY/8hTr2c9
-LjzjuMlhtF3GvegjCBchFX1Ux7ss9Bb7iqi0+6yViqjM6Kt6B+wPOfz5kUjLdKkV
-TKVRL8XmYGs6uaql6lRzXZiAhC9YMpI10v0PtxesLOgNAVsLxo7zizd7e3KTzMVL
-2l2xdPOP008A4fJloXj37y/Z8a+QS4rmmB0W2g==
+MIIExzCCA6+gAwIBAgIIUFcBmK99+bowDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MTE1MjYxMVoXDTI0MTAyMjE1MjYxMVowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+s1XEdeEOhR7qXNE8mOHnjLVlWL2DF7GVuWtktDo7NnWEBz2WW3blE7xrvRDRxder
+GUJp5932D1xFBAY8C16OG1yAHI+UjnAbrBXhDKyTs9lzdAKWjLvUJGkPTx7q4MUY
++c/EHv5MfJ6738lPGeu4zO1vbii+TUaTqp3bsKUR7NpRdV6R++ub0F8Eq7Ko0Xyx
+j+HJQOEIBEXOdN+UqREqOcCMKHyLkeQgDOEE0jwt8cpZhGutcXb1pPe4FbpAPgLy
+W6xgfHcn3EQzY1Qw73isleIbHJjmdFAVZV4Z6HxoOEWdepW3wC8lGhSSWPrZQ4Um
+5mMyYyNOrcbk7KKicHktgQIDAQABo4IBLjCCASowHQYDVR0OBBYEFNHVq3pPmr9g
+ywckIuERvShuiz/iMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7ytuN2h
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/AAAB
+gRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3
+DQEBCwUAA4IBAQCEjFn2K61sIZZcW/XDReYd6TWU9JkwDaQ6+u+k60/fxqgl6tZa
+pzb8/s0MtZjYr19SExWkLgGDHXuTEPKXG5KGsKofQz2YyagSI5UgZr6C8UvDTqPH
+tKMTOlToB4DKyENdU98wgwrXcAIIGERtyNMpkq5drOtU5YFiwVjqQ/9oL/2xxZk6
+ZgmJrA/tumyXheR4FnGGRxxe0eST4OOFsqF5E8kL6ICNysSDzo/aofhbQ1ZKrRsz
+yvAdbJBUEnwyBGo83y9wdgXdn7GVviVW4bDwElD2ddtAgWRHPf/UuVuUcsOonQAy
+03Tt34x6nnjlwrCvsqaK2JTA5iFUvhwhFUxm
 -----END CERTIFICATE-----