diff options
| author | Andreas Schneider <asn@samba.org> | 2018-11-09 10:20:42 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-06-27 12:54:24 +0000 |
| commit | 4f306a2fdd658d8319216f2d06515a0da97cfb1f (patch) | |
| tree | 213e480371b2f2845b70033cdf92874187c98db3 /nsswitch | |
| parent | 6eb38daad4b49f2e47037e3cb8a51cc65cd86524 (diff) | |
| download | samba-4f306a2fdd658d8319216f2d06515a0da97cfb1f.tar.gz | |
nsswitch: Use GnuTLS RC4 in wbclient test
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/libwbclient/tests/wbclient.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c index d10794297b8..6e67b8a6104 100644 --- a/nsswitch/libwbclient/tests/wbclient.c +++ b/nsswitch/libwbclient/tests/wbclient.c @@ -31,10 +31,12 @@ #include "libcli/auth/libcli_auth.h" #include "lib/param/param.h" #include "lib/util/samba_util.h" -#include "lib/crypto/arcfour.h" #include "auth/credentials/credentials.h" #include "lib/cmdline/popt_common.h" +#include <gnutls/gnutls.h> +#include <gnutls/crypto.h> + #define WBC_ERROR_EQUAL(x,y) (x == y) #define torture_assert_wbc_equal(torture_ctx, got, expected, cmt, cmt_arg) \ @@ -808,10 +810,16 @@ static bool test_wbc_change_password(struct torture_context *tctx) struct samr_Password old_nt_hash_enc; struct samr_Password old_lanman_hash_enc; + gnutls_cipher_hd_t cipher_hnd = NULL; + uint8_t old_nt_hash[16]; uint8_t old_lanman_hash[16]; uint8_t new_nt_hash[16]; uint8_t new_lanman_hash[16]; + gnutls_datum_t old_nt_key = { + .data = old_nt_hash, + .size = sizeof(old_nt_hash), + }; struct wbcChangePasswordParams params; @@ -835,7 +843,16 @@ static bool test_wbc_change_password(struct torture_context *tctx) would reduce the effective password length to 14) */ encode_pw_buffer(new_lm_password.data, newpass, STR_UNICODE); - arcfour_crypt(new_lm_password.data, old_nt_hash, 516); + + gnutls_cipher_init(&cipher_hnd, + GNUTLS_CIPHER_ARCFOUR_128, + &old_nt_key, + NULL); + gnutls_cipher_encrypt(cipher_hnd, + new_lm_password.data, + 516); + gnutls_cipher_deinit(cipher_hnd); + E_old_pw_hash(new_nt_hash, old_lanman_hash, old_lanman_hash_enc.hash); @@ -854,7 +871,15 @@ static bool test_wbc_change_password(struct torture_context *tctx) encode_pw_buffer(new_nt_password.data, newpass, STR_UNICODE); - arcfour_crypt(new_nt_password.data, old_nt_hash, 516); + gnutls_cipher_init(&cipher_hnd, + GNUTLS_CIPHER_ARCFOUR_128, + &old_nt_key, + NULL); + gnutls_cipher_encrypt(cipher_hnd, + new_nt_password.data, + 516); + gnutls_cipher_deinit(cipher_hnd); + E_old_pw_hash(new_nt_hash, old_nt_hash, old_nt_hash_enc.hash); params.old_password.response.old_nt_hash_enc_length = |