crypto: Rely on GnuTLS 3.6.13 and gnutls_pbkdf2()

This removes a lot of inline #ifdef and means this feature is always tested.

We can do this as we have chosen GnuTLS 3.6.13 as the new minimum version.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

3 files changed, 1 insertions, 27 deletions

diff --git a/python/samba/tests/auth_log_pass_change.py b/python/samba/tests/auth_log_pass_change.py
index bbc14a5a7e1..b8737effca6 100644
--- a/python/samba/tests/auth_log_pass_change.py
+++ b/python/samba/tests/auth_log_pass_change.py
@@ -67,18 +67,9 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
 
         # discard any auth log messages for the password setup
         type(self).discardMessages()
-        gnutls_pbkdf2_support = samba.tests.env_get_var_value(
-            'GNUTLS_PBKDF2_SUPPORT',
-            allow_missing=True)
-        if gnutls_pbkdf2_support is None:
-            gnutls_pbkdf2_support = '0'
-        self.gnutls_pbkdf2_support = bool(int(gnutls_pbkdf2_support))
 
     def _authDescription(self):
-        if self.gnutls_pbkdf2_support:
-            return "samr_ChangePasswordUser4"
-        else:
-            return "samr_ChangePasswordUser3"
+        return "samr_ChangePasswordUser4"
 
     def tearDown(self):
         super(AuthLogPassChangeTests, self).tearDown()
diff --git a/python/samba/tests/krb5/lockout_tests.py b/python/samba/tests/krb5/lockout_tests.py
index 25be0ce36dc..3fe098a662d 100755
--- a/python/samba/tests/krb5/lockout_tests.py
+++ b/python/samba/tests/krb5/lockout_tests.py
@@ -618,8 +618,6 @@ class LockoutTests(KDCBaseTest):
         self.do_lockout_transaction(connect_samr)
 
     def test_lockout_transaction_samr_aes(self):
-        if not self.gnutls_pbkdf2_support:
-            self.skipTest('gnutls_pbkdf2() is not available')
         self.do_lockout_transaction(connect_samr_aes)
 
     def test_lockout_transaction_ldap_pw_change(self):
@@ -659,8 +657,6 @@ class LockoutTests(KDCBaseTest):
         self.do_lockout_transaction(connect_samr, correct_pw=False)
 
     def test_lockout_transaction_bad_pwd_samr_aes(self):
-        if not self.gnutls_pbkdf2_support:
-            self.skipTest('gnutls_pbkdf2() is not available')
         self.do_lockout_transaction(connect_samr_aes, correct_pw=False)
 
     def test_lockout_transaction_bad_pwd_ldap_pw_change(self):
@@ -676,8 +672,6 @@ class LockoutTests(KDCBaseTest):
         self.do_bad_pwd_count_transaction(connect_samr)
 
     def test_bad_pwd_count_transaction_samr_aes(self):
-        if not self.gnutls_pbkdf2_support:
-            self.skipTest('gnutls_pbkdf2() is not available')
         self.do_bad_pwd_count_transaction(connect_samr_aes)
 
     def test_bad_pwd_count_transaction_ldap_pw_change(self):
@@ -705,8 +699,6 @@ class LockoutTests(KDCBaseTest):
         self.do_lockout_race(connect_samr)
 
     def test_lockout_race_samr_aes(self):
-        if not self.gnutls_pbkdf2_support:
-            self.skipTest('gnutls_pbkdf2() is not available')
         self.do_lockout_race(connect_samr_aes)
 
     def test_lockout_race_ldap_pw_change(self):
@@ -728,8 +720,6 @@ class LockoutTests(KDCBaseTest):
         self.do_logon(connect_samr)
 
     def test_logon_samr_aes(self):
-        if not self.gnutls_pbkdf2_support:
-            self.skipTest('gnutls_pbkdf2() is not available')
         self.do_logon(connect_samr_aes)
 
     def test_logon_ldap_pw_change(self):
diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 4fb60e09069..9c77f705bee 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -691,13 +691,6 @@ class RawKerberosTest(TestCase):
             full_sig_support = '0'
         cls.full_sig_support = bool(int(full_sig_support))
 
-        gnutls_pbkdf2_support = samba.tests.env_get_var_value(
-            'GNUTLS_PBKDF2_SUPPORT',
-            allow_missing=True)
-        if gnutls_pbkdf2_support is None:
-            gnutls_pbkdf2_support = '1'
-        cls.gnutls_pbkdf2_support = bool(int(gnutls_pbkdf2_support))
-
         expect_pac = samba.tests.env_get_var_value('EXPECT_PAC',
                                                    allow_missing=True)
         if expect_pac is None: