diff --git a/data/tls/ca.cnf b/data/tls/ca.cnf
new file mode 100644
index 000000000..185a0502d
--- /dev/null
+++ b/data/tls/ca.cnf
@@ -0,0 +1,39 @@
+[ ca ]
+default_ca = local_ca
+
+[ local_ca ]
+default_crl_days = 3650
+default_days = 3650
+
+policy = local_ca_policy
+x509_extensions = local_ca_extensions
+copy_extensions = copy
+
+[ local_ca_policy ]
+commonName = supplied
+stateOrProvinceName = supplied
+countryName = supplied
+emailAddress = supplied
+organizationName = supplied
+organizationalUnitName = supplied
+
+[ local_ca_extensions ]
+basicConstraints = CA:false
+
+[ req ]
+default_bits = 2048
+default_md = sha256
+prompt = no
+distinguished_name = root_ca_distinguished_name
+x509_extensions = root_ca_extensions
+
+[ root_ca_distinguished_name ]
+commonName = asd
+stateOrProvinceName = Bavaria
+countryName = DE
+emailAddress = contact@itsyscom.com
+organizationName = ITsysCOM
+organizationalUnitName = root
+
+[ root_ca_extensions ]
+basicConstraints = CA:true
\ No newline at end of file
diff --git a/data/tls/ca.crt b/data/tls/ca.crt
index 6b305bf74..39642ee96 100644
--- a/data/tls/ca.crt
+++ b/data/tls/ca.crt
@@ -1,25 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIEITCCAwmgAwIBAgIUA84jP36eRKSIEyEPbM2bQ9W2wWMwDQYJKoZIhvcNAQEL
-BQAwgZQxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMRgwFgYDVQQHDA9C
-YWQgUmVpY2hlbmhhbGwxETAPBgNVBAoMCElUc3lzQ09NMQ0wCwYDVQQLDARyb290
-MRIwEAYDVQQDDAlsb2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRz
-eXNjb20uY29tMB4XDTIwMDgyMDA5MTczMVoXDTMwMDgxODA5MTczMVowgZQxCzAJ
-BgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMRgwFgYDVQQHDA9CYWQgUmVpY2hl
-bmhhbGwxETAPBgNVBAoMCElUc3lzQ09NMQ0wCwYDVQQLDARyb290MRIwEAYDVQQD
-DAlsb2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzRI7KnqGGms9K/cgjTT1
-u53+WiDGGJymVz5cjhbRv1dx/4LqDvUeGaGvDZb0ZTqjT3Hlqp8r93AwLjTXTCj3
-NevSK/uqYPAQ2Tq4jf/IVyU2Ya8EuXIrktk2R12eMauPOpnUu5Nyt+5mvE3fCIgj
-Tk/atrREKPBfOF7Jm/G1yLjHCXm6BqiR+lpX4EQACXXY+6de2Cko/TuvwMT76I5i
-quojueROHNMKsKUMT3Id+cMXKLcVzwKqEUqIF5I8bP9XQnd4jYoifrX2UMiZpzvk
-DDCOHmI75QO0RnuT5ebSYO6W1DkrbE2vrFvS8cT5cEIN7+TnnR9/vFxBUM9k4vFY
-+QIDAQABo2kwZzAdBgNVHQ4EFgQURQMa81J1PEbeaI+VV/QXVoRhtJowHwYDVR0j
-BBgwFoAURQMa81J1PEbeaI+VV/QXVoRhtJowDwYDVR0TAQH/BAUwAwEB/zAUBgNV
-HREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEBACGzLugP3l6zJ/iF
-JTAz7yGGEz3eru2oeoHCRje+Pc86ZTu+sg6d7aop+nMdqtnUBthehuhZfUFp5TKQ
-szh401kbS30rXLT8zz7Hf0rEJvZBkqGXOd5ZGYKvOBP4IrGLtUWDpLjQM9cwoUTY
-51oYpagz8QKCwAvepeipzj/eoKiEu0XXMtn340iH+Q6XFhGLnhRCOgBMed3uXsq4
-bhLDX7iUF/c7769nkBu0gUloWKsTb3fLZvaSAjsIM8pAaRwNwn1UDw2K66V1e/YS
-x0PP4uRZGnvUUks1roSvxqDKNxiZwEcc1hNnc7h25aRIJXzVbJqv1f8tZbbCFMV7
-eXpGWco=
+MIIDezCCAmOgAwIBAgIJALOeCziTTip5MA0GCSqGSIb3DQEBCwUAMHQxDDAKBgNV
+BAMMA2FzZDEQMA4GA1UECAwHQmF2YXJpYTELMAkGA1UEBhMCREUxIzAhBgkqhkiG
+9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29tMREwDwYDVQQKDAhJVHN5c0NPTTEN
+MAsGA1UECwwEcm9vdDAeFw0yMDA4MjQwOTQ2NTlaFw0zMDA4MjIwOTQ2NTlaMHQx
+DDAKBgNVBAMMA2FzZDEQMA4GA1UECAwHQmF2YXJpYTELMAkGA1UEBhMCREUxIzAh
+BgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29tMREwDwYDVQQKDAhJVHN5
+c0NPTTENMAsGA1UECwwEcm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJonQ51qMAT8jWQXjKw76Bn2gSHrGcbFtQsnxL4Cb5YTe4h31aEOZFR9z/kM
+1FxtRKcyG/Hh1ccCB0Y3P6joX1vWpEpfKbYkMie/vIDYNyIpUdrpWvxzA0ouyZL0
+1x1OAIi7fy7YfLw/ON4Uzlzu5XIYzIZgV/6WYVqdRLQWUxzSJbnrD1BuWzXdcYGz
+SHHa2o7cnFZaCvjNc4wC3dSmbecLROkFbLwbslY8xydz2xXh+E59dbICm32G7a0Z
+oIiJ+MPc68gO4btyA44/xHfPN2YohTapqdB1obybdGWFtsfNcmhhuGE9nCKnyCD5
+Pyf6ks5rdP8asnlAk1pyAA7AGnsCAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAUXMgD7Tpra1PZZCfmV2ZrvM9bPI1OoIcOSUwkbFRhAo1
+ma/FI7/4ZyeMKM9caGGTL9y6bpwLS27nEQgQKjsCrZ1Eob2sBwT8dqnidONcjwY2
+8orPWslo4H9lFd67+OOPe2+xIj1WB2NU0JV2F5CVSpGRK0eHjwoIhURqE1CcUA3n
+jsw+eaJdqVTR6qOn/MhoBbRqw3CF4W6HXk5r1wKJxS+MEeVawBW3KuiPfsI1IQSe
+fA1MU+S/NckJvJRWK9zoJ0tLUpZiGBLlKQ+edyZFkvsa6u2JkTABIF1hsmGXEVY9
+GFaQ9wpQ9NSMp0ovNkC+N90S5aSWpkT4nSnXyzQnVg==
 -----END CERTIFICATE-----
diff --git a/data/tls/client.cnf b/data/tls/client.cnf
new file mode 100644
index 000000000..3e9c4211b
--- /dev/null
+++ b/data/tls/client.cnf
@@ -0,0 +1,19 @@
+[ req ]
+prompt = no
+distinguished_name = server_distinguished_name
+req_extensions = v3_req
+
+[ server_distinguished_name ]
+commonName = localhost
+stateOrProvinceName = Bavaria
+countryName = DE
+emailAddress = contact@itsyscom.com
+organizationName = ITsysCOM
+organizationalUnitName = client
+
+[ v3_req ]
+subjectAltName = @alt_names
+
+[ alt_names ]
+DNS.0 = localhost
+IP.0 = 127.0.0.1
diff --git a/data/tls/client.crt b/data/tls/client.crt
index d2f5235ad..19983aa7a 100644
--- a/data/tls/client.crt
+++ b/data/tls/client.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+9LgSisY=
 -----END CERTIFICATE-----
diff --git a/data/tls/client.key b/data/tls/client.key
index d150468d4..ae92b0bbb 100644
--- a/data/tls/client.key
+++ b/data/tls/client.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSeniuVeDrJ4fl
-lQ4ofLJjZv9+e2+z5TZdxBEjmDnN0tCkyDO2X2yiD9NC5jZFp5K8VPsrBMFf27tL
-KQ0x4CR3zouHSfBYLSHJVa2FOrnPvUlXUSxDBuCsMLE///cJtDfowFNvco71gzcw
-UDZwrYy1Wb7+3yeP2xNOHtzHukEKEIIAGGlUkdxNLtN0BTW24hmfl0uTlaFmh4cH
-4CVfnJaJlh4yt6RUKhVrgVfpUwOi2tzORVkPMbRuQ8gyDbLid21+D7DlVpOB6WPu
-xY4FH/4hFofln7z+z/6A7kBr+klVIYQACAZU0U+cWVP584F+z8jUF1idwKDpnbpN
-wGmupsEBAgMBAAECggEAbTrHxFmnFwJ14Sxgo5xLC5EZSK+QgcCTXUfySRGn9evR
-AaMwSxXsj5I85fwI8E8NtJU5n9Kg9DlZUqEkStzysAZNnNE/XNNXNGA1Y+3dHjUy
-iZEDsmkwUcwXQIp6zttrJGwjILRIAputGXKXPhSi8D56A1UV9+8Obr1PgItlU23a
-rWb38vIz600N2wr6N/nBi5PrW6P+zMzpoAEPb3uRJq4HUDx55r5Lco6dmKEFsBBw
-KD6Yl2RknuSteGO8KI0nw09uVPI3ApQUNhy/oTgCLp4GNXRr+wrnHm8GquE7LllM
-rZULE7jLZuG6QGzQzbWI5XfMVKhbU5TtWpnj4QylXQKBgQDvbb50KGyxFFVGvcag
-rb70kSwwhtPEh+cMi2EDRQqclgfhpJ30XEWQtTFPckXv2FEVgo/GIbPefCk586sU
-tTGu1s2j6oDlk6e472W3LSXH35pSNfd7tg7EmmCkfMfDxAqdaGqT2vuyHwkiRbE6
-2TrOxep0XOmXB/nx/DWODPo3uwKBgQDhC8d81O++TYyXuR77YV5iutfF6l8TTmeW
-HGbuQP7TpQ4wCxKDXJ/sczd4rOT4oCr7ajfMpQeKqpCqjVlkqTta6ts4R5kj6Pq8
-PYwo9pW1bzXEG6ZJhdJwbGltGitsYItboU3phE4wW7oXFmzatqpmykEUmmflN8yW
-My8s/beocwKBgETbqwp9FcVXs67EpXtQfLqZhbvvCrha3XgeHahzEro1685ZKZQ9
-dURI2AWhN7vi2m71PaQdzT0POEwSaAFsmv1NiZa6updL/9CQCRDFSzhQdnFuU96g
-XV7thx3HRSxoFSVwAjbDo992TYotwOrLzr3o7aTJk+R7xsZxYnWYBd5BAoGALcis
-tAvKHog+YxupXvEHN8TVYxF0eEQKNPLgSfZ1IW/B/Co0gP8WFg+2qFlcV+yV8gJB
-CeRFLYPX3KrXFfCL/8oqAUAnurOKV0OaQTcxa/ENGjGZ2flcv7x+klCxpuHZWDHv
-3OMq2RHAQTQxvylMb48UQHHNU0fP2nrdTSTs+VsCgYEAsoFm1K0OgJzfgcdUvXFo
-NdHR/l1MXuKogSFVNSr/7Houaha/Jk5zDA+8GsRuN7LfTnoqqMRZ1cxpBJI7xGAR
-X3rkq+1Q7pMK84JN3/qDN0sbLxqhjyNJkxDtLgLwD1AIeCL8wcYnBRvrXJzKu/+9
-PnKgm4WRUxZ2Bbq2J8rJHMw=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCzXOBVXNkYmxK0
+kohZ022bHKRLCgm/Xhcqjie/Xb7lPV2l+0oMJ5rq/VLJeA7TbMlDkZ2E6e2l5PpY
+di4nXWT1iz6Cmzf1A4NvfSGJz38du+jEBfTOk4W+aQQy43arO5o+TYd6GZtmJMX4
+ihWFPvz1ry2m8r5kyHdg7N17d/JCkd1PD54RBTMg8w7AY9FWZaVmimmyA2o59wQj
+Z2Pg25U+DYH55RDtCNcgnOKN9zYSg9N3JhhRp1CX3gmtUlEwe0TNWB64sqhWPT81
+zfV7fjBpZq1eWIOsKqLDLZM8eXROrisDQi2z/KpVm4va7/S5E0GWsEb99FD5Vell
+l1kXYYcRAgMBAAECggEAByPuZleQ6PLbdsbSmMja9y7Xt4kJxE2JnI8WM/8WZ2fe
+/4mWdA9rkmlNT2nxJSeSh5cXb0AkztLjyHvD8Js+Nqw5a9ekDaP7KogPur3A8L0X
+Uh5ulX6391GU8jWt9rkjtdE+UHUOg615GCDfJHPSfDFiHuBRBhAY+InVc2HeChpV
+ZgWifhgrfzXhk7ziNP6VmRb2pV1LtAV3B5a8fX4kmoztzVy+OZ/nHAAGNg0WsW+P
+SOu5RPErKsDjVLycFLMDWn6Pd5x0jNx8tOykCqtFAF3HxeqlFIOMqb3uVeJm01Lm
+xxR0LPz4y3meXeLMwTJMXu0Jy5SUipUFGN8j5wVqpQKBgQDZRHL/4WKaOpkDd92B
+RTODbtI70yybhqnFn6u6ejfmjDB4csTxcGM1YClwhKQiedwiS/ZXnTDxHzc/3VbZ
+a/BGx81ZsgCYJIHD5XyeU9yPuirRU6Kd2wBawWL1j5EC6yj5OhXKJuu2ALZFhrCt
+GDHPuhajQQsZp8ELGy6Vhfnj9wKBgQDTVo4LnlmJW/Z4oOMkN/l1ThwX2+ayT+NE
+fqdXvbWhFf5dMn2sc7SSjWoaZ/uTsSkkai4Q5z8entDGtZfkW71S2Oex4CQpxeSJ
+/dx7CXo3Cv/LlkwGR6J2lhftqbIco2ynb5C+Evz1dxl9t+w0sPepq8se0fhpvMYP
+EWCLOu2bNwKBgHvKACvCYse081GCjfYFU6BjF+12GEhUpY4vt0x8LjVxUnyOB5/4
+hM34iCPPryTlgYMY/LZWnXgEbRo6Ji2izjfFxz5/qM8Gndjbe/FJnrVVQOgbWt/N
+05nh7Vwz/E9JZQL7EUcofcwpA7EBWNCGpHrSb+t8N7LaXabSSexvdT1pAoGAdQcy
+I2bth+2/326gOVcxsW6uidvAtS8d17kW67Rm1qv6LhuekheEf78FaVf5bQCmmr6d
+gci8IDWrwM2gLdlLToxESTCodeVat7s3E37dCYvyuAcjVDro0SguWfIlakxpB5L1
+IPwczcTE/eQSTd9NVcyG7yswl0TsnD1wK8lW+CMCgYB480xtZxIQabyUwwoRXeIh
+WNcQZwMmf8CvKCEMr8R2cwmTYT9yY2ENsyJ0hrcaB9dI3fvakgBq5kVNirl4Zs6A
+V+9pgLoN/CXqkySTunKuv1YpVS2kTF0GE1EDVeRXdIeKifG288mwRlI9oWNIfhc/
+0wZphNrjs3+8xILIcJE7WQ==
 -----END PRIVATE KEY-----
