Update tls certs in test, regenerate them with 4096 bytes length, mov…

…e test to docker (#374)

* Update tls certs in test, regenerate them with 4096 bytes length

* Fix compile errors

* Fix tests

.github/workflows/cmake.yml

@@ -22,7 +22,7 @@ jobs:
         fail-fast: false
         matrix:
           # os: [ubuntu-latest, ubuntu-18.04]
-          os : [ubuntu-18.04]
+          os : [ubuntu-18.04, ubuntu-20.04, ubuntu-latest]
           compiler: [gcc, clang]
     runs-on: ${{ matrix.os }}
 

Makefile

@@ -51,18 +51,20 @@ build_release: clean
 copy_release_bin:
 	cp $(BUILD_TEST_DIR)/sources/odyssey ./docker/bin/
 
+copy_test_bin:
+	cp $(BUILD_TEST_DIR)/test/odyssey_test ./docker/bin/
+
 build_dbg: clean
 	mkdir -p $(BUILD_TEST_DIR)
 	cd $(BUILD_TEST_DIR) && $(CMAKE_BIN) -DCMAKE_BUILD_TYPE=Debug $(ODY_DIR) && make -j$(COMPILE_CONCURRENCY)
 
 copy_dbg_bin:
 	cp $(BUILD_TEST_DIR)/sources/odyssey ./docker/bin/odyssey-dbg
 
-run_test_prep: build_asan copy_asan_bin build_dbg copy_dbg_bin build_release copy_release_bin
+run_test_prep: build_asan copy_asan_bin build_dbg copy_dbg_bin build_release copy_release_bin copy_test_bin
 
-run_test: build_release 
+run_test:
 	# change dir, test would not work with absolute path
-	cd $(BUILD_TEST_DIR)/test && ./odyssey_test
 	./cleanup-docker.sh
 	docker-compose -f ./docker-compose-test.yml up --exit-code-from odyssey
 

docker/bin/setup

@@ -1,6 +1,11 @@
 #!/bin/bash
 
-export SETUP_LOG=/var/log/postgresql/postgresql-14-main.log
+service postgresql stop || true
+
+export PG_LOG=/var/log/postgresql/postgresql-14-main.log
+export SETUP_LOG=/var/log/setup.log
+
+touch $SETUP_LOG
 
 cat > /etc/postgresql/14/main/pg_hba.conf <<-EOF
 local  scram_db  postgres                  trust
@@ -27,6 +32,7 @@ for database_name in db scram_db ldap_db; do
     sudo -u postgres createdb $database_name >> "$SETUP_LOG" 2>&1 || {
         echo "ERROR: 'createdb $database_name' failed, examine the log"
         cat "$SETUP_LOG"
+        cat "$PG_LOG"
         exit 1
     }
 done
@@ -35,12 +41,14 @@ done
 psql -h localhost -p 5432 -U postgres -c "set password_encryption = 'scram-sha-256'; create user scram_user password 'scram_user_password';" -d scram_db >> $SETUP_LOG 2>&1 || {
     echo "ERROR: users creation failed, examine the log"
     cat "$SETUP_LOG"
+    cat "$PG_LOG"
     exit 1
 }
 
 # Create users
 psql -h localhost -p 5432 -U postgres -c "create role user1 with login" -d ldap_db >> $SETUP_LOG 2>&1 || {
     echo "ERROR: users creation failed, examine the log"
     cat "$SETUP_LOG"
+    cat "$PG_LOG"
     exit 1
 }

docker/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -ex
 
+cd /test_dir/test && /usr/bin/odyssey_test
+
 setup
 
 #ldap

sources/c.h

@@ -42,11 +42,6 @@
 #include <math.h>
 #include <stddef.h>
 
-#ifdef USE_SSL
-#include <openssl/rand.h>
-#include <openssl/sha.h>
-#endif
-
 #ifdef LDAP_FOUND
 /* OpenLDAP deprecates RFC 1823, but we want standard conformance */
 #define LDAP_DEPRECATED 1

sources/console.c

@@ -1466,11 +1466,8 @@ static inline int od_console_show_storages(od_client_t *client,
 		return NOT_OK_RESPONSE;
 	}
 
-	od_instance_t *instance = router->global->instance;
 	od_rules_t *rules = &router->rules;
 
-	char data[64];
-	int data_len;
 	int rc;
 	int offset;
 

sources/odyssey.h

@@ -7,11 +7,12 @@
  * Scalable PostgreSQL connection pooler.
  */
 
+#include "sources/c.h"
+#include "sources/postgres.h"
+
 #include <kiwi.h>
 #include <machinarium.h>
 
-#include "sources/c.h"
-
 #include "sources/common_const.h"
 #include "sources/misc.h"
 
@@ -52,7 +53,6 @@
 #include "sources/readahead.h"
 #include "sources/io.h"
 #include "sources/dns.h"
-#include "sources/postgres.h"
 
 #include "sources/attribute.h"
 

test/machinarium/ca.crt

@@ -1,16 +1,35 @@
 -----BEGIN CERTIFICATE-----
-MIICejCCAeOgAwIBAgIJAP7YcGoEJsk2MA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
-BAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxDzANBgNVBAMMBnBtd2thYTAeFw0xNzA0MDUxNDM0MDFa
-Fw0yNzA0MDMxNDM0MDFaMFYxCzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0
-YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMM
-BnBtd2thYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArlzFCHcb6aX2UY9A
-MvQkRwR0h04h6QOMww5qgLhrROnVcvGFRLPr1YJIuDEUZ1m22AQN4l15pnDRcI/g
-KCEZ5ZkVNjFtNZG1ZLF2lGflPwo+WxeAValihp1OvTp7Hzv4N4cJrq6nyYfq6yMO
-ZhVunL9B/x8Plx6yaRowU3Hf9aECAwEAAaNQME4wHQYDVR0OBBYEFABI9uGacyu0
-cOz4RRYsId25cu/EMB8GA1UdIwQYMBaAFABI9uGacyu0cOz4RRYsId25cu/EMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEAf9ruvFcEWdlnxTPUzBcWqkfL
-NSzqhUa/RV8T8B+mria0NQl+JRRyItqJkb33nU5WgEP5EIkps1IPe5I2MCDicqiN
-+ZWjiFzOXTRHFf2+JPUQ/ps1OiNmbsV87Qw401fC79OFwvHwsnre3xcRL2F9y8/M
-weUNGDSshxEEv33vFw4=
+MIIGGzCCBAOgAwIBAgIUc6ssOPovus3FU1kO0G5iXB/6CwIwDQYJKoZIhvcNAQEL
+BQAwgZwxCzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQH
+DARFa2F0MSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNV
+BAsMBnJlc2hrZTEPMA0GA1UEAwwGcmVzaGtlMSQwIgYJKoZIhvcNAQkBFhVyZXNo
+a2VAeWFuZGV4LXRlYW0ucnUwHhcNMjExMjA1MTQxMDQ0WhcNMjIxMjA1MTQxMDQ0
+WjCBnDELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAcM
+BEVrYXQxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UE
+CwwGcmVzaGtlMQ8wDQYDVQQDDAZyZXNoa2UxJDAiBgkqhkiG9w0BCQEWFXJlc2hr
+ZUB5YW5kZXgtdGVhbS5ydTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AM5qlOVceq3YuekNGIDZ1VaruIZjccP63dPRJTFyCOtVhCNFLiZPbHpg+GH1S0G+
+FwrO5jk67w8HXEv8/7LPTl/JxrB8bZVDIoCGsw2k6ewt7N02BlI7Tw9FAs2/fziX
+JvvAxFtPfagqA2+x/6USIFO5Z12ojQS9rFBfT//gjzXg5HTc1vlPN4k4wWYzZcjh
+8HMcGjJ4P+0i35arHE8YlknFmGeI1iQ6ebTw6mqDaY+pvgcPljJ6V6p8FDAd72ny
+IAryhTp3lJa0C1czB+qstviNY3V75UcPngmlfEZqcRfwdBeOYHgn9evTxmsGW4qa
+g47vBbVFj/nNFDJHvuGHXy4/VfrAudRG0Sl+iHINGEuPPknojolGKBfGY/MADGhz
+gereiwfQAHiUN9td0ISzeU2cTUjDuN27dakn6wWcxgyknsadJrZhjlzp8GgcpVrZ
+BTmNjwgC2MS3+ACgqfnkPo4Tmk6egtLtR0rgUtoLwXKUxgqgx+LlXF2l4CFBuukQ
+5Q9TSQO812JzXE7gMYkZC3pSDMpNN6VWQpUyPHmGSCcWR7KS25mf3UEctMdSdtxY
+z/KnqVOa1rsSvUl8Wz6DVyFVJW7w1M1qFrxs7cr83PYO3KnnxNrJpKuLbP6ehJyH
+qRdzYVtvaAnt1UfwBsvx63Ld/vfkYVD51TheQRPt0+QLAgMBAAGjUzBRMB0GA1Ud
+DgQWBBSm+Luhee7xd0ZPzykmF2SXl8PGvjAfBgNVHSMEGDAWgBSm+Luhee7xd0ZP
+zykmF2SXl8PGvjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQDK
+e3du7+EHZHikt33Xbyc4ijNMt5IwC3K+RdMfDg50nRaRuW9Ep38mEREZNB+MZP2j
+yBtCMcSCRzPXUStEUzCeGrH2HZ7pn0GQNwIDrMAGULVsRbBYsA+ZlMUQv5CMAgIe
+Cy1wIqyBb8gY6caGJx4qZki4raQYZwnsxgfqG0QZmZkfgL0B8XZdFKtiu/J10puG
+wC8xQcKfgqGIYYrn1clFH3fCpYkYPmAOdcZ81CSppp/lNhDub1sUQOalb5jEcOqh
+FuS0LvoQnHxumnH8yt1qTIrgLDL04zn3ylWYL+u97wn909CVvUr0UhsQSLtrrAeu
+PGbevnaVyr2Q5BxF6DXecjki42sg+Qrd0GL4uFJdyVcdcHcahiw4kS3PMdNxUNHB
+csQ6ngFsUesZYEwe4zyjyaG5YMp+Ezcb6ACwYW+3J+3W4mqs+lAz0yLWzja91aMf
+8QQ2V6EsbWt31cnmIcQhtfsc1NmO4NAL2+2pbLf/0AGIDgx6Id8PJIgYpf2/0QQZ
+9t98iewegw4HYBpl5UsOfjj4/1aEdxgQkGgyL5PgEAN5m6YZbtZf3AtdzJmvAKWX
+Ond4k3Kg6/FGXNDX16NMerHSKSJrR2O8WmXaIEzNXu2cNEmbNOEOWcAFoFUcEJw6
+wraCDWPiqRjOa2YJsfnZjdW2Sleb1x8RIF9QJfq5hA==
 -----END CERTIFICATE-----

test/machinarium/client.crt

@@ -1,14 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIICIzCCAYwCCQDn0mFymdsfQDANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJS
-VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMQ8wDQYDVQQDDAZwbXdrYWEwHhcNMTcwNDA1MTQzOTQ1WhcNMTcw
-NTA1MTQzOTQ1WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwKU29tZS1TdGF0ZTEh
-MB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ8wDQYDVQQDDAZwbXdr
-YWEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPPX7kL7VyNl9eLluKXOxko
-pRG2KU1Q1olmhQc7BEh8JwD13Yv/MFyHHsm1PllnzLcgUR7axeY1bsmQcHTtfJ+Z
-hIqYo6/6dShJ1OGLct1OqhmaBstJy/3Rm6b88CiEwolEdG78oK1/dUz0M3IZtG2O
-0LL3m2OseRha9J79B4cHAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAeHU3qz94LWc8
-lnIEAYMoVeExGuHeEARRcNYHCzdfLZkopmactxx3k0VFCmxex3kmH4huWE0Eh9IW
-K7F9U701jmhUQLa5p0wj/JGlMelZz/Wmjp02odBtN6neAJFTnv4WzJ9oHTvlKA51
-3VduIL64VUs2cQVfwFToUyN0vh8jGm4=
+MIIFnTCCA4UCAQIwDQYJKoZIhvcNAQELBQAwgZwxCzAJBgNVBAYTAlJVMRMwEQYD
+VQQIDApTb21lLVN0YXRlMQ0wCwYDVQQHDARFa2F0MSEwHwYDVQQKDBhJbnRlcm5l
+dCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAsMBnJlc2hrZTEPMA0GA1UEAwwGcmVz
+aGtlMSQwIgYJKoZIhvcNAQkBFhVyZXNoa2VAeWFuZGV4LXRlYW0ucnUwHhcNMjEx
+MjA1MTQxMTI5WhcNMjIxMjA1MTQxMTI5WjCBizELMAkGA1UEBhMCUlUxEzARBgNV
+BAgMClNvbWUtU3RhdGUxDTALBgNVBAcMBEVrYXQxITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGcmVzaGtlMSQwIgYJKoZIhvcNAQkB
+FhVyZXNoa2VAeWFuZGV4LXRlYW0ucnUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQD1k02ZCv+ybicuAKTKGGpIKau2zTUu6xKuvwiz+JJHNtGKlxm88kI7
+rv4vyFd6XcdGSuMtvfb0y+JAd13VjW1S/yob29ksw5FX8RCqlAIf4s/PYcdZ7guW
+pJo0yAn02B4KWjUUH45pNTlmOdknJnEijpVPfvAw8OUuFKfdCE5CJPYgG8E/0wDg
+z0y7NJxCTWSEHRfukCGQdhtsLCxm2Dq/j/uG70d8104ErNXFlJZ86WzOX9+lcIV8
+qcoFRkMMxeMtFs24VkXFoz+gqz7QFXde/g12WHjQAx+nu6jAsHBp5daKGDOKUr/0
+hrNrjSpXu0o5vI5tbkasz2gNUwyHEapTisiUAaozy1WU2Nup1JlDhKEozRlCRh5W
+2/SmguMjNV8Osi7KAUaCBH0U6hC6unUcTX69NBiU75Ueq3+DyR93npPgVaTI8nKn
+8Pjx2crxDe6MafPAnU91ifjU0WfyI1RsGeQO2/BVqBX4maHbEIEgoUpoVPxnbBGj
+Cg7EZONMsHZ8rq6ZRdAgTZ9xoWlhujg1pX9dkqTj3Tw4jNTJCUzpAFZNlbl6lBs2
+YDGxYvSwt/Ql1TTGr6r4MzJtYQqQ46RZef6/7hFpRhMqzyzepF2mktlNjjI09mfP
+zeoNXLyWOseBMaEkCEOtH2gFlG5RLu/Jiet6dNocjRHwVP6n0Fr/cQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4ICAQCVIjt1SM8bqpe0lNao7rJ6Lb18awUhjo+0r7tuAHRb
+P6EK4/kjd4NKtBXSOXCQuV5D5TEdiAPW7AI7+HxELOowjnazAaX4tDQcRFlZn9aI
+malkN4g/3nc4b+VK4rejcaMnyOA2BZNEMTXtvXcqsNUxIW9ai5lvf37CJ6pcqyEx
+h6f6EbmNaniZK04uMmuy6bAEC8hJMXOm4GuNnxFolovNObvasn4krSrQeSu8YH8o
+9MiI8yNtMBP/CCOViIyP5IrgvJM7+hRUGJAuTgL4mRaF6k0pvEI+gJqfFE7LSDQD
+m7sBljQDNCDIO8BXwoBw5Iqa7jmYzEBFRLparc8V58bZ2KxnabWntXRkSeBo2x4u
+LtpAo1L8aa08jhvmQmAQEslYXqleVzRKYT0UGmvwv5O2ZMrWN2uJ+CQi9zsyBRJj
+gtKw8ch8XB/7iN9SwoAoKKjuFfZcmkNYaDO2PmVI7qTACVksc923V2+1piOoUYqs
+40svxaclLZuEAjsuNhyA3xSe61XcTWJfbWDGS2Suso3ukqK3ONFbOaAqzEaao3hp
+lfPTsWxcPWKnTkq+lOm1+LcOXPvHIEw7bfvRBiOedCubVLnghsKNb26LdzMkv+SV
+OH8gpb5/yCgLV9qIcIz9MG0KGQoeIgNGL1iaQ9gYun7mPGjaLp7Xyn7O3bDOhy1Q
+gQ==
 -----END CERTIFICATE-----

test/machinarium/client.key

@@ -1,15 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

test/machinarium/server.crt

@@ -1,16 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIICejCCAeOgAwIBAgIJAP7YcGoEJsk2MA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
-BAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxDzANBgNVBAMMBnBtd2thYTAeFw0xNzA0MDUxNDM0MDFa
-Fw0yNzA0MDMxNDM0MDFaMFYxCzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0
-YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMM
-BnBtd2thYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArlzFCHcb6aX2UY9A
-MvQkRwR0h04h6QOMww5qgLhrROnVcvGFRLPr1YJIuDEUZ1m22AQN4l15pnDRcI/g
-KCEZ5ZkVNjFtNZG1ZLF2lGflPwo+WxeAValihp1OvTp7Hzv4N4cJrq6nyYfq6yMO
-ZhVunL9B/x8Plx6yaRowU3Hf9aECAwEAAaNQME4wHQYDVR0OBBYEFABI9uGacyu0
-cOz4RRYsId25cu/EMB8GA1UdIwQYMBaAFABI9uGacyu0cOz4RRYsId25cu/EMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEAf9ruvFcEWdlnxTPUzBcWqkfL
-NSzqhUa/RV8T8B+mria0NQl+JRRyItqJkb33nU5WgEP5EIkps1IPe5I2MCDicqiN
-+ZWjiFzOXTRHFf2+JPUQ/ps1OiNmbsV87Qw401fC79OFwvHwsnre3xcRL2F9y8/M
-weUNGDSshxEEv33vFw4=
+MIIFnTCCA4UCAQEwDQYJKoZIhvcNAQELBQAwgZwxCzAJBgNVBAYTAlJVMRMwEQYD
+VQQIDApTb21lLVN0YXRlMQ0wCwYDVQQHDARFa2F0MSEwHwYDVQQKDBhJbnRlcm5l
+dCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAsMBnJlc2hrZTEPMA0GA1UEAwwGcmVz
+aGtlMSQwIgYJKoZIhvcNAQkBFhVyZXNoa2VAeWFuZGV4LXRlYW0ucnUwHhcNMjEx
+MjA1MTQxMTA4WhcNMjIxMjA1MTQxMTA4WjCBizELMAkGA1UEBhMCUlUxEzARBgNV
+BAgMClNvbWUtU3RhdGUxDTALBgNVBAcMBEVrYXQxITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGcmVzaGtlMSQwIgYJKoZIhvcNAQkB
+FhVyZXNoa2VAeWFuZGV4LXRlYW0ucnUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQChh5E7yHqvuIDs3nCAD0SBEVNdwTDsHsVFMDW2PGFG0MGLJgVGldoh
+5mLNUCAaZIZNq9U8HTrZ0SMp7iCFkndjp+R4t/09F3UJLrEesJjpShBmA53QGlMJ
+3Z6IRRq8ej9wsFK5tick/FhGUYj/RbPJLt58FFWDDo2QXw8X58yKpertdPIj6rRz
+AbSW0Y2t4uUfP2ZFY8LVfC4KuR/wXt1TYDg+zwfAYTvDt4YKJZZOxZ0p2zkyDr43
+cg77jtRpZ9WfToTks4d3ycxYax96qZfzlHOK5ywAbJMVzxdpxR9D8uglnEkvXZoo
+sh1xCLiAuaCEnwSZRF1IXQsH546EeraHGZeInM8MAiIpxyi32FCwE6vc2a7hEkLo
+wgFD+12xiDaDLqf6DQstNhNezfahCLqgaYtxhVPaQbukAwVKtPmLRmfiTCs92+On
+4NE1e/bpRKDbVFcJV1EW0JuKM9EfgPIHv6TPO+ccR5lmKFgjdSpDnYXw8Aonbqow
+kDj7DqwNnb9CcMZGRw+8CCBhBsrcCuzmgmMrV5nuGywA6dbhqyjVB/HRCf+L5YSa
+7prPBzkB3FgWX/dxrblG3cXLXulP2SfjeGyC6FpLIJfOdoAylF5al3+6cJgots87
+oE0lvm1p8JmbOJswL4H5JZ/D+UQJGPykMiLr8pj3Ge2BVnWbOnPpSQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4ICAQCIQ7wGUPmHV2XPhPXvIl4HGgeDcttb8y9xq/GEsdPb
+0cuJopa8WsJCfl46d3pKmudVAKxTuDMHpAPtT1+Blo5Dby+CxXs1j/6+1TrWa9wN
+5mH7wfB/0pLIc3h/r2XIm31S3KvUhZ0SK1E/k6NjpHAwsAUS1VXs6zfbqDH/ZD9/
+6bPPQR4vidRma5x1RAjwasDvnBCuf1pJCxTlQMuf+qFyaoI7/i+n5GNyZPdmIica
+AJO79oe1R0rf9Vf68M9hYGjI19t/NfDqi912eWc1y8HQzABua37ZO46b0XLlX7bY
+PrpZ70pcpyOkkUJDZWiI0E7Ct0OIfgrsbRRjx5ukseB2lPS3nACi/Ya+CJH7qGXN
+zdofWkN9ef1SOkMHwzq2u/gZPq9xjHVuC0wc5/tWKfUOADiLU7V6dC27J55YfVcu
+xq0GxhRSDwUhdkJptba60lrY6FtS3zB9qsuaE7+Qr4ij+WiIMkr1tsYCtBqjYVH+
+So3InA2LfinMs83QNw/vrOF5ju8PHMzz+1M/TiKLjYQN1e7WVCXKDvhinaHxedYp
+z41ghbcxLTtE23LTZoO1mVefLazOrzcmpSz+ilghLAU61zr2BOfA9sQTV4NlwGog
+jmM0mP3HhNHI2Qp1QU82ZmvLzM7qL7GQSHke12y/FBzCl1yZCA6Ksj1B31bvYGI4
+ew==
 -----END CERTIFICATE-----