libcli/auth: test des_crypt56() and add test_gnutls to selftest

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/auth/tests/test_gnutls.c b/libcli/auth/tests/test_gnutls.c
index 412a454b762bd74f5bdd59f1a7b68352f9815a07..7847d01a4dcc122fbb42ffa5a757b51bca582714 100644 (file)
--- a/libcli/auth/tests/test_gnutls.c
+++ b/libcli/auth/tests/test_gnutls.c
@@ -24,6 +24,7 @@
 #include <cmocka.h>
 
 #include "includes.h"
+#include "libcli/auth/libcli_auth.h"
 
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/gnutls.h>
@@ -227,11 +228,34 @@ static void torture_gnutls_aes_128_cfb(void **state)
 #endif
 }
 
+static void torture_gnutls_des_crypt56(void **state)
+{
+       static const uint8_t key[7] = {
+               0x69, 0x88, 0x96, 0x8E, 0xB5, 0x3A, 0x24
+       };
+       static const uint8_t clear[8] = {
+               0x3F, 0x49, 0x5B, 0x20, 0xA7, 0x84, 0xC2, 0x34
+       };
+       static const uint8_t crypt_expected[8] = {
+               0x54, 0x86, 0xCF, 0x51, 0x49, 0x3A, 0x53, 0x5B
+       };
+
+       uint8_t crypt[8];
+       uint8_t decrypt[8];
+
+       des_crypt56(crypt, clear, key, 1);
+       assert_memory_equal(crypt, crypt_expected, 8);
+
+       des_crypt56(decrypt, crypt, key, 0);
+       assert_memory_equal(decrypt, clear, 8);
+}
+
 int main(int argc, char *argv[])
 {
        int rc;
        const struct CMUnitTest tests[] = {
                cmocka_unit_test(torture_gnutls_aes_128_cfb),
+               cmocka_unit_test(torture_gnutls_des_crypt56),
        };
 
        if (argc == 2) {

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index c99ea4464afe0899dd49c8fb79118a25fe38452e..dc12195035862fe8c2288300773c6fc100035faa 100644 (file)
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -76,6 +76,7 @@ bld.SAMBA_BINARY('test_gnutls',
                  source='tests/test_gnutls.c',
                  deps='''
                       gnutls
+                      LIBCLI_AUTH
                       cmocka
                       samba-util
                       ''',

diff --git a/selftest/tests.py b/selftest/tests.py
index 32b76b4bc5b6cf7691155db06fde4a8235bfaaa2..96d3f8d631771ada9689969f5cbf7dfe05408a2a 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -391,6 +391,8 @@ plantestsuite("samba.unittests.byteorder", "none",
               [os.path.join(bindir(), "default/lib/util/test_byteorder")])
 plantestsuite("samba.unittests.ntlm_check", "none",
               [os.path.join(bindir(), "default/libcli/auth/test_ntlm_check")])
+plantestsuite("samba.unittests.gnutls", "none",
+              [os.path.join(bindir(), "default/libcli/auth/test_gnutls")])
 plantestsuite("samba.unittests.rc4_passwd_buffer", "none",
               [os.path.join(bindir(), "default/libcli/auth/test_rc4_passwd_buffer")])
 plantestsuite("samba.unittests.schannel", "none",