diff --git a/data/tls/generate_certificate.sh b/data/tls/generate_certificate.sh
index d1a6f06f1..94ec5e700 100755
--- a/data/tls/generate_certificate.sh
+++ b/data/tls/generate_certificate.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 
 # Generate self signed root CA cert
-openssl req -nodes -x509 -newkey rsa:2048 -days 3650 -keyout ca.key -out ca.crt -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=root/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost"
+openssl req -nodes -x509 -newkey rsa:2048 -days 3650 -keyout ca.key -out ca.crt -extensions root_ca_extensions -config ./ca.cnf
 
 # Generate server cert to be signed
-openssl req -nodes -newkey rsa:2048 -days 3650 -keyout server.key -out server.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=server/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost"
+openssl req -nodes -newkey rsa:2048 -days 3650 -keyout server.key -out server.csr -extensions v3_req -config ./server.cnf
 
 # Sign the server cert
-openssl x509 -req -in server.csr -days 3650 -CA  ca.crt -CAkey ca.key -CAcreateserial -out server.crt
+openssl x509 -req -in server.csr -days 3650 -CA  ca.crt -CAkey ca.key -CAcreateserial -out server.crt -extfile ./server.cnf  -extensions v3_req
 
 # Generate client cert to be signed
-openssl req -nodes -newkey rsa:2048 -days 3650 -keyout client.key -out client.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=client/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost"
+openssl req -nodes -newkey rsa:2048 -days 3650 -keyout client.key -out client.csr -extensions v3_req -config ./client.cnf
 
 # Sign the client cert
