Merge pull request #78 – Convert slapdtest to package with data

https://github.com/python-ldap/python-ldap/pull/78
ECN · Dec 4, 2017 · 18f98aa · 18f98aa
2 parents 9524dd3 + 04e6f18
commit 18f98aa
Show file tree

Hide file tree

Showing 21 changed files with 334 additions and 322 deletions.
diff --git a/CHANGES b/CHANGES
@@ -71,10 +71,11 @@ and, thanks to Michael Ströder:
 * module ldif now uses functions b64encode() and b64decode()
 * fixed pickling and restoring of ReconnectLDAPObject
 
-Lib/slapdtest.py
+Lib/slapdtest
 * Automatically try some common locations for SCHEMADIR
 * Ensure server is stopped when the process exits
 * Check for LDAP schema and slapd binaries
+* slapdtest is now a package and includes testing certificates
 
 Tests/
 * Expand cidict membership test

diff --git a/Lib/slapdtest/__init__.py b/Lib/slapdtest/__init__.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+"""
+slapdtest - module for spawning test instances of OpenLDAP's slapd server
+
+See https://www.python-ldap.org/ for details.
+"""
+
+__version__ = '3.0.0b1'
+
+from slapdtest._slapdtest import SlapdObject, SlapdTestCase, SysLogHandler
+from slapdtest._slapdtest import skip_unless_ci, requires_tls
diff --git a/Lib/slapdtest.py → Lib/slapdtest/_slapdtest.py b/Lib/slapdtest.py → Lib/slapdtest/_slapdtest.py
@@ -7,8 +7,6 @@
 
 from __future__ import unicode_literals
 
-__version__ = '3.0.0b1'
-
 import os
 import socket
 import time
@@ -24,6 +22,8 @@
 import ldap
 from ldap.compat import quote_plus
 
+HERE = os.path.abspath(os.path.dirname(__file__))
+
 # a template string for generating simple slapd.conf file
 SLAPD_CONF_TEMPLATE = r"""
 serverID %(serverid)s
@@ -64,7 +64,7 @@ def identity(test_item):
     return test_item
 
 
-def skip_unless_travis(reason):
+def skip_unless_ci(reason):
     """Skip test unless test case is executed on CI like Travis CI
     """
     if os.environ.get('CI', False):
@@ -81,9 +81,9 @@ def requires_tls(skip_nss=False):
     :param skip_nss: Skip test when libldap is compiled with NSS as TLS lib
     """
     if not ldap.TLS_AVAIL:
-        return skip_unless_travis("test needs ldap.TLS_AVAIL")
+        return skip_unless_ci("test needs ldap.TLS_AVAIL")
     elif skip_nss and ldap.get_option(ldap.OPT_X_TLS_PACKAGE) == 'MozNSS':
-        return skip_unless_travis(
+        return skip_unless_ci(
             "Test doesn't work correctly with Mozilla NSS, see "
             "https://bugzilla.redhat.com/show_bug.cgi?id=1519167"
         )
@@ -191,14 +191,11 @@ def __init__(self):
         ldapi_path = os.path.join(self.testrundir, 'ldapi')
         self.ldapi_uri = "ldapi://%s" % quote_plus(ldapi_path)
         # TLS certs
-        capath = os.path.abspath(os.path.join(
-            os.getcwd(), 'Tests/certs'
-        ))
-        self.cafile = os.path.join(capath, 'ca.pem')
-        self.servercert = os.path.join(capath, 'server.pem')
-        self.serverkey = os.path.join(capath, 'server.key')
-        self.clientcert = os.path.join(capath, 'client.pem')
-        self.clientkey = os.path.join(capath, 'client.key')
+        self.cafile = os.path.join(HERE, 'certs/ca.pem')
+        self.servercert = os.path.join(HERE, 'certs/server.pem')
+        self.serverkey = os.path.join(HERE, 'certs/server.key')
+        self.clientcert = os.path.join(HERE, 'certs/client.pem')
+        self.clientkey = os.path.join(HERE, 'certs/client.key')
 
     def _check_requirements(self):
         binaries = [

diff --git a/Tests/certs/README → Lib/slapdtest/certs/README b/Tests/certs/README → Lib/slapdtest/certs/README
diff --git a/Tests/certs/ca.conf → Lib/slapdtest/certs/ca.conf b/Tests/certs/ca.conf → Lib/slapdtest/certs/ca.conf
@@ -32,15 +32,15 @@ serial = $tmpdir/$ca.crt.srl
 crlnumber = $tmpdir/$ca.crl.srl
 database = $tmpdir/$ca.db
 unique_subject = no
-default_days = 1461
+default_days = 3652
 default_md = sha256
 policy = match_pol
 email_in_dn = no
 preserve = no
 name_opt = $name_opt
 cert_opt = ca_default
 copy_extensions = none
-default_crl_days = 365
+default_crl_days = 3651
 
 [match_pol]
 countryName = match

diff --git a/Lib/slapdtest/certs/ca.pem b/Lib/slapdtest/certs/ca.pem
@@ -0,0 +1,80 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, O=python-ldap, OU=slapd-test, CN=Python LDAP Test CA
+        Validity
+            Not Before: Dec  2 11:57:47 2017 GMT
+            Not After : Sep  4 11:57:47 2027 GMT
+        Subject: C=DE, O=python-ldap, OU=slapd-test, CN=Python LDAP Test CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:af:1f:cf:0f:c5:95:66:2d:eb:85:cc:21:fc:0d:
+                    0f:44:d8:2f:a8:85:08:ef:60:67:57:fa:0b:c5:e4:
+                    b3:fb:f1:6f:cb:30:7a:47:0d:a7:f1:b5:37:81:5f:
+                    f6:39:28:e2:f9:4d:6c:2e:a6:5c:0e:3c:db:4d:c9:
+                    2a:64:ce:0d:15:30:c7:75:52:b8:74:c5:0b:00:4c:
+                    2f:94:1b:dd:fb:83:2c:58:02:73:b0:86:3a:6a:aa:
+                    55:f2:d5:49:99:17:a5:e2:44:ec:dd:62:5f:8d:ce:
+                    77:29:0b:8d:87:23:e2:4b:d6:1c:25:f3:06:a9:ee:
+                    33:6f:ac:ed:22:9e:35:ec:55:e7:1b:38:68:7e:46:
+                    e3:c3:42:ac:06:0b:0a:7a:84:c9:3d:ef:3d:a5:6e:
+                    e9:10:24:c3:28:fe:1f:4a:9a:23:8a:3c:db:0a:66:
+                    5d:07:f8:c5:17:68:53:e4:0e:37:33:c4:d2:ad:58:
+                    62:6b:8a:87:ab:73:eb:bc:2b:ac:07:69:84:8d:e3:
+                    c4:a9:78:9b:6c:1e:03:63:df:b4:96:18:bd:3c:2e:
+                    be:7f:2c:d5:a8:f8:12:b9:ab:27:52:b0:de:38:62:
+                    3c:54:a7:f3:aa:37:a3:11:12:b2:a7:6f:8d:96:10:
+                    ce:01:cb:25:24:a6:51:18:93:69:9b:9e:5c:8a:ff:
+                    fe:89
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                3B:1F:32:F4:FE:57:D1:6F:49:91:55:F2:24:F1:0A:66:3B:A5:EE:D4
+            X509v3 Authority Key Identifier: 
+                keyid:3B:1F:32:F4:FE:57:D1:6F:49:91:55:F2:24:F1:0A:66:3B:A5:EE:D4
+
+    Signature Algorithm: sha256WithRSAEncryption
+         0a:e7:dc:38:ce:03:dd:a8:99:11:d0:24:be:ef:1a:18:9d:7c:
+         95:75:4a:4a:29:44:23:28:fc:66:d5:81:ce:05:c2:c0:6b:71:
+         d6:8d:33:a9:53:a6:1c:f1:4e:50:ae:a3:b1:72:d6:69:53:ad:
+         a9:62:a9:45:27:68:17:35:41:97:ec:e9:65:91:62:12:ed:eb:
+         45:3a:9b:cc:09:bc:e3:ad:22:6b:13:6b:b0:67:ef:ce:01:83:
+         5e:6c:95:e2:b3:73:b9:69:9a:33:49:f9:5f:52:4e:39:94:c9:
+         db:93:6f:d8:ba:10:92:ce:fa:12:6b:bc:31:ff:c1:67:70:63:
+         07:dc:53:7a:3a:a3:51:20:15:44:cf:1c:a9:cd:b7:30:1d:8e:
+         55:93:8a:56:8c:3d:e9:8b:ae:0c:77:8d:5c:8b:fd:22:d8:4c:
+         3e:e4:76:e8:d9:e8:c3:98:f4:98:ff:02:60:95:8e:3e:26:7a:
+         e2:fe:2c:0a:a4:52:8d:4c:3d:dd:4c:fd:2f:2c:db:83:4c:2b:
+         25:24:37:78:9a:07:27:52:f9:1c:c0:65:65:cb:50:77:b4:2d:
+         fa:f4:af:bb:42:1c:43:65:c6:01:6e:f1:4b:fe:b8:4a:3c:29:
+         8b:b6:84:1e:17:99:61:98:65:fe:f2:e9:ce:bb:ac:87:69:cb:
+         e6:13:42:bf
+-----BEGIN CERTIFICATE-----
+MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJERTEU
+MBIGA1UECgwLcHl0aG9uLWxkYXAxEzARBgNVBAsMCnNsYXBkLXRlc3QxHDAaBgNV
+BAMME1B5dGhvbiBMREFQIFRlc3QgQ0EwHhcNMTcxMjAyMTE1NzQ3WhcNMjcwOTA0
+MTE1NzQ3WjBWMQswCQYDVQQGEwJERTEUMBIGA1UECgwLcHl0aG9uLWxkYXAxEzAR
+BgNVBAsMCnNsYXBkLXRlc3QxHDAaBgNVBAMME1B5dGhvbiBMREFQIFRlc3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvH88PxZVmLeuFzCH8DQ9E
+2C+ohQjvYGdX+gvF5LP78W/LMHpHDafxtTeBX/Y5KOL5TWwuplwOPNtNySpkzg0V
+MMd1Urh0xQsATC+UG937gyxYAnOwhjpqqlXy1UmZF6XiROzdYl+NzncpC42HI+JL
+1hwl8wap7jNvrO0injXsVecbOGh+RuPDQqwGCwp6hMk97z2lbukQJMMo/h9KmiOK
+PNsKZl0H+MUXaFPkDjczxNKtWGJrioerc+u8K6wHaYSN48SpeJtsHgNj37SWGL08
+Lr5/LNWo+BK5qydSsN44YjxUp/OqN6MRErKnb42WEM4ByyUkplEYk2mbnlyK//6J
+AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1Ud
+DgQWBBQ7HzL0/lfRb0mRVfIk8QpmO6Xu1DAfBgNVHSMEGDAWgBQ7HzL0/lfRb0mR
+VfIk8QpmO6Xu1DANBgkqhkiG9w0BAQsFAAOCAQEACufcOM4D3aiZEdAkvu8aGJ18
+lXVKSilEIyj8ZtWBzgXCwGtx1o0zqVOmHPFOUK6jsXLWaVOtqWKpRSdoFzVBl+zp
+ZZFiEu3rRTqbzAm8460iaxNrsGfvzgGDXmyV4rNzuWmaM0n5X1JOOZTJ25Nv2LoQ
+ks76Emu8Mf/BZ3BjB9xTejqjUSAVRM8cqc23MB2OVZOKVow96YuuDHeNXIv9IthM
+PuR26Nnow5j0mP8CYJWOPiZ64v4sCqRSjUw93Uz9Lyzbg0wrJSQ3eJoHJ1L5HMBl
+ZctQd7Qt+vSvu0IcQ2XGAW7xS/64Sjwpi7aEHheZYZhl/vLpzrush2nL5hNCvw==
+-----END CERTIFICATE-----
diff --git a/Tests/certs/client.conf → Lib/slapdtest/certs/client.conf b/Tests/certs/client.conf → Lib/slapdtest/certs/client.conf
diff --git a/Lib/slapdtest/certs/client.key b/Lib/slapdtest/certs/client.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGxvbMEbahViK4
+P6aoWUkciIf1dEYTBuU8M1eShREUZ3Ytq/ee425pXRyxxDrAa8ygRjqs7tauwhgA
+KNuPRGyw7hyZ1Ku4vQObwX9rzyHQ6Fj606U4HHbYfAVb0AF7OzLbhNH3isCRtNcm
+EUSYG1Nkfn9zQkV4pz2KJM4ePt4GyGJV0NhRUdHdwgsWiuRt2EIRPwLXdkf/4svm
+2EahAJax+SMaZYe/lg9w9SBxl6DTaF9lFpoPqzeW+KnXCmE8e+qSWea8EjkzIRXa
+4KJ/EnUMP2fUL+Je2agGF2YfCId9YvLTQV8YDv7Im1Sp0sbIUDoWX14GDUbZ8cBr
+wfOyI0TfAgMBAAECggEATWv1eGp1zcU05Lq1+OA938U1316YZJTM+HOu6jy1+FKL
+7yIJ4nMG8Db6FCswDv5txwdTl0O3jn2+x2Eik1y9UPSNY0U4VU4Zd7MYJC+bJjk5
+XwjMU1yS1aMIm0gbK5pVJrdG6Lm8Y4QiQIt9Qhlyk7PJhGUNlf7ds06+kX0/ETiO
+vx5SatExeKu5F+JRnGFdAN0106SF5vBum+UbrgOSnJmfwX5VoOXARD21ppxgMzAr
+JyGBpgBgy++GpV15gXGuA7DVMIADdHw8hV4OuBLjpkUL+ntArjhpUi7TP7VU3WKR
+uUmvLm9CX1l8O/xZMpt9N1+o71a//7asnz8AMtT6cQKBgQD4FgefUkVnXDA1xKDW
+1JbArVQeHiLGlRdLakRUY/HdGj72YgAOLt3UsrON4VQXl0C6rks/8HKCFaMexBlF
+OecJNWsEVgBEAfsQ+NvrApOQsTszc8Zqna0Kqe2vA0VNa+SAzdHzhBbFcaVkzXJb
+JB7M0/OIt5IaqXg6Y5eX2eZF1QKBgQDNHkIoJ/2hYtlSgXpGaniM+0XemQJgJXig
+edAQdGKKfqwmjSFjByDM01ZaidMu5fEkeGhMRE73IbwNw0pWsMXylD6bI6+sk7yQ
+biM+fslFEEDbgSJe41Jy2eerh5am+dnrMWNhd7QZV1K6tmaqrIzkmIV21/EPXIPp
+BNHO8GV14wKBgGOybrO/GzcTXChvcXeEDWU3AqPr1mvZhHgBJ56GX69MGdtnvL/2
+Y51Th0bQM7wbQ58B5im21j2itl/pzIH+Z/NSbURbz1WFOkEy0SYbbfPq1XCy6Rz1
+apHrgiIf/VzErBp7HBFxlrkYF7Bvw7IOzPXhg3AA3Y0rZ66HUWdr4NdVAoGBAJfC
+E2Bydgy5feC1OypuC9MC9abDviY0kxLoDTCfa2jcX7IGKPWDiJkCo5lI7557Mfax
+vzjuMR5XLzNfkdih4VKgq9FMjeU5SQHy+tB6LZ+Tbuj4md1qgs3GuskGAEh6Auko
+GUc7sVwuZ18NJNiR4Ywf7F8JVajv4gi9MB3Tbr3RAoGARSnVu+6rYSQTyEqvbsaB
+gIW7Ezea5q06GcQF072nk3tNSXuU/52YMlodAJ1UfFPbBAtaa7wEFN8oRG1IyKON
+MGyf6RD8GoInJjaDihkdCsR28RkchwymG1UMPnPzqRxSAb7da5YuMR8PEioVbL68
+dxhsgNi1Wtc2nGqN96qufG0=
+-----END PRIVATE KEY-----
diff --git a/Lib/slapdtest/certs/client.pem b/Lib/slapdtest/certs/client.pem
@@ -0,0 +1,83 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=DE, O=python-ldap, OU=slapd-test, CN=Python LDAP Test CA
+        Validity
+            Not Before: Dec  2 11:57:48 2017 GMT
+            Not After : Dec  2 11:57:48 2027 GMT
+        Subject: C=DE, O=python-ldap, OU=slapd-test, CN=client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c6:c6:f6:cc:11:b6:a1:56:22:b8:3f:a6:a8:59:
+                    49:1c:88:87:f5:74:46:13:06:e5:3c:33:57:92:85:
+                    11:14:67:76:2d:ab:f7:9e:e3:6e:69:5d:1c:b1:c4:
+                    3a:c0:6b:cc:a0:46:3a:ac:ee:d6:ae:c2:18:00:28:
+                    db:8f:44:6c:b0:ee:1c:99:d4:ab:b8:bd:03:9b:c1:
+                    7f:6b:cf:21:d0:e8:58:fa:d3:a5:38:1c:76:d8:7c:
+                    05:5b:d0:01:7b:3b:32:db:84:d1:f7:8a:c0:91:b4:
+                    d7:26:11:44:98:1b:53:64:7e:7f:73:42:45:78:a7:
+                    3d:8a:24:ce:1e:3e:de:06:c8:62:55:d0:d8:51:51:
+                    d1:dd:c2:0b:16:8a:e4:6d:d8:42:11:3f:02:d7:76:
+                    47:ff:e2:cb:e6:d8:46:a1:00:96:b1:f9:23:1a:65:
+                    87:bf:96:0f:70:f5:20:71:97:a0:d3:68:5f:65:16:
+                    9a:0f:ab:37:96:f8:a9:d7:0a:61:3c:7b:ea:92:59:
+                    e6:bc:12:39:33:21:15:da:e0:a2:7f:12:75:0c:3f:
+                    67:d4:2f:e2:5e:d9:a8:06:17:66:1f:08:87:7d:62:
+                    f2:d3:41:5f:18:0e:fe:c8:9b:54:a9:d2:c6:c8:50:
+                    3a:16:5f:5e:06:0d:46:d9:f1:c0:6b:c1:f3:b2:23:
+                    44:df
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:FALSE
+            X509v3 Key Usage: critical
+                Digital Signature
+            X509v3 Extended Key Usage: critical
+                TLS Web Client Authentication
+            X509v3 Subject Key Identifier: 
+                67:63:38:F4:B4:BC:F3:6B:BC:74:0E:7C:27:C9:BB:C2:CC:58:AC:16
+            X509v3 Authority Key Identifier: 
+                keyid:3B:1F:32:F4:FE:57:D1:6F:49:91:55:F2:24:F1:0A:66:3B:A5:EE:D4
+
+    Signature Algorithm: sha256WithRSAEncryption
+         76:24:42:6b:33:4f:d6:59:07:48:5b:04:9c:3c:d3:3f:63:80:
+         75:4d:78:d7:d5:85:b1:77:81:31:a3:91:cb:c9:a3:8c:0e:00:
+         28:08:74:71:6c:fc:83:8c:80:ec:1c:e8:ee:83:e0:7f:49:3b:
+         f3:42:33:5a:1f:68:0c:a5:41:42:ce:bf:77:29:07:f2:18:a7:
+         81:17:d7:76:47:04:d9:8a:dd:e8:5a:26:26:ea:a4:76:70:e1:
+         f1:fa:e1:db:bc:f2:24:b2:37:a8:58:2f:e3:66:89:77:02:55:
+         87:ef:3c:1f:66:ce:4e:86:b3:4c:57:43:86:7f:4c:ab:5a:33:
+         dd:ca:e3:2f:3b:af:b4:43:5a:53:8b:e0:12:da:e7:c0:13:76:
+         b2:68:d5:14:f8:1a:07:ce:8a:87:5c:91:bd:35:d7:83:c6:2a:
+         a4:e0:92:50:01:b9:c2:fa:69:06:5c:8a:80:ee:9c:24:f9:49:
+         64:e3:59:c1:a6:69:29:ce:b7:89:20:a9:7c:d6:9f:df:2a:d1:
+         a4:98:2a:6d:7b:93:6a:52:e3:ae:de:1a:d8:f3:2e:cf:02:7e:
+         ba:9a:fa:f4:b3:b5:6e:9a:23:10:70:53:53:30:d5:8a:32:35:
+         01:52:58:6d:9d:f5:8e:bb:b9:76:bd:41:16:88:26:f8:d3:ce:
+         70:03:c8:59
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJERTEU
+MBIGA1UECgwLcHl0aG9uLWxkYXAxEzARBgNVBAsMCnNsYXBkLXRlc3QxHDAaBgNV
+BAMME1B5dGhvbiBMREFQIFRlc3QgQ0EwHhcNMTcxMjAyMTE1NzQ4WhcNMjcxMjAy
+MTE1NzQ4WjBJMQswCQYDVQQGEwJERTEUMBIGA1UECgwLcHl0aG9uLWxkYXAxEzAR
+BgNVBAsMCnNsYXBkLXRlc3QxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMbG9swRtqFWIrg/pqhZSRyIh/V0RhMG5TwzV5KF
+ERRndi2r957jbmldHLHEOsBrzKBGOqzu1q7CGAAo249EbLDuHJnUq7i9A5vBf2vP
+IdDoWPrTpTgcdth8BVvQAXs7MtuE0feKwJG01yYRRJgbU2R+f3NCRXinPYokzh4+
+3gbIYlXQ2FFR0d3CCxaK5G3YQhE/Atd2R//iy+bYRqEAlrH5Ixplh7+WD3D1IHGX
+oNNoX2UWmg+rN5b4qdcKYTx76pJZ5rwSOTMhFdrgon8SdQw/Z9Qv4l7ZqAYXZh8I
+h31i8tNBXxgO/sibVKnSxshQOhZfXgYNRtnxwGvB87IjRN8CAwEAAaN4MHYwDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUH
+AwIwHQYDVR0OBBYEFGdjOPS0vPNrvHQOfCfJu8LMWKwWMB8GA1UdIwQYMBaAFDsf
+MvT+V9FvSZFV8iTxCmY7pe7UMA0GCSqGSIb3DQEBCwUAA4IBAQB2JEJrM0/WWQdI
+WwScPNM/Y4B1TXjX1YWxd4Exo5HLyaOMDgAoCHRxbPyDjIDsHOjug+B/STvzQjNa
+H2gMpUFCzr93KQfyGKeBF9d2RwTZit3oWiYm6qR2cOHx+uHbvPIksjeoWC/jZol3
+AlWH7zwfZs5OhrNMV0OGf0yrWjPdyuMvO6+0Q1pTi+AS2ufAE3ayaNUU+BoHzoqH
+XJG9NdeDxiqk4JJQAbnC+mkGXIqA7pwk+Ulk41nBpmkpzreJIKl81p/fKtGkmCpt
+e5NqUuOu3hrY8y7PAn66mvr0s7VumiMQcFNTMNWKMjUBUlhtnfWOu7l2vUEWiCb4
+085wA8hZ
+-----END CERTIFICATE-----
diff --git a/Tests/certs/gencerts.sh → Lib/slapdtest/certs/gencerts.sh b/Tests/certs/gencerts.sh → Lib/slapdtest/certs/gencerts.sh
@@ -29,6 +29,7 @@ openssl ca -selfsign \
     -in $CATMPDIR/ca.csr \
     -out $CAOUTDIR/ca.pem \
     -extensions ca_ext \
+    -days 3563 \
     -batch
 
 # server cert

diff --git a/Tests/certs/gennssdb.sh → Lib/slapdtest/certs/gennssdb.sh b/Tests/certs/gennssdb.sh → Lib/slapdtest/certs/gennssdb.sh
diff --git a/Tests/certs/server.conf → Lib/slapdtest/certs/server.conf b/Tests/certs/server.conf → Lib/slapdtest/certs/server.conf
diff --git a/Lib/slapdtest/certs/server.key b/Lib/slapdtest/certs/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAgcI7Pj89Aw4r
+rb+N8j3t1ynJgXRhQNxbxQcQmUCi8AtpGKNXu+aM9u2HxZ677ALfhsEivtQA5QKz
+Ll5G2G2IQa7uzgIco73OL/kMZIJt7sKfnvfACtSoOlD0IyOzVEEu0AVA7hMHb6Ul
+I0mCNfdk2FWFbc1nUmIAEBhIODbFoNW+Rc6lz94NsUqArDayvWpAsXkUbubQikpi
+KNX1OpOOC9GUbEhwI/G90ZnUg9STk/2oxsvwLlYdOhGhpyfl53tTu7eLMBriMxFl
+UTvkY1GUgPj0fA/giWtCerGOyeKu1hFlbS4LjborsfrlyYPwfwTg3YL4hVnt9fF0
+rpjzY1mlAgMBAAECggEAJY6rSEeiqtKXxynEv3rNXkOmIWwiOn8e/sB32mMr2x4d
++8kUxR8hocrjGKQTjfJDtTxjHdZBIlOLrU2UkxnSdMzrxidm/hNsCngNjL9nOu9k
+BSRMjakPSCrodFkOtAPyG6H2BG7uQ3siqxYxVzgUJhaWyMtdUZUfDYgWVLCy7udU
+5ML/OTOi7virueMmshjXoyrDug9OpiEMKiLu3ndAaDk/26m05ePAXB6TjW8SFw1B
+qn7cITSG0G5MZ9pOw0KwT9irY1SdppBHVWIg7dkYWRCni0BPCFewastU+GVKH5PJ
++dYSvafhkEGD1bBu484KN9yX1BcHV41ZKR8pGgMM2QKBgQD3/0R2vZsTxoO1CHNI
+IT7nBnuPIOP45iTFm/SNRY7e4dhQBy6HM6JD3Sr6Iksm8jRoboz+tnAso6l6QHRS
+842uqBiOHdnka2RslDmrEun1lJv1MWuPM8JN0o8pYjVG/IRtaAFnYSEk72UoNy2h
+bHC4OGFNwMbAadVm7DK5OiMfXwKBgQDGuBRxz7jkVZoMbbaeIqmGZAIejWkJweDZ
+AK+txM+6Sg+Li14t190N3Xf6tyyidKhUAEWaINzLjZB+luxNaDXtxqWzLYHCwQKA
+qfrjWVeZOS1clLya7jwl1jJqBtBiGKHv9eRL21hgX/9gX3odxqFMvX3vm6L7F1q1
+5CNApW0ZewKBgGO8qNcsWBLy8oM7G8n1fOvCwqyEaMrwG/fRSeALCnN+1tUQnljH
+nkm2yBMC+cB3Bja9xzylOKXrSDyfcWjvBJsqhX2aacggnKnCTxMLL0aR9sr8jipw
+gYN03Bijo5Oh+MxbWL0v5fmJweATmOljyE1+dzui/QvjRGz5L0kpJXj3AoGBAIa4
+3+t1B4WN312TuB4no8Tf4mvyNQcPcS/Nfk0RxD8o3Lcfal8sHMq8ng3Ux6bv7frd
+IFLo+qfpts+L5HJqNz2X0ljSfkmZ7udp1hTySigwEmfU0rU61H5WZGFrczU+O/Ni
+Qj+HWrgj/Q/KSxEKy+oqAcpDOtB+Odpc6+V1Aa0nAoGBAItWHP9UjTNFqOfyjZhG
+qaUiZd1S2KyRR0l/lVcn+rJ46Yg5i+lMGwHMF1xPyWH4ELz+QCUX3doOI4yB2ikg
+XXFcc8/bqgaR4AfOvP98T86s7+f33kaAKZsgyAFB2cjo+fz8ArTz+GjPeHbiOPaR
+Ra7+BVwl9GE0+bCdirq+99GO
+-----END PRIVATE KEY-----