diff options
| author | speidy <speidy@gmail.com> | 2016-04-14 07:46:45 +0300 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2016-04-14 07:46:45 +0300 |
| commit | e446b33039342daed5d554d3e095d14f7dc8dff0 (patch) | |
| tree | 6ba4a58d2b2748e4817dc0f99a4d3673673149b7 | |
| parent | 575c06297bd8385d323344fe1425daafe7346cf7 (diff) | |
credssp: long passwords working now
| -rw-r--r-- | libfreerdp-core/ber.c | 5 | ||||
| -rw-r--r-- | libfreerdp-core/credssp.c | 2 | ||||
| -rw-r--r-- | libfreerdp-core/ntlmssp.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libfreerdp-core/ber.c b/libfreerdp-core/ber.c index 6b83e6b..22c2af5 100644 --- a/libfreerdp-core/ber.c +++ b/libfreerdp-core/ber.c @@ -168,7 +168,7 @@ tbool ber_read_application_tag(STREAM* s, uint8 tag, int* length) if (byte != tag) return false; - ber_read_length(s, length); + return ber_read_length(s, length); } else { @@ -181,7 +181,7 @@ tbool ber_read_application_tag(STREAM* s, uint8 tag, int* length) if (byte != ((BER_CLASS_APPL | BER_CONSTRUCT) | (BER_TAG_MASK & tag))) return false; - ber_read_length(s, length); + return ber_read_length(s, length); } return true; @@ -345,7 +345,6 @@ tbool ber_read_octet_string(STREAM* s, int* length) int ber_write_octet_string(STREAM* s, const uint8* oct_str, int length) { int size = 0; - size += ber_write_universal_tag(s, BER_TAG_OCTET_STRING, false); size += ber_write_length(s, length); stream_write(s, oct_str, length); diff --git a/libfreerdp-core/credssp.c b/libfreerdp-core/credssp.c index d74f3f5..4402c00 100644 --- a/libfreerdp-core/credssp.c +++ b/libfreerdp-core/credssp.c @@ -372,7 +372,7 @@ int credssp_sizeof_ts_credentials(rdpCredssp* credssp) size += ber_sizeof_integer(1); size += ber_sizeof_contextual_tag(ber_sizeof_integer(1)); - size += ber_sizeof_octet_string(ber_sizeof_sequence(credssp_sizeof_ts_password_creds(credssp))); + size += ber_sizeof_sequence_octet_string(ber_sizeof_sequence(credssp_sizeof_ts_password_creds(credssp))); return size; } diff --git a/libfreerdp-core/ntlmssp.c b/libfreerdp-core/ntlmssp.c index 8c92913..5a175f0 100644 --- a/libfreerdp-core/ntlmssp.c +++ b/libfreerdp-core/ntlmssp.c @@ -1198,10 +1198,8 @@ void ntlmssp_encrypt_message(NTLMSSP* ntlmssp, rdpBlob* msg, rdpBlob* encrypted_ /* Allocate space for encrypted message */ freerdp_blob_alloc(encrypted_msg, msg->length); - printf("rc4 %d % d %d %d\n", ntlmssp->send_rc4_seal, msg->length, msg->data, encrypted_msg->data); /* Encrypt message using with RC4 */ crypto_rc4(ntlmssp->send_rc4_seal, msg->length, msg->data, encrypted_msg->data); - printf("rc4 done\n"); } /* RC4-encrypt first 8 bytes of digest */ |