-openssl x509 -req -in client.csr -days 3650 -CA ca.crt -CAkey ca.key -CAserial ca.srl -out client.crt
+openssl x509 -req -in client.csr -days 3650 -CA ca.crt -CAkey ca.key -CAserial ca.srl -out client.crt  -extfile ./client.cnf  -extensions v3_req
 
 rm ca.key ca.srl server.csr client.csr
diff --git a/data/tls/server.cnf b/data/tls/server.cnf
new file mode 100644
index 000000000..8929ce347
--- /dev/null
+++ b/data/tls/server.cnf
@@ -0,0 +1,24 @@
+[ req ]
+prompt = no
+distinguished_name = server_distinguished_name
+req_extensions = v3_req
+
+[ server_distinguished_name ]
+commonName = localhost
+stateOrProvinceName = Bavaria
+countryName = DE
+emailAddress = contact@itsyscom.com
+organizationName = ITsysCOM
+organizationalUnitName = server
+
+[ v3_req ]
+subjectAltName = @alt_names
+
+[ alt_names ]
+DNS.0 = localhost
+IP.0 = 127.0.0.1
+
+
+
+
+
diff --git a/data/tls/server.crt b/data/tls/server.crt
index 6a1481bb8..b8176e627 100644
--- a/data/tls/server.crt
+++ b/data/tls/server.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+1IsvABk=
 -----END CERTIFICATE-----
