libcli:auth: Rename encode_or_decode_arc4_passwd_buffer()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14031

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

diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 651f1139cf505ad2ea37a8f15ea2b2343a77dcaa..1bcbeddb2280bca9ad1c3759b2747d9bd4b1beb6 100644 (file)
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -184,8 +184,8 @@ bool decode_pw_buffer(TALLOC_CTX *ctx,
 /***********************************************************
  Decode an arc4 encrypted password change buffer.
 ************************************************************/
-NTSTATUS encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532],
-                                            const DATA_BLOB *psession_key);
+NTSTATUS decode_rc4_passwd_buffer(unsigned char pw_buf[532],
+                                 const DATA_BLOB *psession_key);
 
 /***********************************************************
  encode a password buffer with an already unicode password.  The

diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index 17c1e1f69ff09a3f94f8ac08bea7c7b15c1f5ef9..7e343f715772b5565e69ad21ab7e597f68a69a3c 100644 (file)
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -843,8 +843,8 @@ bool decode_pw_buffer(TALLOC_CTX *ctx,
  Decode an arc4 encrypted password change buffer.
 ************************************************************/
 
-NTSTATUS encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532],
-                                            const DATA_BLOB *psession_key)
+NTSTATUS decode_rc4_passwd_buffer(unsigned char pw_buf[532],
+                                 const DATA_BLOB *psession_key)
 {
        /* Confounder is last 16 bytes. */
        DATA_BLOB confounder = data_blob_const(&pw_buf[516], 16);

diff --git a/libcli/auth/tests/test_rc4_passwd_buffer.c b/libcli/auth/tests/test_rc4_passwd_buffer.c
index f40ac3a565500a4e254984e242501b795d8d185d..eb7377032305fcbd6d73e8e8beea1c37494d9a5a 100644 (file)
--- a/libcli/auth/tests/test_rc4_passwd_buffer.c
+++ b/libcli/auth/tests/test_rc4_passwd_buffer.c
@@ -114,8 +114,7 @@ static void torture_decode_rc4_passwd_buffer(void **state)
               encrypted_test_blob,
               sizeof(out_pwd_buf.data));
 
-       status = encode_or_decode_arc4_passwd_buffer(out_pwd_buf.data,
-                                                    &session_key);
+       status = decode_rc4_passwd_buffer(out_pwd_buf.data, &session_key);
        assert_true(NT_STATUS_IS_OK(status));
 
        ok = decode_pw_buffer(NULL,
@@ -144,8 +143,7 @@ static void torture_rc4_passwd_buffer(void **state)
                                           &out_pwd_buf);
        assert_true(NT_STATUS_IS_OK(status));
 
-       status = encode_or_decode_arc4_passwd_buffer(out_pwd_buf.data,
-                                                    &session_key);
+       status = decode_rc4_passwd_buffer(out_pwd_buf.data, &session_key);
        assert_true(NT_STATUS_IS_OK(status));
 
        ok = decode_pw_buffer(NULL,

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index c2be8bfc19adff0e9505372304e263c3d785fdcd..4dc9132511f895aa24706022d2039b1716ae6218 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -5185,7 +5185,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
                        if(!NT_STATUS_IS_OK(status)) {
                                break;
                        }
-                       status = encode_or_decode_arc4_passwd_buffer(
+                       status = decode_rc4_passwd_buffer(
                                info->info25.password.data,
                                &session_key);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -5204,7 +5204,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
                        if(!NT_STATUS_IS_OK(status)) {
                                break;
                        }
-                       status = encode_or_decode_arc4_passwd_buffer(
+                       status = decode_rc4_passwd_buffer(
                                info->info26.password.data,
                                &session_key);
                        if (!NT_STATUS_IS_OK(status)) {