diff --git a/data/tls/server.key b/data/tls/server.key
index 9ceac8105..92da7351b 100644
--- a/data/tls/server.key
+++ b/data/tls/server.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz3eu9H4AjRYp8
-k7C2UU+tnCu8LUedFRvYxtGa/oPBg+gbEPpIOWXFzlBAdM5WLsrQZgfCj2eA6gm0
-ZrsgTEnwhDqcOgjYzmgRsRkxyz4Mk1w5honj0MrZXe1v2tGEwU+6itC/YzQ6jnf/
-j4hjiU5B5kdd2MtKL7BUjQg631eBL4gj97UoqXyWwmi72EKU+Leer5y2mjttoVD9
-L4vAj0mBJT/guKuypaJQTlpJYD9J0MTGg6Jqu3yGFtb2uArrwt14p1JQrgpRQEvK
-FYKqwUnYJ7qDu//81/i6xaoXEZX0JOxaF5Azyia0pdfqUKAnIXInPyMoixFQ/XiR
-umEKOOPJAgMBAAECggEAbSTE38Y1ozGXj3CvUnKUvux9PXrccd1VQH2kw0CeAtdg
-CMyMkzcBIr7Gw9YdPv614y+GlfEfBYL+0JFmC3s/gss6JYKxy520WMf2WdjSlh71
-X5LcKXmRHcV5Rt6pNL14++EwOnKgRsgc2N7oDD5NVn+93pym/yVhAm1yCQdtud1x
-FUxRlvTgG4ueG2FHjIhHmMWsAMzkANsQBu0cL88NIwITgdNODBmWrPo8XgUDatiS
-64rwEhS+a1Z5t9w4nNzm3cndP7aIwFGAXvC25fqDMW5kl8OrNaOw+itF+zT9Fscj
-fIqOo48NGDpYnmqh2eMi+OnPhJVSvrFh9Wyn0juwAQKBgQDiwfGlAQEzNUD6z9Pv
-s86Y66DyCOvncIgIDOlLYZQNJBkFUurlxFx23pmdSxIqV3T93uv7a8l49ZYvvRbC
-FZrBKX87oUtX/iF0ifm9kQv7CGDSrqEikJFfBKSG0caqFqgNQFCmkVBkX/qF7qPz
-x5nxvKvyBhFta7Wn+PTqD6TcQQKBgQDLD/OVDUzHjMrAvQCmAzTOGONGKa8fAtI2
-Bpd/EJRcbxPO/+GMqwfnKodpJuCI7DRX5gJ9JYnUL2Vgu+9afl4OpQ08/W7mFphS
-YYYuHVsF6mQ/L6NRPC7eUkwwkS6/6Z0/5QDhM3WVYIR8Gqfh2ejauAy538DQ1AB8
-JYa0oUHFiQKBgEGp6/HeQpyzlSeMO1E0fmUmBqtQDhAtNBcwtfYQQbE0fNJf2onC
-vQvnFhDIhnAgd0502V0rL2KJq34TgZ2eZ/v7qk54PLs0aje3JMzSTefZ2z/nNd4u
-gwpC6+nmoWLrwKplr3Usq10FtiRGoM+dQ2UPP7OMMku/XxFPNIz7DsCBAoGBAMJT
-IJqqYKiyvrFV7hHxDY6R2KWjbHgz3fFfu4kY17HhhsZYr4NLhUOeunlRgBzoVmsr
-rYQP8WeCd/TrxPIH7oD7SMDuEzvTsa9crujgpOPzXD3vm8441u1hOpJbza5QpXCo
-+X+KHGN4OzD83V5Qh/sPmPYj/8SYrWIhE1k23NdpAoGAT0yVHDjRtlprww4eh+vc
-hHEm1X3ay9OCDGXiEY2j+PXCSEFx2u5od5JfvKoON4O5BvNB5EehiqiY8/xm5p3p
-GUf1VNvkih/51iGcpzNA/KcB863XQhghs3/s4bmJF7s6Jt7vbwUgBq5qFPn5ltLG
-XeifXYvAJO+C50JjVTOm628=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6eM3eExGFUH0D
+srcQPv/35nEnVbgxsDJmp0gFQcKLs1uPG2QHZ8X1cxYg06LclgSwsDTWbtQjzvpM
+ZMU043bcekHQQvvtIUHPpSiT9+UTMBXs417q3GSJqBdXBE1+/K5l/xOeA7hjuvJe
+IMmAKvqJdiv3ZFa7fC44xFgCUtT/RW2ScGFeBPZ86Pm3tFz+xMrD0+ksPRr6QEI+
+mAnhqLEKoJnkCp3soJuHeYiu2eJ2rBv9UZnJMge7HCCp7kX9BlPsPv6vTSw5JIdF
+2/H/MzFNdsUBRIbUpCdc9iN6wNkkrkoCr5H7ggRQlwfgtfwxG2EIdPsOlBNMay1C
+cYhjCkGpAgMBAAECggEAJkiNA43op/UpZWv4l5ZHmQ6vpoK7yT/CaT7o02N33JSb
+NJtMAxU0GDtjjKPGqQEHv3q9rlScqylgS/TYZA5bJdLX1jkaXcnZKBdhaFeZqUHT
+Dopzv0Y2QejHue7BNlQMPhaLYYKkBZ2pCtgyZmTsgPJI/oaUI/PPzYnKA9gbsLin
+FZ7O8xQx9W8TXdtUymsD+M8+Qs3Anj1nYIVpKjDo3LRl+YkYNvbQJlH2nXWVGgyt
+TkJWLHtNFBH7SvWyFkUes+dp4WV9ixFXZ2TIuWYRfnacUhwlx3kFA8kA1qBOaU7S
+NwMKya/0h2IFauP2uE9MK9PMUeZ1Ar1VOueBtWpf7QKBgQDzSfBg9kwl7QTK3ltO
+sy+TK+CIsWEaRj2U9ixWhD34EgJ3zR3GLzRuhtrUhV+pNSVvQXLDQPAUbpIxKEZl
+VoBM0pBKSgsQPxKaCkA55Luqq76/UJEWR86BFUHM4j9OJNZGtHXRftPijp9+xOqC
+Aq8KPUo5/5fDuXvevZSBrj6W1wKBgQDENuvySivUFsmp/TMHX9mDs9H79m98vH7t
+LMeHJ7kXWXAiKrr11quID2a6t9Q+7s22ZoZgSWeJLoh2sKayb6DkvPvSnPEAPqmO
+2RYJm+NoVONoD9ysA8qV/0oov8ryL9LsRI4oIP833CMDwRua0042C/2QTLYfy4NB
+pxPst7lbfwKBgQC3FXJvFYqyk86ieHkQHap0v3VGiO4BHtDjE+rD5NrZn3v5+gMp
+DIcRkiyF+CTIKnWUZxVdOLYzOg6MLbnkMxd0OJVbQqNWw5BVGdfBeY983ag7Qv8c
+XEdcPsn4zF5FiVUzekSbtizv9tKyTLAJzMk7FGqSgPUN1r0QH2zttlnlmwKBgEOf
+Ee2sdjJfsBxvcHioJdRn0oRdR8rbQ3sFpbYEkJtlbWm5BDnZQ8BeXm8XD4So1Ch6
+aPEiGxaB/PG6q5hvNCngn4DUKZKGBfV/B0NEgDjimISygsCdheHv22TzxEN3C9/1
+OHDH/m0H5uFSWesfy6KAu2BRr6qBfrjPleRM5QqNAoGBANAeCsu49gSQlJuw9Kfz
+zwCqPnjCslFD+RyeIvioKdv4442W1VrrQfzleQCwBf+epAbg2HkW5TPe2y5LHmQ4
+QD4aol3acc+dDHjtwmRjV+tCu0DLeJR0mfLG8YxWgbiGUlXKyKBAoRmbZuNCJAzP
+II+P8F+O7ecnxHhTd/MhMG83
 -----END PRIVATE KEY-----