forked from KolibriOS/kolibrios
-Added Poly1305-Chacha20 cipher (new hardcoded default)
-Use HMAC and CTR/CBC from libcrash instead of our own implementations -Fixed stack allocation for keystroke handler thread git-svn-id: svn://kolibrios.org@9987 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr
parent
f147ff4286
commit
c60d5b31c6
@ -1,114 +0,0 @@
|
|||||||
; aes256-cbc.inc - AES256 Cipher Block Chaining
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Jeffrey Amelynck
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
struct aes256_cbc_context aes256_context
|
|
||||||
vector rb AES256_BLOCKSIZE
|
|
||||||
ends
|
|
||||||
|
|
||||||
|
|
||||||
proc aes256_cbc_init _vector
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
mcall 68, 12, sizeof.aes256_cbc_context
|
|
||||||
; handle errors
|
|
||||||
mov ecx, AES256_BLOCKSIZE/4
|
|
||||||
mov esi, [_vector]
|
|
||||||
lea edi, [eax + aes256_cbc_context.vector]
|
|
||||||
rep movsd
|
|
||||||
; rep movsd is slow, but we don't care while init
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc aes256_cbc_encrypt _ctx, _in, _out
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov edi, [_ctx]
|
|
||||||
lea edi, [edi + aes256_cbc_context.vector]
|
|
||||||
mov esi, [_in]
|
|
||||||
repeat AES256_BLOCKSIZE/4
|
|
||||||
lodsd
|
|
||||||
xor eax, [edi]
|
|
||||||
stosd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + aes256_cbc_context.key]
|
|
||||||
lea ebx, [esi + aes256_cbc_context.vector]
|
|
||||||
stdcall aes256_encrypt, eax, ebx, [_out] ; Key, in, out
|
|
||||||
|
|
||||||
mov esi, [_out]
|
|
||||||
mov eax, [_ctx]
|
|
||||||
lea edi, [eax + aes256_cbc_context.vector]
|
|
||||||
repeat AES256_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc aes256_cbc_decrypt _ctx, _in, _out
|
|
||||||
|
|
||||||
locals
|
|
||||||
temp_iv rb AES256_BLOCKSIZE
|
|
||||||
endl
|
|
||||||
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov esi, [_in]
|
|
||||||
lea edi, [temp_iv]
|
|
||||||
repeat AES256_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + aes256_cbc_context.key]
|
|
||||||
stdcall aes256_decrypt, eax, [_in], [_out] ; Key, in, out
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea esi, [esi + aes256_cbc_context.vector]
|
|
||||||
mov edi, [_out]
|
|
||||||
repeat AES256_BLOCKSIZE/4
|
|
||||||
lodsd
|
|
||||||
xor eax, [edi]
|
|
||||||
stosd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
lea esi, [temp_iv]
|
|
||||||
mov edi, [_ctx]
|
|
||||||
lea edi, [edi + aes256_cbc_context.vector]
|
|
||||||
repeat AES256_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
@ -1,111 +0,0 @@
|
|||||||
; aes256-ctr.inc - AES256 Counter Mode
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Ivan Baravy (dunkaist)
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
struct aes256_ctr_context aes256_context
|
|
||||||
|
|
||||||
counter rb AES256_BLOCKSIZE
|
|
||||||
output rb AES256_BLOCKSIZE ; counter after aes_crypt
|
|
||||||
|
|
||||||
ends
|
|
||||||
|
|
||||||
|
|
||||||
proc aes256_ctr_init _counter
|
|
||||||
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
mcall 68, 12, sizeof.aes256_ctr_context
|
|
||||||
; handle errors
|
|
||||||
mov ecx, AES256_BLOCKSIZE/4
|
|
||||||
mov esi, [_counter]
|
|
||||||
lea edi, [eax + aes256_ctr_context.counter]
|
|
||||||
rep movsd
|
|
||||||
; rep movsd is slow, but we don't care while init
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
proc aes256_ctr_crypt _ctx, _in, _out
|
|
||||||
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + aes256_ctr_context.key]
|
|
||||||
lea ebx, [esi + aes256_ctr_context.counter]
|
|
||||||
lea ecx, [esi + aes256_ctr_context.output]
|
|
||||||
|
|
||||||
stdcall aes256_encrypt, eax, ebx, ecx ; Key, in, out
|
|
||||||
|
|
||||||
mov ebx, [_ctx]
|
|
||||||
mov esi, [_in]
|
|
||||||
mov edi, [_out]
|
|
||||||
|
|
||||||
mov eax, [esi + 4*0]
|
|
||||||
xor eax, dword[ebx + aes256_ctr_context.output + 4*0]
|
|
||||||
mov [edi + 4*0], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*1]
|
|
||||||
xor eax, dword[ebx + aes256_ctr_context.output + 4*1]
|
|
||||||
mov [edi + 4*1], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*2]
|
|
||||||
xor eax, dword[ebx + aes256_ctr_context.output + 4*2]
|
|
||||||
mov [edi + 4*2], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*3]
|
|
||||||
xor eax, dword[ebx + aes256_ctr_context.output + 4*3]
|
|
||||||
mov [edi + 4*3], eax
|
|
||||||
|
|
||||||
; Increment counter
|
|
||||||
mov esi, [_ctx]
|
|
||||||
|
|
||||||
mov eax, dword[esi + aes256_ctr_context.counter + 4*0]
|
|
||||||
mov ebx, dword[esi + aes256_ctr_context.counter + 4*1]
|
|
||||||
mov ecx, dword[esi + aes256_ctr_context.counter + 4*2]
|
|
||||||
mov edx, dword[esi + aes256_ctr_context.counter + 4*3]
|
|
||||||
|
|
||||||
bswap eax
|
|
||||||
bswap ebx
|
|
||||||
bswap ecx
|
|
||||||
bswap edx
|
|
||||||
|
|
||||||
adc edx, 1
|
|
||||||
adc ecx, 0
|
|
||||||
adc ebx, 0
|
|
||||||
adc eax, 0
|
|
||||||
|
|
||||||
bswap eax
|
|
||||||
bswap ebx
|
|
||||||
bswap ecx
|
|
||||||
bswap edx
|
|
||||||
|
|
||||||
mov dword[esi + aes256_ctr_context.counter + 4*0], eax
|
|
||||||
mov dword[esi + aes256_ctr_context.counter + 4*1], ebx
|
|
||||||
mov dword[esi + aes256_ctr_context.counter + 4*2], ecx
|
|
||||||
mov dword[esi + aes256_ctr_context.counter + 4*3], edx
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,114 +0,0 @@
|
|||||||
; blowfish-cbc.inc - Blowfish Cipher Block Chaining
|
|
||||||
;
|
|
||||||
; Copyright (C) 2018 Jeffrey Amelynck
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
struct blowfish_cbc_context blowfish_context
|
|
||||||
vector rb BLOWFISH_BLOCKSIZE
|
|
||||||
ends
|
|
||||||
|
|
||||||
|
|
||||||
proc blowfish_cbc_init _vector
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
mcall 68, 12, sizeof.blowfish_cbc_context
|
|
||||||
; handle errors
|
|
||||||
mov ecx, BLOWFISH_BLOCKSIZE/4
|
|
||||||
mov esi, [_vector]
|
|
||||||
lea edi, [eax + blowfish_cbc_context.vector]
|
|
||||||
rep movsd
|
|
||||||
; rep movsd is slow, but we don't care while init
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc blowfish_cbc_encrypt _ctx, _in, _out
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov edi, [_ctx]
|
|
||||||
lea edi, [edi + blowfish_cbc_context.vector]
|
|
||||||
mov esi, [_in]
|
|
||||||
repeat blowfish_BLOCKSIZE/4
|
|
||||||
lodsd
|
|
||||||
xor eax, [edi]
|
|
||||||
stosd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + blowfish_cbc_context.pbox]
|
|
||||||
lea ebx, [esi + blowfish_cbc_context.vector]
|
|
||||||
stdcall blowfish_encrypt, eax, ebx, [_out] ; Key, in, out
|
|
||||||
|
|
||||||
mov esi, [_out]
|
|
||||||
mov eax, [_ctx]
|
|
||||||
lea edi, [eax + blowfish_cbc_context.vector]
|
|
||||||
repeat blowfish_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc blowfish_cbc_decrypt _ctx, _in, _out
|
|
||||||
|
|
||||||
locals
|
|
||||||
temp_iv rb BLOWFISH_BLOCKSIZE
|
|
||||||
endl
|
|
||||||
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov esi, [_in]
|
|
||||||
lea edi, [temp_iv]
|
|
||||||
repeat BLOWFISH_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + blowfish_cbc_context.pbox]
|
|
||||||
stdcall blowfish_decrypt, eax, [_in], [_out] ; Key, in, out
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea esi, [esi + blowfish_cbc_context.vector]
|
|
||||||
mov edi, [_out]
|
|
||||||
repeat BLOWFISH_BLOCKSIZE/4
|
|
||||||
lodsd
|
|
||||||
xor eax, [edi]
|
|
||||||
stosd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
lea esi, [temp_iv]
|
|
||||||
mov edi, [_ctx]
|
|
||||||
lea edi, [edi + blowfish_cbc_context.vector]
|
|
||||||
repeat BLOWFISH_BLOCKSIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
; blowfish-ctr.inc - Blowfish Counter Mode
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Ivan Baravy (dunkaist)
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
struct blowfish_ctr_context blowfish_context
|
|
||||||
counter rb BLOWFISH_BLOCKSIZE
|
|
||||||
output rb BLOWFISH_BLOCKSIZE ; counter after blowfish_crypt
|
|
||||||
ends
|
|
||||||
|
|
||||||
|
|
||||||
proc blowfish_ctr_init _counter
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
mcall 68, 12, sizeof.blowfish_ctr_context
|
|
||||||
; handle errors
|
|
||||||
mov ecx, BLOWFISH_BLOCKSIZE/4
|
|
||||||
mov esi, [_counter]
|
|
||||||
lea edi, [eax + blowfish_ctr_context.counter]
|
|
||||||
rep movsd
|
|
||||||
; rep movsd is slow, but we don't care while init
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
proc blowfish_ctr_crypt _ctx, _in, _out
|
|
||||||
|
|
||||||
push ebx esi edi
|
|
||||||
|
|
||||||
DEBUGF 1,'plain : '
|
|
||||||
stdcall dump_hex, [_in], 4
|
|
||||||
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea eax, [esi + blowfish_ctr_context.key]
|
|
||||||
lea ebx, [esi + blowfish_ctr_context.counter]
|
|
||||||
lea ecx, [esi + blowfish_ctr_context.output]
|
|
||||||
|
|
||||||
stdcall blowfish_encrypt, eax, ebx, ecx ; Key, in, out
|
|
||||||
|
|
||||||
mov ebx, [_ctx]
|
|
||||||
mov esi, [_in]
|
|
||||||
mov edi, [_out]
|
|
||||||
|
|
||||||
mov eax, [esi + 4*0]
|
|
||||||
xor eax, dword[ebx + blowfish_ctr_context.output + 4*0]
|
|
||||||
mov [edi + 4*0], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*1]
|
|
||||||
xor eax, dword[ebx + blowfish_ctr_context.output + 4*1]
|
|
||||||
mov [edi + 4*1], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*2]
|
|
||||||
xor eax, dword[ebx + blowfish_ctr_context.output + 4*2]
|
|
||||||
mov [edi + 4*2], eax
|
|
||||||
|
|
||||||
mov eax, [esi + 4*3]
|
|
||||||
xor eax, dword[ebx + blowfish_ctr_context.output + 4*3]
|
|
||||||
mov [edi + 4*3], eax
|
|
||||||
|
|
||||||
; Increment counter
|
|
||||||
mov esi, [_ctx]
|
|
||||||
|
|
||||||
mov eax, dword[esi + blowfish_ctr_context.counter + 4*0]
|
|
||||||
mov ebx, dword[esi + blowfish_ctr_context.counter + 4*1]
|
|
||||||
mov ecx, dword[esi + blowfish_ctr_context.counter + 4*2]
|
|
||||||
mov edx, dword[esi + blowfish_ctr_context.counter + 4*3]
|
|
||||||
|
|
||||||
bswap eax
|
|
||||||
bswap ebx
|
|
||||||
bswap ecx
|
|
||||||
bswap edx
|
|
||||||
|
|
||||||
adc edx, 1
|
|
||||||
adc ecx, 0
|
|
||||||
adc ebx, 0
|
|
||||||
adc eax, 0
|
|
||||||
|
|
||||||
bswap eax
|
|
||||||
bswap ebx
|
|
||||||
bswap ecx
|
|
||||||
bswap edx
|
|
||||||
|
|
||||||
mov dword[esi + blowfish_ctr_context.counter + 4*0], eax
|
|
||||||
mov dword[esi + blowfish_ctr_context.counter + 4*1], ebx
|
|
||||||
mov dword[esi + blowfish_ctr_context.counter + 4*2], ecx
|
|
||||||
mov dword[esi + blowfish_ctr_context.counter + 4*3], edx
|
|
||||||
|
|
||||||
DEBUGF 1,'cipher : '
|
|
||||||
stdcall dump_hex, [_out], 4
|
|
||||||
|
|
||||||
pop edi esi ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
@ -1,628 +0,0 @@
|
|||||||
;--------------------------------------------------------------------------;
|
|
||||||
; Blowfish algorithm by Echo
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
; Blowfish is a keyed, symmetric block cipher, designed in 1993 by Bruce
|
|
||||||
; Schneier and included in a large number of cipher suites and encryption products.
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
; Implemented in x86 assembly using FASM
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
|
|
||||||
BLOWFISH_BLOCKSIZE = 8
|
|
||||||
|
|
||||||
struct blowfish_context
|
|
||||||
pbox rd 18
|
|
||||||
sbox rd 1024
|
|
||||||
ends
|
|
||||||
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
; blowfish_init F: Generates subkeys to be used for encryption and decryption
|
|
||||||
; @ctx_init: Pointer an allocated region of memory that will contain a crypt context
|
|
||||||
; @key: Pointer to an array of bytes to be used to encrypt or decrypt a 64-bit block of data
|
|
||||||
; @key_len: Length of @key, not to exceed 56 bytes
|
|
||||||
; Return: Nothing
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
|
|
||||||
proc blowfish_set_key, _ctx, _userkey, _userkey_len
|
|
||||||
|
|
||||||
push ecx
|
|
||||||
push edx
|
|
||||||
push ebx
|
|
||||||
push edi
|
|
||||||
push esi
|
|
||||||
|
|
||||||
; Write the values of the PBOX into a region allocated for the crypt context
|
|
||||||
mov edi, [_ctx]
|
|
||||||
mov esi, blowfish_fixed_p
|
|
||||||
mov ecx, 18
|
|
||||||
rep movsd
|
|
||||||
; Write the values of the SBOX into that context
|
|
||||||
mov esi, blowfish_fixed_s
|
|
||||||
mov ecx, 1024
|
|
||||||
rep movsd
|
|
||||||
|
|
||||||
xor ecx, ecx
|
|
||||||
xor eax, eax
|
|
||||||
.init_subkey_generation:
|
|
||||||
|
|
||||||
xor edx, edx
|
|
||||||
xor ebx, ebx
|
|
||||||
.init_subkey_generation2:
|
|
||||||
; Check to make sure the index offset doesn't go out of bounds
|
|
||||||
cmp [_userkey_len], eax
|
|
||||||
jne .dont_reset_index
|
|
||||||
xor eax, eax
|
|
||||||
.dont_reset_index:
|
|
||||||
mov esi, [_userkey]
|
|
||||||
|
|
||||||
; Create an element so that, the element is bitwise shifted left by 8 bits and bitwise or'd with @key at the current offset
|
|
||||||
mov esi, [esi + eax]
|
|
||||||
and esi, 0xFF
|
|
||||||
shl ebx, 8
|
|
||||||
or ebx, esi
|
|
||||||
|
|
||||||
inc eax
|
|
||||||
inc edx
|
|
||||||
cmp edx, 4
|
|
||||||
jne .init_subkey_generation2
|
|
||||||
|
|
||||||
; Bitwise xor every integar in the pbox of the crypt context with previous result
|
|
||||||
mov esi, [_ctx]
|
|
||||||
xor dword [esi + ecx * 4], ebx
|
|
||||||
|
|
||||||
inc ecx
|
|
||||||
cmp ecx, 18
|
|
||||||
jne .init_subkey_generation
|
|
||||||
|
|
||||||
xor ebx, ebx
|
|
||||||
xor eax, eax
|
|
||||||
xor edx, edx
|
|
||||||
.init_permutations:
|
|
||||||
; Store two 32-bit unsigned integars on the stack and pass their stack location to blowfish_encrypt_block
|
|
||||||
push edx
|
|
||||||
push eax
|
|
||||||
mov esi, esp
|
|
||||||
add esi, 4
|
|
||||||
push esi
|
|
||||||
sub esi, 4
|
|
||||||
push esi
|
|
||||||
push [_ctx]
|
|
||||||
call blowfish_encrypt
|
|
||||||
pop eax
|
|
||||||
pop edx
|
|
||||||
|
|
||||||
; Move the upper 32 bits of the result from the above call to blowfish_encrypt_block into every other element in the PBOX of the crypt context
|
|
||||||
mov esi, [_ctx]
|
|
||||||
mov [esi + ebx * 4], eax
|
|
||||||
|
|
||||||
; Same prodecure here except use the lower 32 bits
|
|
||||||
inc ebx
|
|
||||||
mov dword [esi + ebx * 4], edx
|
|
||||||
|
|
||||||
inc ebx
|
|
||||||
cmp ebx, 18
|
|
||||||
jne .init_permutations
|
|
||||||
|
|
||||||
xor ebx, ebx
|
|
||||||
.init_substitution_box:
|
|
||||||
xor ecx, ecx
|
|
||||||
.init_substitution_box2:
|
|
||||||
; Store two 32-bit unsigned integars on the stack and pass their stack location to blowfish_encrypt_block
|
|
||||||
push edx
|
|
||||||
push eax
|
|
||||||
mov esi, esp
|
|
||||||
add esi, 4
|
|
||||||
push esi
|
|
||||||
sub esi, 4
|
|
||||||
push esi
|
|
||||||
push [_ctx]
|
|
||||||
call blowfish_encrypt
|
|
||||||
pop eax
|
|
||||||
pop edx
|
|
||||||
|
|
||||||
; Find the correct address of the required element in the SBOX of the crypt context
|
|
||||||
mov esi, [_ctx]
|
|
||||||
lea esi, [esi + 72 + ecx * 4]
|
|
||||||
push eax
|
|
||||||
mov eax, ebx
|
|
||||||
push ecx
|
|
||||||
mov ecx, 1024
|
|
||||||
push edx
|
|
||||||
mul ecx
|
|
||||||
pop edx
|
|
||||||
pop ecx
|
|
||||||
add esi, eax
|
|
||||||
pop eax
|
|
||||||
|
|
||||||
; Move the upper 32-bit result from the previous call to blowfish_encrypt_block into the SBOX of the crypt context, offset by the previous result
|
|
||||||
mov [esi], eax
|
|
||||||
|
|
||||||
; Same procedure here except, use the lower 32-bit result for every other element in the SBOX of the crypt context
|
|
||||||
mov [esi + 4], edx
|
|
||||||
inc ecx
|
|
||||||
|
|
||||||
inc ecx
|
|
||||||
cmp ecx, 256
|
|
||||||
jne .init_substitution_box2
|
|
||||||
|
|
||||||
inc ebx
|
|
||||||
cmp ebx, 4
|
|
||||||
jne .init_substitution_box
|
|
||||||
|
|
||||||
pop esi
|
|
||||||
pop edi
|
|
||||||
pop ebx
|
|
||||||
pop edx
|
|
||||||
pop ecx
|
|
||||||
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
; Procedure F: Seperates @x into four 8-bit quarters
|
|
||||||
; @ctx_F: Pointer to crypt context to be used
|
|
||||||
; @x: 32-bit unsigned integar to be used
|
|
||||||
; Return: Divided value of @x
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
|
|
||||||
proc blowfish_f, _ctx, x
|
|
||||||
|
|
||||||
push edx
|
|
||||||
push ecx
|
|
||||||
|
|
||||||
mov edx, [x]
|
|
||||||
shr edx, 24
|
|
||||||
and edx, 0xFF
|
|
||||||
|
|
||||||
mov ecx, [x]
|
|
||||||
shr ecx, 16
|
|
||||||
and ecx, 0xFF
|
|
||||||
|
|
||||||
; Get an unsigned integar from the first 256 integers in the SBOX in relation to the upper 8 bits of @x
|
|
||||||
mov eax, [_ctx]
|
|
||||||
mov eax, [eax + edx * 4 + 0x48]
|
|
||||||
|
|
||||||
; Do the same here but take the lower 8 bits of the high word and add the two together
|
|
||||||
mov edx, [_ctx]
|
|
||||||
add eax, [edx + ecx * 4 + 0x448]
|
|
||||||
|
|
||||||
mov edx, [x]
|
|
||||||
shr edx, 8
|
|
||||||
and edx, 0xFF
|
|
||||||
|
|
||||||
; Same procedure except, use the upper 8 bits of the low word and xor with the previous value
|
|
||||||
mov ecx, [_ctx]
|
|
||||||
xor eax, [ecx + edx * 4 + 0x848]
|
|
||||||
|
|
||||||
; Same procedure except, use the lower 8 bits of the low word and add to the previous value
|
|
||||||
mov edx, [x]
|
|
||||||
and edx, 0xFF
|
|
||||||
add eax, [ecx + edx * 4 + 0xC48]
|
|
||||||
|
|
||||||
pop ecx
|
|
||||||
pop edx
|
|
||||||
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
proc blowfish_encrypt, _ctx, _in, _out
|
|
||||||
|
|
||||||
locals
|
|
||||||
low_encrypt dd ?
|
|
||||||
high_encrypt dd ?
|
|
||||||
endl
|
|
||||||
|
|
||||||
push ecx edx esi edi
|
|
||||||
|
|
||||||
mov esi, [_in]
|
|
||||||
mov edi, [_out]
|
|
||||||
mov [low_encrypt], edi
|
|
||||||
movsd
|
|
||||||
mov [low_encrypt], edi
|
|
||||||
movsd
|
|
||||||
|
|
||||||
; Begin 16 round encyption on 64 bit element
|
|
||||||
xor ecx, ecx
|
|
||||||
.loop_encrypt:
|
|
||||||
; Bitwise xor @high_encrypt with every PBOX in the given crypt context
|
|
||||||
mov eax, [_ctx]
|
|
||||||
mov eax, [eax + ecx * 4]
|
|
||||||
mov edx, [high_encrypt]
|
|
||||||
xor dword[edx], eax
|
|
||||||
|
|
||||||
; Bitwise xor @low_encrypt with the value returned by F using @high_encrypt
|
|
||||||
push dword[edx]
|
|
||||||
push [_ctx]
|
|
||||||
call blowfish_f
|
|
||||||
mov edx, [low_encrypt]
|
|
||||||
xor dword[edx], eax
|
|
||||||
|
|
||||||
; Swap upper and lower 32 bits
|
|
||||||
push dword[edx]
|
|
||||||
mov eax, [high_encrypt]
|
|
||||||
mov eax, [eax]
|
|
||||||
mov dword[edx], eax
|
|
||||||
pop edx
|
|
||||||
mov eax, [high_encrypt]
|
|
||||||
mov dword[eax], edx
|
|
||||||
|
|
||||||
inc ecx
|
|
||||||
cmp ecx, 16
|
|
||||||
jne .loop_encrypt
|
|
||||||
|
|
||||||
; Swap upper and lower 32 bits again
|
|
||||||
mov edx, [low_encrypt]
|
|
||||||
push dword[edx]
|
|
||||||
mov eax, [high_encrypt]
|
|
||||||
mov eax, [eax]
|
|
||||||
mov dword[edx], eax
|
|
||||||
pop edx
|
|
||||||
mov eax, [high_encrypt]
|
|
||||||
mov dword[eax], edx
|
|
||||||
|
|
||||||
; Bitwise xor @low_encrypt with the value of the second to last PBOX in the given crypt context
|
|
||||||
mov eax, [low_encrypt]
|
|
||||||
mov edx, [_ctx]
|
|
||||||
mov edx, [edx + 64]
|
|
||||||
xor dword[eax], edx
|
|
||||||
|
|
||||||
; Bitwise xor @high_encrypt with the value of the last PBOX in the given crypt context
|
|
||||||
mov eax, [high_encrypt]
|
|
||||||
mov edx, [_ctx]
|
|
||||||
mov edx, [edx + 68]
|
|
||||||
xor dword[eax], edx
|
|
||||||
|
|
||||||
pop edi esi edx ecx
|
|
||||||
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
proc blowfish_decrypt, _ctx, _in, _out
|
|
||||||
|
|
||||||
locals
|
|
||||||
low_decrypt dd ?
|
|
||||||
high_decrypt dd ?
|
|
||||||
endl
|
|
||||||
|
|
||||||
push ecx edx esi edi
|
|
||||||
|
|
||||||
mov esi, [_in]
|
|
||||||
mov edi, [_out]
|
|
||||||
mov [low_decrypt], edi
|
|
||||||
movsd
|
|
||||||
mov [low_decrypt], edi
|
|
||||||
movsd
|
|
||||||
|
|
||||||
; Begin 16 round encyption on 64 bit element
|
|
||||||
mov ecx, 16
|
|
||||||
.loop_encrypt:
|
|
||||||
; Bitwise xor @high_encrypt with every PBOX in the given crypt context
|
|
||||||
mov eax, [_ctx]
|
|
||||||
mov eax, [eax + ecx * 4]
|
|
||||||
mov edx, [high_decrypt]
|
|
||||||
xor dword[edx], eax
|
|
||||||
|
|
||||||
; Bitwise xor @low_encrypt with the value returned by F using @high_encrypt
|
|
||||||
push dword[edx]
|
|
||||||
push [_ctx]
|
|
||||||
call F
|
|
||||||
mov edx, [low_decrypt]
|
|
||||||
xor dword[edx], eax
|
|
||||||
|
|
||||||
; Swap upper and lower 32 bits
|
|
||||||
push dword[edx]
|
|
||||||
mov eax, [high_decrypt]
|
|
||||||
mov eax, [eax]
|
|
||||||
mov dword[edx], eax
|
|
||||||
pop edx
|
|
||||||
mov eax, [high_decrypt]
|
|
||||||
mov dword[eax], edx
|
|
||||||
|
|
||||||
dec ecx
|
|
||||||
jnz .loop_encrypt
|
|
||||||
|
|
||||||
; Swap upper and lower 32 bits again
|
|
||||||
mov edx, [low_decrypt]
|
|
||||||
push dword[edx]
|
|
||||||
mov eax, [high_decrypt]
|
|
||||||
mov eax, [eax]
|
|
||||||
mov dword[edx], eax
|
|
||||||
pop edx
|
|
||||||
mov eax, [high_decrypt]
|
|
||||||
mov dword[eax], edx
|
|
||||||
|
|
||||||
; Bitwise xor @low_encrypt with the value of the second PBOX in the given crypt context
|
|
||||||
mov eax, [low_decrypt]
|
|
||||||
mov edx, [_ctx]
|
|
||||||
mov edx, [edx + 4]
|
|
||||||
xor dword[eax], edx
|
|
||||||
|
|
||||||
; Bitwise xor @high_encrypt with the value of the first PBOX in the given crypt context
|
|
||||||
mov eax, [high_decrypt]
|
|
||||||
mov edx, [_ctx]
|
|
||||||
mov edx, [edx + 0]
|
|
||||||
xor dword[eax], edx
|
|
||||||
|
|
||||||
pop edi esi edx ecx
|
|
||||||
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
; Following tables are used for key generation
|
|
||||||
;--------------------------------------------------------------------------;
|
|
||||||
iglobal
|
|
||||||
|
|
||||||
blowfish_fixed_p dd \
|
|
||||||
0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, \
|
|
||||||
0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89, \
|
|
||||||
0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C, \
|
|
||||||
0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917, \
|
|
||||||
0x9216D5D9, 0x8979FB1B
|
|
||||||
|
|
||||||
blowfish_fixed_s dd \
|
|
||||||
0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,\
|
|
||||||
0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99, \
|
|
||||||
0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16, \
|
|
||||||
0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E, \
|
|
||||||
0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE, \
|
|
||||||
0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013, \
|
|
||||||
0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF, \
|
|
||||||
0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E, \
|
|
||||||
0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60, \
|
|
||||||
0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440, \
|
|
||||||
0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE, \
|
|
||||||
0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A, \
|
|
||||||
0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E, \
|
|
||||||
0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677, \
|
|
||||||
0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193, \
|
|
||||||
0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032, \
|
|
||||||
0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88, \
|
|
||||||
0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239, \
|
|
||||||
0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E, \
|
|
||||||
0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0, \
|
|
||||||
0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3, \
|
|
||||||
0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98, \
|
|
||||||
0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88, \
|
|
||||||
0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE, \
|
|
||||||
0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6, \
|
|
||||||
0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D, \
|
|
||||||
0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B, \
|
|
||||||
0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7, \
|
|
||||||
0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA, \
|
|
||||||
0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463, \
|
|
||||||
0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F, \
|
|
||||||
0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09, \
|
|
||||||
0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3, \
|
|
||||||
0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB, \
|
|
||||||
0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279, \
|
|
||||||
0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8, \
|
|
||||||
0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB, \
|
|
||||||
0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82, \
|
|
||||||
0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB, \
|
|
||||||
0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573, \
|
|
||||||
0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0, \
|
|
||||||
0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B, \
|
|
||||||
0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790, \
|
|
||||||
0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8, \
|
|
||||||
0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4, \
|
|
||||||
0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0, \
|
|
||||||
0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7, \
|
|
||||||
0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C, \
|
|
||||||
0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD, \
|
|
||||||
0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1, \
|
|
||||||
0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299, \
|
|
||||||
0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9, \
|
|
||||||
0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477, \
|
|
||||||
0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF, \
|
|
||||||
0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49, \
|
|
||||||
0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF, \
|
|
||||||
0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA, \
|
|
||||||
0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5, \
|
|
||||||
0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41, \
|
|
||||||
0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915, \
|
|
||||||
0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400, \
|
|
||||||
0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915, \
|
|
||||||
0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664, \
|
|
||||||
0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A, \
|
|
||||||
0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623, \
|
|
||||||
0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266, \
|
|
||||||
0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1, \
|
|
||||||
0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E, \
|
|
||||||
0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6, \
|
|
||||||
0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1, \
|
|
||||||
0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E, \
|
|
||||||
0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1, \
|
|
||||||
0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737, \
|
|
||||||
0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8, \
|
|
||||||
0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF, \
|
|
||||||
0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD, \
|
|
||||||
0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701, \
|
|
||||||
0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7, \
|
|
||||||
0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41, \
|
|
||||||
0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331, \
|
|
||||||
0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF, \
|
|
||||||
0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF, \
|
|
||||||
0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E, \
|
|
||||||
0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87, \
|
|
||||||
0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C, \
|
|
||||||
0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2, \
|
|
||||||
0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16, \
|
|
||||||
0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD, \
|
|
||||||
0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B, \
|
|
||||||
0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509, \
|
|
||||||
0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E, \
|
|
||||||
0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3, \
|
|
||||||
0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F, \
|
|
||||||
0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A, \
|
|
||||||
0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4, \
|
|
||||||
0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960, \
|
|
||||||
0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66, \
|
|
||||||
0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28, \
|
|
||||||
0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802, \
|
|
||||||
0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84, \
|
|
||||||
0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510, \
|
|
||||||
0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF, \
|
|
||||||
0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14, \
|
|
||||||
0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E, \
|
|
||||||
0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50, \
|
|
||||||
0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7, \
|
|
||||||
0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8, \
|
|
||||||
0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281, \
|
|
||||||
0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99, \
|
|
||||||
0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696, \
|
|
||||||
0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128, \
|
|
||||||
0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73, \
|
|
||||||
0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0, \
|
|
||||||
0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0, \
|
|
||||||
0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105, \
|
|
||||||
0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250, \
|
|
||||||
0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3, \
|
|
||||||
0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285, \
|
|
||||||
0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00, \
|
|
||||||
0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061, \
|
|
||||||
0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB, \
|
|
||||||
0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E, \
|
|
||||||
0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735, \
|
|
||||||
0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC, \
|
|
||||||
0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9, \
|
|
||||||
0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340, \
|
|
||||||
0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20, \
|
|
||||||
0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7, \
|
|
||||||
0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934, \
|
|
||||||
0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068, \
|
|
||||||
0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF, \
|
|
||||||
0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840, \
|
|
||||||
0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45, \
|
|
||||||
0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504, \
|
|
||||||
0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A, \
|
|
||||||
0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB, \
|
|
||||||
0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE, \
|
|
||||||
0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6, \
|
|
||||||
0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42, \
|
|
||||||
0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B, \
|
|
||||||
0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2, \
|
|
||||||
0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB, \
|
|
||||||
0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527, \
|
|
||||||
0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B, \
|
|
||||||
0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33, \
|
|
||||||
0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C, \
|
|
||||||
0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3, \
|
|
||||||
0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC, \
|
|
||||||
0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17, \
|
|
||||||
0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564, \
|
|
||||||
0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B, \
|
|
||||||
0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115, \
|
|
||||||
0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922, \
|
|
||||||
0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728, \
|
|
||||||
0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0, \
|
|
||||||
0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E, \
|
|
||||||
0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37, \
|
|
||||||
0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D, \
|
|
||||||
0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804, \
|
|
||||||
0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B, \
|
|
||||||
0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3, \
|
|
||||||
0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB, \
|
|
||||||
0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D, \
|
|
||||||
0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C, \
|
|
||||||
0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350, \
|
|
||||||
0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9, \
|
|
||||||
0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A, \
|
|
||||||
0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE, \
|
|
||||||
0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D, \
|
|
||||||
0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC, \
|
|
||||||
0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F, \
|
|
||||||
0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61, \
|
|
||||||
0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2, \
|
|
||||||
0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9, \
|
|
||||||
0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2, \
|
|
||||||
0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C, \
|
|
||||||
0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E, \
|
|
||||||
0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633, \
|
|
||||||
0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10, \
|
|
||||||
0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169, \
|
|
||||||
0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52, \
|
|
||||||
0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027, \
|
|
||||||
0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5, \
|
|
||||||
0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62, \
|
|
||||||
0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634, \
|
|
||||||
0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76, \
|
|
||||||
0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24, \
|
|
||||||
0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC, \
|
|
||||||
0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4, \
|
|
||||||
0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C, \
|
|
||||||
0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837, \
|
|
||||||
0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0, \
|
|
||||||
0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B, \
|
|
||||||
0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE, \
|
|
||||||
0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B, \
|
|
||||||
0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4, \
|
|
||||||
0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8, \
|
|
||||||
0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6, \
|
|
||||||
0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304, \
|
|
||||||
0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22, \
|
|
||||||
0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4, \
|
|
||||||
0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6, \
|
|
||||||
0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9, \
|
|
||||||
0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59, \
|
|
||||||
0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593, \
|
|
||||||
0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51, \
|
|
||||||
0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28, \
|
|
||||||
0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C, \
|
|
||||||
0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B, \
|
|
||||||
0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28, \
|
|
||||||
0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C, \
|
|
||||||
0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD, \
|
|
||||||
0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A, \
|
|
||||||
0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319, \
|
|
||||||
0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB, \
|
|
||||||
0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F, \
|
|
||||||
0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991, \
|
|
||||||
0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32, \
|
|
||||||
0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680, \
|
|
||||||
0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166, \
|
|
||||||
0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE, \
|
|
||||||
0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB, \
|
|
||||||
0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5, \
|
|
||||||
0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47, \
|
|
||||||
0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370, \
|
|
||||||
0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D, \
|
|
||||||
0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84, \
|
|
||||||
0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048, \
|
|
||||||
0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8, \
|
|
||||||
0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD, \
|
|
||||||
0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9, \
|
|
||||||
0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7, \
|
|
||||||
0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38, \
|
|
||||||
0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F, \
|
|
||||||
0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C, \
|
|
||||||
0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525, \
|
|
||||||
0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1, \
|
|
||||||
0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442, \
|
|
||||||
0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964, \
|
|
||||||
0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E, \
|
|
||||||
0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8, \
|
|
||||||
0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D, \
|
|
||||||
0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F, \
|
|
||||||
0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299, \
|
|
||||||
0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02, \
|
|
||||||
0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC, \
|
|
||||||
0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614, \
|
|
||||||
0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A, \
|
|
||||||
0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6, \
|
|
||||||
0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B, \
|
|
||||||
0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0, \
|
|
||||||
0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060, \
|
|
||||||
0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E, \
|
|
||||||
0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9, \
|
|
||||||
0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F, \
|
|
||||||
0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
|
|
||||||
|
|
||||||
endg
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
; hmac.inc - HMAC: Keyed-Hashing for Message Authentication
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Denis Karpenko
|
|
||||||
; Copyright (C) 2016 Jeffrey Amelynck
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
; Main concept:
|
|
||||||
; To compute HMAC over the data `text' we perform
|
|
||||||
; H(K XOR opad, H(K XOR ipad, text))
|
|
||||||
|
|
||||||
MD5_BLOCK_SIZE = 64
|
|
||||||
|
|
||||||
struct hmac_md5_context
|
|
||||||
hash rb MD5_LEN
|
|
||||||
ipad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
opad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
ends
|
|
||||||
|
|
||||||
; We will precompute partial hashes of K XOR ipad and K XOR opad,
|
|
||||||
; and store them in the context structure.
|
|
||||||
|
|
||||||
proc hmac_md5_setkey ctx, key, key_length
|
|
||||||
|
|
||||||
locals
|
|
||||||
k_temp rb MD5_BLOCK_SIZE
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
|
|
||||||
; input esi = key, ecx=key_length
|
|
||||||
mov ecx, [key_length]
|
|
||||||
cmp ecx, MD5_BLOCK_SIZE
|
|
||||||
ja .hash_it
|
|
||||||
; Key is smaller then or equal to blocksize,
|
|
||||||
; copy key to ipad
|
|
||||||
mov esi, [key]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
rep movsb
|
|
||||||
mov ecx, MD5_BLOCK_SIZE
|
|
||||||
sub ecx, [key_length]
|
|
||||||
jz .finish
|
|
||||||
; append zeros to the key
|
|
||||||
xor al, al
|
|
||||||
rep stosb
|
|
||||||
jmp .finish
|
|
||||||
|
|
||||||
; Given key is larger then key size, hash it
|
|
||||||
.hash_it:
|
|
||||||
invoke md5_init, [ctx]
|
|
||||||
invoke md5_update, [ctx], [key], [key_length]
|
|
||||||
invoke md5_final, [ctx]
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
mov ecx, MD5_HASH_SIZE/4
|
|
||||||
rep movsd
|
|
||||||
xor eax, eax
|
|
||||||
mov ecx, (MD5_BLOCK_SIZE-MD5_HASH_SIZE)/4
|
|
||||||
rep stosd
|
|
||||||
|
|
||||||
.finish:
|
|
||||||
; xor ipad buffer with 0x36363...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, MD5_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 ; ipad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_ipad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_md5_context.ipad_ctx]
|
|
||||||
invoke md5_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, MD5_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_md5_context.ipad_ctx]
|
|
||||||
invoke md5_update, edi, esi, MD5_BLOCK_SIZE
|
|
||||||
|
|
||||||
; xor opad buffer with 0x5c5c5...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, MD5_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 xor 0x5c5c5c5c ; opad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_opad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_md5_context.opad_ctx]
|
|
||||||
invoke md5_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, MD5_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_md5_context.opad_ctx]
|
|
||||||
invoke md5_update, edi, esi, MD5_BLOCK_SIZE
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
; Copy our pre-computed partial hashes to the stack, complete and finalize them.
|
|
||||||
; TODO: prevent unnescessary copying of output hash
|
|
||||||
; TODO: remove unnescessary pushing/popping
|
|
||||||
|
|
||||||
proc hmac_md5 ctx, _data, _length
|
|
||||||
|
|
||||||
locals
|
|
||||||
inner_ctx ctx_md5
|
|
||||||
outer_ctx ctx_md5
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
DEBUGF 1, "HMAC: "
|
|
||||||
mov ebx, [_length]
|
|
||||||
shr ebx, 2
|
|
||||||
stdcall dump_hex, [_data], ebx
|
|
||||||
|
|
||||||
; Copy partial hashes of ipad and opad to our temporary buffers
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea esi, [esi+hmac_md5_context.ipad_ctx]
|
|
||||||
lea edi, [inner_ctx]
|
|
||||||
repeat (sizeof.ctx_md5)/4*2
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
; Append provided data to inner hash and finalize
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke md5_update, ebx, [_data], [_length]
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke md5_final, ebx
|
|
||||||
|
|
||||||
DEBUGF 1, "Inner Hash: "
|
|
||||||
lea esi, [inner_ctx.hash]
|
|
||||||
stdcall dump_hex, esi, MD5_HASH_SIZE/4
|
|
||||||
|
|
||||||
; Calculate outer hash
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
lea esi, [inner_ctx.hash]
|
|
||||||
invoke md5_update, ebx, esi, MD5_HASH_SIZE
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
invoke md5_final, ebx
|
|
||||||
; Copy output hash to ctx structure ; FIXME
|
|
||||||
lea esi, [outer_ctx.hash]
|
|
||||||
mov edi, [ctx]
|
|
||||||
repeat MD5_HASH_SIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
; hmac.inc - HMAC: Keyed-Hashing for Message Authentication
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Denis Karpenko
|
|
||||||
; Copyright (C) 2016 Jeffrey Amelynck
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
; Main concept:
|
|
||||||
; To compute HMAC over the data `text' we perform
|
|
||||||
; H(K XOR opad, H(K XOR ipad, text))
|
|
||||||
|
|
||||||
SHA1_BLOCK_SIZE = 64
|
|
||||||
|
|
||||||
struct hmac_sha1_context
|
|
||||||
hash rb SHA1_LEN
|
|
||||||
ipad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
opad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
ends
|
|
||||||
|
|
||||||
; We will precompute partial hashes of K XOR ipad and K XOR opad,
|
|
||||||
; and store them in the context structure.
|
|
||||||
|
|
||||||
proc hmac_sha1_setkey ctx, key, key_length
|
|
||||||
|
|
||||||
locals
|
|
||||||
k_temp rb SHA1_BLOCK_SIZE
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
|
|
||||||
; input esi = key, ecx=key_length
|
|
||||||
mov ecx, [key_length]
|
|
||||||
cmp ecx, SHA1_BLOCK_SIZE
|
|
||||||
ja .hash_it
|
|
||||||
; Key is smaller then or equal to blocksize,
|
|
||||||
; copy key to ipad
|
|
||||||
mov esi, [key]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
rep movsb
|
|
||||||
mov ecx, SHA1_BLOCK_SIZE
|
|
||||||
sub ecx, [key_length]
|
|
||||||
jz .finish
|
|
||||||
; append zeros to the key
|
|
||||||
xor al, al
|
|
||||||
rep stosb
|
|
||||||
jmp .finish
|
|
||||||
|
|
||||||
; Given key is larger then key size, hash it
|
|
||||||
.hash_it:
|
|
||||||
invoke sha1_init, [ctx]
|
|
||||||
invoke sha1_update, [ctx], [key], [key_length]
|
|
||||||
invoke sha1_final, [ctx]
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
mov ecx, SHA1_HASH_SIZE/4
|
|
||||||
rep movsd
|
|
||||||
xor eax, eax
|
|
||||||
mov ecx, (SHA1_BLOCK_SIZE-SHA1_HASH_SIZE)/4
|
|
||||||
rep stosd
|
|
||||||
|
|
||||||
.finish:
|
|
||||||
; xor ipad buffer with 0x36363...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, SHA1_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 ; ipad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_ipad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha1_context.ipad_ctx]
|
|
||||||
invoke sha1_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, SHA1_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha1_context.ipad_ctx]
|
|
||||||
invoke sha1_update, edi, esi, SHA1_BLOCK_SIZE
|
|
||||||
|
|
||||||
; xor opad buffer with 0x5c5c5...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, SHA1_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 xor 0x5c5c5c5c ; opad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_opad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha1_context.opad_ctx]
|
|
||||||
invoke sha1_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, SHA1_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha1_context.opad_ctx]
|
|
||||||
invoke sha1_update, edi, esi, SHA1_BLOCK_SIZE
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
; Copy our pre-computed partial hashes to the stack, complete and finalize them.
|
|
||||||
; TODO: prevent unnescessary copying of output hash
|
|
||||||
; TODO: remove unnescessary pushing/popping
|
|
||||||
|
|
||||||
proc hmac_sha1 ctx, _data, _length
|
|
||||||
|
|
||||||
locals
|
|
||||||
inner_ctx ctx_sha1
|
|
||||||
outer_ctx ctx_sha1
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
DEBUGF 1, "HMAC: "
|
|
||||||
mov ebx, [_length]
|
|
||||||
shr ebx, 2
|
|
||||||
stdcall dump_hex, [_data], ebx
|
|
||||||
|
|
||||||
; Copy partial hashes of ipad and opad to our temporary buffers
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea esi, [esi+hmac_sha1_context.ipad_ctx]
|
|
||||||
lea edi, [inner_ctx]
|
|
||||||
repeat (sizeof.ctx_sha1)/4*2
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
; Append provided data to inner hash and finalize
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke sha1_update, ebx, [_data], [_length]
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke sha1_final, ebx
|
|
||||||
|
|
||||||
DEBUGF 1, "Inner Hash: "
|
|
||||||
lea esi, [inner_ctx.hash]
|
|
||||||
stdcall dump_hex, esi, SHA1_HASH_SIZE/4
|
|
||||||
|
|
||||||
; Calculate outer hash
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
lea esi, [inner_ctx.hash]
|
|
||||||
invoke sha1_update, ebx, esi, SHA1_HASH_SIZE
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
invoke sha1_final, ebx
|
|
||||||
; Copy output hash to ctx structure ; FIXME
|
|
||||||
lea esi, [outer_ctx.hash]
|
|
||||||
mov edi, [ctx]
|
|
||||||
repeat SHA1_HASH_SIZE/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
; hmac.inc - HMAC: Keyed-Hashing for Message Authentication
|
|
||||||
;
|
|
||||||
; Copyright (C) 2016 Denis Karpenko
|
|
||||||
; Copyright (C) 2016 Jeffrey Amelynck
|
|
||||||
;
|
|
||||||
; This program is free software: you can redistribute it and/or modify
|
|
||||||
; it under the terms of the GNU General Public License as published by
|
|
||||||
; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
; (at your option) any later version.
|
|
||||||
;
|
|
||||||
; This program is distributed in the hope that it will be useful,
|
|
||||||
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
; GNU General Public License for more details.
|
|
||||||
;
|
|
||||||
; You should have received a copy of the GNU General Public License
|
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
; Main concept:
|
|
||||||
; To compute HMAC over the data `text' we perform
|
|
||||||
; H(K XOR opad, H(K XOR ipad, text))
|
|
||||||
|
|
||||||
SHA2_256_BLOCK_SIZE = 64
|
|
||||||
|
|
||||||
struct hmac_sha256_context
|
|
||||||
hash rb SHA2_256_LEN
|
|
||||||
ipad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
opad_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
ends
|
|
||||||
|
|
||||||
; We will precompute partial hashes of K XOR ipad and K XOR opad,
|
|
||||||
; and store them in the context structure.
|
|
||||||
|
|
||||||
proc hmac_sha256_setkey ctx, key, key_length
|
|
||||||
|
|
||||||
locals
|
|
||||||
k_temp rb SHA2_256_BLOCK_SIZE
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
|
|
||||||
; input esi = key, ecx=key_length
|
|
||||||
mov ecx, [key_length]
|
|
||||||
cmp ecx, SHA2_256_BLOCK_SIZE
|
|
||||||
ja .hash_it
|
|
||||||
; Key is smaller then or equal to blocksize,
|
|
||||||
; copy key to ipad
|
|
||||||
mov esi, [key]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
rep movsb
|
|
||||||
mov ecx, SHA2_256_BLOCK_SIZE
|
|
||||||
sub ecx, [key_length]
|
|
||||||
jz .finish
|
|
||||||
; append zeros to the key
|
|
||||||
xor al, al
|
|
||||||
rep stosb
|
|
||||||
jmp .finish
|
|
||||||
|
|
||||||
; Given key is larger then key size, hash it
|
|
||||||
.hash_it:
|
|
||||||
invoke sha2_256_init, [ctx]
|
|
||||||
invoke sha2_256_update, [ctx], [key], [key_length]
|
|
||||||
invoke sha2_256_finish, [ctx]
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea edi, [k_temp]
|
|
||||||
mov ecx, SHA2_256_LEN/4
|
|
||||||
rep movsd
|
|
||||||
xor eax, eax
|
|
||||||
mov ecx, (SHA2_256_BLOCK_SIZE-SHA2_256_LEN)/4
|
|
||||||
rep stosd
|
|
||||||
|
|
||||||
.finish:
|
|
||||||
; xor ipad buffer with 0x36363...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, SHA2_256_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 ; ipad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_ipad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha256_context.ipad_ctx]
|
|
||||||
invoke sha2_256_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, SHA2_256_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha256_context.ipad_ctx]
|
|
||||||
invoke sha2_256_update, edi, esi, SHA2_256_BLOCK_SIZE
|
|
||||||
|
|
||||||
; xor opad buffer with 0x5c5c5...
|
|
||||||
lea esi, [k_temp]
|
|
||||||
mov ecx, SHA2_256_BLOCK_SIZE/4
|
|
||||||
@@:
|
|
||||||
xor dword[esi], 0x36363636 xor 0x5c5c5c5c ; opad constant
|
|
||||||
add esi, 4
|
|
||||||
dec ecx
|
|
||||||
jnz @r
|
|
||||||
|
|
||||||
; Init our hash with k_xor_opad
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha256_context.opad_ctx]
|
|
||||||
invoke sha2_256_init, edi
|
|
||||||
|
|
||||||
lea esi, [k_temp]
|
|
||||||
DEBUGF 1, "HASH: "
|
|
||||||
stdcall dump_hex, esi, SHA2_256_BLOCK_SIZE/4
|
|
||||||
|
|
||||||
mov ebx, [ctx]
|
|
||||||
lea edi, [ebx+hmac_sha256_context.opad_ctx]
|
|
||||||
invoke sha2_256_update, edi, esi, SHA2_256_BLOCK_SIZE
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
; Copy our pre-computed partial hashes to the stack, complete and finalize them.
|
|
||||||
; TODO: prevent unnescessary copying of output hash
|
|
||||||
; TODO: remove unnescessary pushing/popping
|
|
||||||
|
|
||||||
proc hmac_sha256 ctx, _data, _length
|
|
||||||
|
|
||||||
locals
|
|
||||||
inner_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
outer_ctx rb LIBCRASH_CTX_LEN
|
|
||||||
endl
|
|
||||||
|
|
||||||
pusha
|
|
||||||
DEBUGF 1, "HMAC: "
|
|
||||||
mov ebx, [_length]
|
|
||||||
shr ebx, 2
|
|
||||||
stdcall dump_hex, [_data], ebx
|
|
||||||
|
|
||||||
; Copy partial hashes of ipad and opad to our temporary buffers
|
|
||||||
mov esi, [ctx]
|
|
||||||
lea esi, [esi+hmac_sha256_context.ipad_ctx]
|
|
||||||
lea edi, [inner_ctx]
|
|
||||||
repeat (LIBCRASH_CTX_LEN)/4*2
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
; Append provided data to inner hash and finalize
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke sha2_256_update, ebx, [_data], [_length]
|
|
||||||
lea ebx, [inner_ctx]
|
|
||||||
invoke sha2_256_finish, ebx
|
|
||||||
|
|
||||||
DEBUGF 1, "Inner Hash: "
|
|
||||||
lea esi, [inner_ctx]
|
|
||||||
stdcall dump_hex, esi, SHA2_256_LEN/4
|
|
||||||
|
|
||||||
; Calculate outer hash
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
lea esi, [inner_ctx]
|
|
||||||
invoke sha2_256_update, ebx, esi, SHA2_256_LEN
|
|
||||||
lea ebx, [outer_ctx]
|
|
||||||
invoke sha2_256_finish, ebx
|
|
||||||
; Copy output hash to ctx structure ; FIXME
|
|
||||||
lea esi, [outer_ctx]
|
|
||||||
mov edi, [ctx]
|
|
||||||
repeat SHA2_256_LEN/4
|
|
||||||
movsd
|
|
||||||
end repeat
|
|
||||||
|
|
||||||
popa
|
|
||||||
ret
|
|
||||||
|
|
||||||
endp
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
; ssh.asm - SSH client for KolibriOS
|
; ssh.asm - SSH client for KolibriOS
|
||||||
;
|
;
|
||||||
; Copyright (C) 2015-2021 Jeffrey Amelynck
|
; Copyright (C) 2015-2024 Jeffrey Amelynck
|
||||||
;
|
;
|
||||||
; This program is free software: you can redistribute it and/or modify
|
; This program is free software: you can redistribute it and/or modify
|
||||||
; it under the terms of the GNU General Public License as published by
|
; it under the terms of the GNU General Public License as published by
|
||||||
@ -104,22 +104,12 @@ include 'mpint.inc'
|
|||||||
include 'seed.inc'
|
include 'seed.inc'
|
||||||
include 'random.inc'
|
include 'random.inc'
|
||||||
|
|
||||||
include 'aes256.inc'
|
|
||||||
include 'aes256-ctr.inc'
|
|
||||||
include 'aes256-cbc.inc'
|
|
||||||
|
|
||||||
include 'blowfish.inc'
|
|
||||||
include 'blowfish-ctr.inc'
|
|
||||||
include 'blowfish-cbc.inc'
|
|
||||||
|
|
||||||
include 'hmac_sha256.inc'
|
|
||||||
include 'hmac_sha1.inc'
|
|
||||||
include 'hmac_md5.inc'
|
|
||||||
|
|
||||||
include 'sshlib.inc'
|
include 'sshlib.inc'
|
||||||
|
|
||||||
include 'sshlib_mcodes.inc'
|
include 'sshlib_mcodes.inc'
|
||||||
include 'sshlib_transport.inc'
|
include 'sshlib_transport.inc'
|
||||||
|
include 'sshlib_transport_hmac.inc'
|
||||||
|
include 'sshlib_transport_polychacha.inc'
|
||||||
include 'sshlib_connection.inc'
|
include 'sshlib_connection.inc'
|
||||||
include 'sshlib_dh_gex.inc'
|
include 'sshlib_dh_gex.inc'
|
||||||
include 'sshlib_host.inc'
|
include 'sshlib_host.inc'
|
||||||
@ -219,7 +209,7 @@ main:
|
|||||||
mcall 18, 7
|
mcall 18, 7
|
||||||
push eax
|
push eax
|
||||||
; Create thread
|
; Create thread
|
||||||
mcall 51, 1, con_in_thread, mem - 2048
|
mcall 51, 1, con_in_thread, mem + 2048
|
||||||
; Activate window with given ID
|
; Activate window with given ID
|
||||||
pop ecx
|
pop ecx
|
||||||
mcall 18, 3
|
mcall 18, 3
|
||||||
@ -487,7 +477,7 @@ str24b db 10, 10, "If you trust this host, press A to accept and store the (new
|
|||||||
ssh_ident_ha:
|
ssh_ident_ha:
|
||||||
dd_n (ssh_msg_ident.length-2)
|
dd_n (ssh_msg_ident.length-2)
|
||||||
ssh_msg_ident:
|
ssh_msg_ident:
|
||||||
db "SSH-2.0-KolibriOS_SSH_0.09",13,10
|
db "SSH-2.0-KolibriOS_SSH_0.10",13,10
|
||||||
.length = $ - ssh_msg_ident
|
.length = $ - ssh_msg_ident
|
||||||
|
|
||||||
|
|
||||||
@ -500,9 +490,9 @@ ssh_msg_kex:
|
|||||||
.server_host_key_algorithms:
|
.server_host_key_algorithms:
|
||||||
str "rsa-sha2-512,rsa-sha2-256,ssh-rsa" ;,ssh-dss
|
str "rsa-sha2-512,rsa-sha2-256,ssh-rsa" ;,ssh-dss
|
||||||
.encryption_algorithms_client_to_server:
|
.encryption_algorithms_client_to_server:
|
||||||
str "aes256-ctr" ;,aes256-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,blowfish-ctr,blowfish-cbc,3des-ctr,3des-cbc,arcfour256,arcfour128"
|
str "chacha20-poly1305@openssh.com" ;aes256-ctr,aes256-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,blowfish-ctr,blowfish-cbc,3des-ctr,3des-cbc,arcfour256,arcfour128"
|
||||||
.encryption_algorithms_server_to_client:
|
.encryption_algorithms_server_to_client:
|
||||||
str "aes256-ctr" ;,aes256-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,blowfish-ctr,blowfish-cbc,3des-ctr,3des-cbc,arcfour256,arcfour128"
|
str "chacha20-poly1305@openssh.com" ;aes256-ctr,aes256-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,blowfish-ctr,blowfish-cbc,3des-ctr,3des-cbc,arcfour256,arcfour128"
|
||||||
.mac_algorithms_client_to_server:
|
.mac_algorithms_client_to_server:
|
||||||
str "hmac-sha2-256" ;,hmac-sha1,hmac-sha1-96,hmac-md5"
|
str "hmac-sha2-256" ;,hmac-sha1,hmac-sha1-96,hmac-md5"
|
||||||
.mac_algorithms_server_to_client:
|
.mac_algorithms_server_to_client:
|
||||||
@ -630,9 +620,21 @@ import libcrash, \
|
|||||||
sha1_init, 'sha1_init', \
|
sha1_init, 'sha1_init', \
|
||||||
sha1_update, 'sha1_update', \
|
sha1_update, 'sha1_update', \
|
||||||
sha1_finish, 'sha1_finish', \
|
sha1_finish, 'sha1_finish', \
|
||||||
md5_init, 'md5_init', \
|
chacha20_init, 'chacha20_init' , \
|
||||||
md5_update, 'md5_update', \
|
chacha20_update, 'chacha20_update', \
|
||||||
md5_finish, 'md5_finish'
|
chacha20_oneshot, 'chacha20_oneshot', \
|
||||||
|
poly1305_init, 'poly1305_init', \
|
||||||
|
poly1305_update, 'poly1305_update', \
|
||||||
|
poly1305_finish, 'poly1305_finish', \
|
||||||
|
poly1305_oneshot, 'poly1305_oneshot', \
|
||||||
|
aes256ctr.init, "aes256ctr_init", \
|
||||||
|
aes256ctr.update, "aes256ctr_update", \
|
||||||
|
aes256ctr.finish, "aes256ctr_finish", \
|
||||||
|
aes256ctr.oneshot, "aes256ctr_oneshot", \
|
||||||
|
hmac_sha2_256.init_, "hmac_sha2_256_init", \
|
||||||
|
hmac_sha2_256.update_, "hmac_sha2_256_update", \
|
||||||
|
hmac_sha2_256.finish_, "hmac_sha2_256_finish", \
|
||||||
|
hmac_sha2_256.oneshot, "hmac_sha2_256_oneshot"
|
||||||
|
|
||||||
import libini, \
|
import libini, \
|
||||||
ini_get_str, 'ini_get_str', \
|
ini_get_str, 'ini_get_str', \
|
||||||
@ -644,9 +646,13 @@ i_end:
|
|||||||
|
|
||||||
IncludeUGlobals
|
IncludeUGlobals
|
||||||
|
|
||||||
|
align 16
|
||||||
params rb MAX_HOSTNAME_LENGTH
|
params rb MAX_HOSTNAME_LENGTH
|
||||||
|
|
||||||
|
align 16
|
||||||
ssh_con sshlib_connection
|
ssh_con sshlib_connection
|
||||||
|
|
||||||
|
align 16
|
||||||
ssh_chan sshlib_channel
|
ssh_chan sshlib_channel
|
||||||
|
|
||||||
keyb_input rb MAX_INPUT_LENGTH
|
keyb_input rb MAX_INPUT_LENGTH
|
||||||
|
|||||||
@ -54,19 +54,20 @@ SSHLIB_HOSTKEY_RSA = 2
|
|||||||
SSHLIB_HOSTKEY_RSA_SHA2_256 = 3
|
SSHLIB_HOSTKEY_RSA_SHA2_256 = 3
|
||||||
SSHLIB_HOSTKEY_RSA_SHA2_512 = 4
|
SSHLIB_HOSTKEY_RSA_SHA2_512 = 4
|
||||||
|
|
||||||
SSHLIB_CRYPT_BLOWFISH_CTR = 1
|
;SSHLIB_CRYPT_BLOWFISH_CTR = 1 ; blowfish-ctr
|
||||||
SSHLIB_CRYPT_BLOWFISH_CBC = 2
|
;SSHLIB_CRYPT_BLOWFISH_CBC = 2 ; blowfish-cbc
|
||||||
SSHLIB_CRYPT_AES128_CTR = 3
|
;SSHLIB_CRYPT_AES128_CTR = 3 ; aes128-ctr
|
||||||
SSHLIB_CRYPT_AES128_CBC = 4
|
;SSHLIB_CRYPT_AES128_CBC = 4 ; aes128-cbc
|
||||||
SSHLIB_CRYPT_AES192_CTR = 5
|
;SSHLIB_CRYPT_AES192_CTR = 5 ; aes192-cbc
|
||||||
SSHLIB_CRYPT_AES192_CBC = 6
|
;SSHLIB_CRYPT_AES192_CBC = 6 ; aes192-ctr
|
||||||
SSHLIB_CRYPT_AES256_CTR = 7
|
SSHLIB_CRYPT_AES256_CTR = 7 ; aes256-ctr
|
||||||
SSHLIB_CRYPT_AES256_CBC = 8
|
SSHLIB_CRYPT_AES256_CBC = 8 ; aes256-cbc
|
||||||
|
SSHLIB_CRYPT_CHACHA20_POLY1305 = 9 ; chacha20-poly1305@openssh.com"
|
||||||
|
|
||||||
SSHLIB_HMAC_MD5 = 1
|
;SSHLIB_HMAC_MD5 = 1 ; hmac-md5
|
||||||
SSHLIB_HMAC_SHA1 = 2
|
;SSHLIB_HMAC_SHA1 = 2 ; hmac-sha1
|
||||||
SSHLIB_HMAC_SHA1_96 = 3
|
;SSHLIB_HMAC_SHA1_96 = 3 ; hmac-sha1-96
|
||||||
SSHLIB_HMAC_SHA2_256 = 4
|
SSHLIB_HMAC_SHA2_256 = 4 ; hmac-sha2-256
|
||||||
|
|
||||||
SSHLIB_COMPR_NONE = 1
|
SSHLIB_COMPR_NONE = 1
|
||||||
SSHLIB_COMPR_ZLIB = 2
|
SSHLIB_COMPR_ZLIB = 2
|
||||||
@ -97,31 +98,39 @@ ends
|
|||||||
struct sshlib_connection
|
struct sshlib_connection
|
||||||
|
|
||||||
status dd ?
|
status dd ?
|
||||||
|
|
||||||
socketnum dd ?
|
socketnum dd ?
|
||||||
|
|
||||||
|
rx_proc dd ?
|
||||||
|
tx_proc dd ?
|
||||||
|
|
||||||
|
rx_mac_ctx rb LIBCRASH_CTX_LEN
|
||||||
|
tx_mac_ctx rb LIBCRASH_CTX_LEN
|
||||||
|
|
||||||
|
rx_crypt_ctx rb LIBCRASH_CTX_LEN
|
||||||
|
tx_crypt_ctx rb LIBCRASH_CTX_LEN
|
||||||
|
|
||||||
rx_crypt_proc dd ?
|
rx_crypt_proc dd ?
|
||||||
tx_crypt_proc dd ?
|
tx_crypt_proc dd ?
|
||||||
rx_crypt_ctx_ptr dd ?
|
; rx_crypt_ctx_ptr dd ?
|
||||||
tx_crypt_ctx_ptr dd ?
|
; tx_crypt_ctx_ptr dd ?
|
||||||
rx_crypt_blocksize dd ?
|
rx_crypt_blocksize dd ?
|
||||||
tx_crypt_blocksize dd ?
|
tx_crypt_blocksize dd ?
|
||||||
|
|
||||||
tx_pad_size dd ? ; = Max(8, tx_crypt_blocksize)
|
tx_pad_size dd ? ; = Max(8, tx_crypt_blocksize)
|
||||||
tx_pad_proc dd ?
|
dd ?
|
||||||
|
|
||||||
rx_mac_proc dd ?
|
rx_mac_proc dd ?
|
||||||
tx_mac_proc dd ?
|
tx_mac_proc dd ?
|
||||||
rx_mac_ctx hmac_sha256_context
|
|
||||||
tx_mac_ctx hmac_sha256_context
|
|
||||||
rx_mac_length dd ?
|
rx_mac_length dd ?
|
||||||
tx_mac_length dd ?
|
tx_mac_length dd ?
|
||||||
|
|
||||||
rx_mac_seqnr dd ? ; DO NOT MOVE
|
rd 3 ; align
|
||||||
|
rx_mac_seqnr dd ? ; DO NOT MOVE (specific place for HMAC)
|
||||||
rx_buffer ssh_packet_header
|
rx_buffer ssh_packet_header
|
||||||
rb BUFFERSIZE-sizeof.ssh_packet_header
|
rb BUFFERSIZE-sizeof.ssh_packet_header
|
||||||
|
|
||||||
tx_mac_seqnr dd ? ; DO NOT MOVE
|
tx_mac_seqnr dd ? ; DO NOT MOVE (specific place for HMAC)
|
||||||
tx_buffer ssh_packet_header
|
tx_buffer ssh_packet_header
|
||||||
rb PACKETSIZE-sizeof.ssh_packet_header
|
rb PACKETSIZE-sizeof.ssh_packet_header
|
||||||
|
|
||||||
@ -139,6 +148,13 @@ struct sshlib_connection
|
|||||||
|
|
||||||
hostname_sz rb MAX_HOSTNAME_LENGTH
|
hostname_sz rb MAX_HOSTNAME_LENGTH
|
||||||
|
|
||||||
|
rx_enc_key rb 2*256/8
|
||||||
|
tx_enc_key rb 2*256/8
|
||||||
|
rx_int_key rb 2*256/8
|
||||||
|
tx_int_key rb 2*256/8
|
||||||
|
rx_iv rb 2*256/8
|
||||||
|
tx_iv rb 2*256/8
|
||||||
|
|
||||||
ends
|
ends
|
||||||
|
|
||||||
; SSH channel structure
|
; SSH channel structure
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
; sshlib_channel.inc - SSH channel
|
; sshlib_channel.inc - SSH channel
|
||||||
;
|
;
|
||||||
; Copyright (C) 2016-2021 Jeffrey Amelynck
|
; Copyright (C) 2016-2024 Jeffrey Amelynck
|
||||||
;
|
;
|
||||||
; This program is free software: you can redistribute it and/or modify
|
; This program is free software: you can redistribute it and/or modify
|
||||||
; it under the terms of the GNU General Public License as published by
|
; it under the terms of the GNU General Public License as published by
|
||||||
@ -20,7 +20,7 @@ proc sshlib_chan_open con_ptr; Channel struct ptr?!
|
|||||||
|
|
||||||
; >> Open channel
|
; >> Open channel
|
||||||
|
|
||||||
DEBUGF 2, "SSH: Open channel\n"
|
DEBUGF 2, "SSH: Opening channel\n"
|
||||||
|
|
||||||
mov [ssh_chan.rcv_wnd], BUFFERSIZE
|
mov [ssh_chan.rcv_wnd], BUFFERSIZE
|
||||||
mov [ssh_chan.snd_wnd], 0
|
mov [ssh_chan.snd_wnd], 0
|
||||||
@ -38,9 +38,11 @@ proc sshlib_chan_open con_ptr; Channel struct ptr?!
|
|||||||
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_OPEN_CONFIRMATION
|
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_OPEN_CONFIRMATION
|
||||||
jne .err_proto
|
jne .err_proto
|
||||||
|
|
||||||
|
DEBUGF 2, "SSH: Channel opened successfully\n"
|
||||||
|
|
||||||
; >> Channel request: pty
|
; >> Channel request: pty
|
||||||
|
|
||||||
DEBUGF 2, "SSH: Request pty\n"
|
DEBUGF 2, "SSH: Requesting PTY\n"
|
||||||
|
|
||||||
stdcall sshlib_send_packet, [con_ptr], ssh_msg_channel_request, ssh_msg_channel_request.length, 0
|
stdcall sshlib_send_packet, [con_ptr], ssh_msg_channel_request, ssh_msg_channel_request.length, 0
|
||||||
cmp eax, 0
|
cmp eax, 0
|
||||||
@ -56,9 +58,11 @@ proc sshlib_chan_open con_ptr; Channel struct ptr?!
|
|||||||
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_SUCCESS
|
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_SUCCESS
|
||||||
jne .err_proto
|
jne .err_proto
|
||||||
|
|
||||||
|
DEBUGF 2, "SSH: PTY opened successfully\n"
|
||||||
|
|
||||||
; >> Channel request: shell
|
; >> Channel request: shell
|
||||||
|
|
||||||
DEBUGF 2, "SSH: Request shell\n"
|
DEBUGF 2, "SSH: Requesting shell\n"
|
||||||
|
|
||||||
stdcall sshlib_send_packet, [con_ptr], ssh_msg_shell_request, ssh_msg_shell_request.length, 0
|
stdcall sshlib_send_packet, [con_ptr], ssh_msg_shell_request, ssh_msg_shell_request.length, 0
|
||||||
cmp eax, 0
|
cmp eax, 0
|
||||||
@ -76,6 +80,8 @@ proc sshlib_chan_open con_ptr; Channel struct ptr?!
|
|||||||
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_SUCCESS
|
cmp [esi + sshlib_connection.rx_buffer.message_code], SSH_MSG_CHANNEL_SUCCESS
|
||||||
jne .wait_success
|
jne .wait_success
|
||||||
|
|
||||||
|
DEBUGF 2, "SSH: Shell opened successfully\n"
|
||||||
|
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
.err:
|
.err:
|
||||||
ret
|
ret
|
||||||
@ -84,4 +90,4 @@ proc sshlib_chan_open con_ptr; Channel struct ptr?!
|
|||||||
mov eax, SSHLIB_ERR_PROTOCOL
|
mov eax, SSHLIB_ERR_PROTOCOL
|
||||||
ret
|
ret
|
||||||
|
|
||||||
endp
|
endp
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
; sshlib_connection.inc - SSH connection
|
; sshlib_connection.inc - SSH connection
|
||||||
;
|
;
|
||||||
; Copyright (C) 2016-2021 Jeffrey Amelynck
|
; Copyright (C) 2016-2024 Jeffrey Amelynck
|
||||||
;
|
;
|
||||||
; This program is free software: you can redistribute it and/or modify
|
; This program is free software: you can redistribute it and/or modify
|
||||||
; it under the terms of the GNU General Public License as published by
|
; it under the terms of the GNU General Public License as published by
|
||||||
@ -15,6 +15,8 @@
|
|||||||
; You should have received a copy of the GNU General Public License
|
; You should have received a copy of the GNU General Public License
|
||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
; https://www.ietf.org/rfc/rfc4253.txt
|
||||||
|
|
||||||
proc sshlib_connect con_ptr, hostname_sz
|
proc sshlib_connect con_ptr, hostname_sz
|
||||||
|
|
||||||
locals
|
locals
|
||||||
@ -157,14 +159,16 @@ endl
|
|||||||
mov [eax + sshlib_connection.tx_mac_seqnr], 0
|
mov [eax + sshlib_connection.tx_mac_seqnr], 0
|
||||||
mov [eax + sshlib_connection.rx_crypt_blocksize], 4 ; minimum blocksize
|
mov [eax + sshlib_connection.rx_crypt_blocksize], 4 ; minimum blocksize
|
||||||
mov [eax + sshlib_connection.tx_crypt_blocksize], 4
|
mov [eax + sshlib_connection.tx_crypt_blocksize], 4
|
||||||
mov [eax + sshlib_connection.rx_crypt_proc], sshlib_crypt_null
|
mov [eax + sshlib_connection.rx_crypt_proc], 0
|
||||||
mov [eax + sshlib_connection.tx_crypt_proc], sshlib_crypt_null
|
mov [eax + sshlib_connection.tx_crypt_proc], 0
|
||||||
mov [eax + sshlib_connection.rx_mac_proc], 0
|
mov [eax + sshlib_connection.rx_mac_proc], 0
|
||||||
mov [eax + sshlib_connection.tx_mac_proc], 0
|
mov [eax + sshlib_connection.tx_mac_proc], 0
|
||||||
mov [eax + sshlib_connection.rx_mac_length], 0
|
mov [eax + sshlib_connection.rx_mac_length], 0
|
||||||
mov [eax + sshlib_connection.tx_mac_length], 0
|
mov [eax + sshlib_connection.tx_mac_length], 0
|
||||||
mov [eax + sshlib_connection.tx_pad_size], 8
|
mov [eax + sshlib_connection.tx_pad_size], 8
|
||||||
mov [eax + sshlib_connection.tx_pad_proc], sshlib_padd_null
|
|
||||||
|
mov [eax + sshlib_connection.rx_proc], sshlib_recv_packet_clear
|
||||||
|
mov [eax + sshlib_connection.tx_proc], sshlib_send_packet_clear
|
||||||
|
|
||||||
DEBUGF 2, "Sending KEX init\n"
|
DEBUGF 2, "Sending KEX init\n"
|
||||||
mov edi, ssh_msg_kex.cookie
|
mov edi, ssh_msg_kex.cookie
|
||||||
@ -277,6 +281,45 @@ endl
|
|||||||
test eax, eax
|
test eax, eax
|
||||||
jnz .err
|
jnz .err
|
||||||
|
|
||||||
|
; Set keys and initialize transport subroutines
|
||||||
|
|
||||||
|
DEBUGF 2, "SSH: Setting encryption keys\n"
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
|
||||||
|
; lea ecx, [ebx + sshlib_connection.rx_crypt_ctx]
|
||||||
|
; lea edx, [ebx + sshlib_connection.rx_enc_key]
|
||||||
|
; lea esi, [ebx + sshlib_connection.rx_iv]
|
||||||
|
; invoke aes256ctr.init, ecx, edx, esi, 0
|
||||||
|
;
|
||||||
|
; push [aes256ctr.update]
|
||||||
|
; pop [ebx + sshlib_connection.rx_crypt_proc]
|
||||||
|
; mov [ebx + sshlib_connection.rx_crypt_blocksize], 16 ; AES_BLOCKSIZE
|
||||||
|
;
|
||||||
|
; push [hmac_sha2_256.oneshot]
|
||||||
|
; pop [ebx + sshlib_connection.rx_mac_proc]
|
||||||
|
; mov [ebx + sshlib_connection.rx_mac_length], SHA2_256_LEN
|
||||||
|
;
|
||||||
|
; lea ecx, [ebx + sshlib_connection.tx_crypt_ctx]
|
||||||
|
; lea edx, [ebx + sshlib_connection.tx_enc_key]
|
||||||
|
; lea esi, [ebx + sshlib_connection.tx_iv]
|
||||||
|
; invoke aes256ctr.init, ecx, edx, esi, 0
|
||||||
|
;
|
||||||
|
; push [aes256ctr.update]
|
||||||
|
; pop [ebx + sshlib_connection.tx_crypt_proc]
|
||||||
|
; mov [ebx + sshlib_connection.tx_crypt_blocksize], 16 ; AES_BLOCKSIZE
|
||||||
|
; mov [ebx + sshlib_connection.tx_pad_size], 16 ; AES_BLOCKSIZE
|
||||||
|
;
|
||||||
|
; push [hmac_sha2_256.oneshot]
|
||||||
|
; pop [ebx + sshlib_connection.tx_mac_proc]
|
||||||
|
; mov [ebx + sshlib_connection.tx_mac_length], SHA2_256_LEN
|
||||||
|
;
|
||||||
|
; mov [ebx + sshlib_connection.rx_proc], sshlib_recv_packet_hmac
|
||||||
|
; mov [ebx + sshlib_connection.tx_proc], sshlib_send_packet_hmac
|
||||||
|
|
||||||
|
mov [ebx + sshlib_connection.rx_proc], sshlib_recv_packet_poly1305chacha20
|
||||||
|
mov [ebx + sshlib_connection.tx_proc], sshlib_send_packet_poly1305chacha20
|
||||||
|
|
||||||
; Re-seed RNG for padding bytes
|
; Re-seed RNG for padding bytes
|
||||||
|
|
||||||
call create_seed
|
call create_seed
|
||||||
@ -327,7 +370,7 @@ proc sshlib_msg_handler, con_ptr, flags
|
|||||||
mov esi, [con_ptr]
|
mov esi, [con_ptr]
|
||||||
lea esi, [esi + sshlib_connection.rx_buffer]
|
lea esi, [esi + sshlib_connection.rx_buffer]
|
||||||
mov al, [esi + ssh_packet_header.message_code]
|
mov al, [esi + ssh_packet_header.message_code]
|
||||||
inc esi
|
add esi, sizeof.ssh_packet_header
|
||||||
|
|
||||||
cmp al, SSH_MSG_DISCONNECT
|
cmp al, SSH_MSG_DISCONNECT
|
||||||
je .disc
|
je .disc
|
||||||
@ -346,6 +389,8 @@ proc sshlib_msg_handler, con_ptr, flags
|
|||||||
cmp al, SSH_MSG_CHANNEL_CLOSE
|
cmp al, SSH_MSG_CHANNEL_CLOSE
|
||||||
je .chan_close
|
je .chan_close
|
||||||
|
|
||||||
|
DEBUGF 3, "SSH: Message type: %u\n", al
|
||||||
|
|
||||||
.ret:
|
.ret:
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -364,7 +409,8 @@ proc sshlib_msg_handler, con_ptr, flags
|
|||||||
jmp .recv
|
jmp .recv
|
||||||
|
|
||||||
.glob_req:
|
.glob_req:
|
||||||
DEBUGF 3, "SSH: Global MSG received\n"
|
add esi, 4
|
||||||
|
DEBUGF 3, "SSH: Global MSG received: %s\n", esi
|
||||||
;TODO
|
;TODO
|
||||||
jmp .recv
|
jmp .recv
|
||||||
|
|
||||||
|
|||||||
@ -34,14 +34,6 @@ locals
|
|||||||
temp_ctx dd ?
|
temp_ctx dd ?
|
||||||
|
|
||||||
H dd ? ; exchange hash
|
H dd ? ; exchange hash
|
||||||
|
|
||||||
rx_iv dd ? ; Rx initialisation vector
|
|
||||||
tx_iv dd ? ; Tx initialisation vector
|
|
||||||
rx_enc_key dd ? ; Rx encryption key
|
|
||||||
tx_enc_key dd ? ; Tx encryption key
|
|
||||||
rx_int_key dd ? ; Rx integrity key
|
|
||||||
tx_int_key dd ? ; Tx integrity key
|
|
||||||
|
|
||||||
K_length dd ?
|
K_length dd ?
|
||||||
|
|
||||||
session_id_x rb SHA2_256_LEN+1
|
session_id_x rb SHA2_256_LEN+1
|
||||||
@ -54,7 +46,7 @@ endl
|
|||||||
|
|
||||||
; Allocate memory for temp variables
|
; Allocate memory for temp variables
|
||||||
|
|
||||||
mov ecx, 7*(MAX_BITS/8+4) + 7*SHA2_256_LEN + 2*LIBCRASH_CTX_LEN
|
mov ecx, 7*(MAX_BITS/8+4) + 2*LIBCRASH_CTX_LEN + 1*SHA2_256_LEN
|
||||||
mcall 68, 12
|
mcall 68, 12
|
||||||
test eax, eax
|
test eax, eax
|
||||||
jz .err_nomem
|
jz .err_nomem
|
||||||
@ -83,18 +75,6 @@ endl
|
|||||||
|
|
||||||
mov [H], eax
|
mov [H], eax
|
||||||
add eax, SHA2_256_LEN
|
add eax, SHA2_256_LEN
|
||||||
mov [rx_iv], eax
|
|
||||||
add eax, SHA2_256_LEN
|
|
||||||
mov [tx_iv], eax
|
|
||||||
add eax, SHA2_256_LEN
|
|
||||||
mov [rx_enc_key], eax
|
|
||||||
add eax, SHA2_256_LEN
|
|
||||||
mov [tx_enc_key], eax
|
|
||||||
add eax, SHA2_256_LEN
|
|
||||||
mov [rx_int_key], eax
|
|
||||||
add eax, SHA2_256_LEN
|
|
||||||
mov [tx_int_key], eax
|
|
||||||
; add eax, SHA2_256_LEN
|
|
||||||
|
|
||||||
; Copy the partial exchange hash to our temporary one
|
; Copy the partial exchange hash to our temporary one
|
||||||
|
|
||||||
@ -297,6 +277,25 @@ endl
|
|||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
|
;-------------------------------------
|
||||||
|
; << Parse Diffie-Hellman New Keys MSG
|
||||||
|
|
||||||
|
stdcall sshlib_recv_packet, [con_ptr], 0
|
||||||
|
cmp eax, 0
|
||||||
|
jl .err
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
cmp [ebx + sshlib_connection.rx_buffer.message_code], SSH_MSG_NEWKEYS
|
||||||
|
jne .err_proto
|
||||||
|
|
||||||
|
DEBUGF 2, "Received New Keys\n"
|
||||||
|
|
||||||
|
;----------------------------------------------------
|
||||||
|
; >> Reply with New Keys message (Using the old keys)
|
||||||
|
|
||||||
|
stdcall sshlib_send_packet, [con_ptr], ssh_msg_new_keys, ssh_msg_new_keys.length, 0
|
||||||
|
cmp eax, 0
|
||||||
|
jl .err
|
||||||
|
|
||||||
;---------------
|
;---------------
|
||||||
; Calculate keys
|
; Calculate keys
|
||||||
@ -321,14 +320,12 @@ endl
|
|||||||
mov byte[edx], 'A'
|
mov byte[edx], 'A'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [tx_iv]
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx + sshlib_connection.tx_iv]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Remote IV: "
|
|
||||||
stdcall dump_hex, [tx_iv], SHA2_256_LEN/4
|
|
||||||
|
|
||||||
;---------------------------------------------------------------
|
;---------------------------------------------------------------
|
||||||
; Initial IV server to client: HASH(K || H || "B" || session_id)
|
; Initial IV server to client: HASH(K || H || "B" || session_id)
|
||||||
|
|
||||||
@ -340,14 +337,12 @@ endl
|
|||||||
mov byte[edx], 'B'
|
mov byte[edx], 'B'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [rx_iv]
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx + sshlib_connection.rx_iv]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Local IV: "
|
|
||||||
stdcall dump_hex, [rx_iv], SHA2_256_LEN/4
|
|
||||||
|
|
||||||
;-------------------------------------------------------------------
|
;-------------------------------------------------------------------
|
||||||
; Encryption key client to server: HASH(K || H || "C" || session_id)
|
; Encryption key client to server: HASH(K || H || "C" || session_id)
|
||||||
|
|
||||||
@ -359,13 +354,27 @@ endl
|
|||||||
mov byte[edx], 'C'
|
mov byte[edx], 'C'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [tx_enc_key]
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx+sshlib_connection.tx_enc_key]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Remote key: "
|
mov esi, [k_h_ctx]
|
||||||
stdcall dump_hex, [tx_enc_key], SHA2_256_LEN/4
|
mov edi, [temp_ctx]
|
||||||
|
mov ecx, LIBCRASH_CTX_LEN/4
|
||||||
|
rep movsd
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx+sshlib_connection.tx_enc_key]
|
||||||
|
invoke sha2_256_update, [temp_ctx], edi, SHA2_256_LEN
|
||||||
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add edi, 256/8
|
||||||
|
mov esi, [temp_ctx]
|
||||||
|
mov ecx, SHA2_256_LEN/4
|
||||||
|
rep movsd
|
||||||
|
|
||||||
;-------------------------------------------------------------------
|
;-------------------------------------------------------------------
|
||||||
; Encryption key server to client: HASH(K || H || "D" || session_id)
|
; Encryption key server to client: HASH(K || H || "D" || session_id)
|
||||||
@ -378,13 +387,27 @@ endl
|
|||||||
mov byte[edx], 'D'
|
mov byte[edx], 'D'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [rx_enc_key]
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx+sshlib_connection.rx_enc_key]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Local key: "
|
mov esi, [k_h_ctx]
|
||||||
stdcall dump_hex, [rx_enc_key], SHA2_256_LEN/4
|
mov edi, [temp_ctx]
|
||||||
|
mov ecx, LIBCRASH_CTX_LEN/4
|
||||||
|
rep movsd
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx+sshlib_connection.rx_enc_key]
|
||||||
|
invoke sha2_256_update, [temp_ctx], edi, SHA2_256_LEN
|
||||||
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add edi, 256/8
|
||||||
|
mov esi, [temp_ctx]
|
||||||
|
mov ecx, SHA2_256_LEN/4
|
||||||
|
rep movsd
|
||||||
|
|
||||||
;------------------------------------------------------------------
|
;------------------------------------------------------------------
|
||||||
; Integrity key client to server: HASH(K || H || "E" || session_id)
|
; Integrity key client to server: HASH(K || H || "E" || session_id)
|
||||||
@ -397,14 +420,12 @@ endl
|
|||||||
mov byte[edx], 'E'
|
mov byte[edx], 'E'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [tx_int_key]
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx + sshlib_connection.tx_int_key]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Remote Integrity key: "
|
|
||||||
stdcall dump_hex, [tx_int_key], SHA2_256_LEN/4
|
|
||||||
|
|
||||||
;------------------------------------------------------------------
|
;------------------------------------------------------------------
|
||||||
; Integrity key server to client: HASH(K || H || "F" || session_id)
|
; Integrity key server to client: HASH(K || H || "F" || session_id)
|
||||||
|
|
||||||
@ -416,76 +437,20 @@ endl
|
|||||||
mov byte[edx], 'F'
|
mov byte[edx], 'F'
|
||||||
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
invoke sha2_256_update, [temp_ctx], edx, SHA2_256_LEN+1
|
||||||
invoke sha2_256_finish, [temp_ctx]
|
invoke sha2_256_finish, [temp_ctx]
|
||||||
mov edi, [rx_int_key]
|
mov ebx, [con_ptr]
|
||||||
|
lea edi, [ebx + sshlib_connection.rx_int_key]
|
||||||
mov esi, [temp_ctx]
|
mov esi, [temp_ctx]
|
||||||
mov ecx, SHA2_256_LEN/4
|
mov ecx, SHA2_256_LEN/4
|
||||||
rep movsd
|
rep movsd
|
||||||
|
|
||||||
DEBUGF 1, "Local Integrity key: "
|
|
||||||
stdcall dump_hex, [rx_int_key] , SHA2_256_LEN/4
|
|
||||||
|
|
||||||
;-------------------------------------
|
|
||||||
; << Parse Diffie-Hellman New Keys MSG
|
|
||||||
|
|
||||||
stdcall sshlib_recv_packet, [con_ptr], 0
|
|
||||||
cmp eax, 0
|
|
||||||
jl .err
|
|
||||||
|
|
||||||
mov ebx, [con_ptr]
|
mov ebx, [con_ptr]
|
||||||
cmp [ebx + sshlib_connection.rx_buffer.message_code], SSH_MSG_NEWKEYS
|
|
||||||
jne .err_proto
|
|
||||||
|
|
||||||
DEBUGF 2, "Received New Keys\n"
|
|
||||||
|
|
||||||
;-------------------------------
|
|
||||||
; >> Reply with New Keys message
|
|
||||||
|
|
||||||
stdcall sshlib_send_packet, [con_ptr], ssh_msg_new_keys, ssh_msg_new_keys.length, 0
|
|
||||||
cmp eax, 0
|
|
||||||
jl .err
|
|
||||||
|
|
||||||
;----------------------------------------------
|
|
||||||
; Set keys and initialize transport subroutines
|
|
||||||
|
|
||||||
DEBUGF 2, "SSH: Setting encryption keys\n"
|
|
||||||
|
|
||||||
mov ebx, [con_ptr]
|
|
||||||
stdcall aes256_ctr_init, [rx_iv]
|
|
||||||
test eax, eax
|
|
||||||
jz .err_nomem
|
|
||||||
mov [ebx + sshlib_connection.rx_crypt_ctx_ptr], eax
|
|
||||||
stdcall aes256_set_encrypt_key, eax, [rx_enc_key]
|
|
||||||
mov [ebx + sshlib_connection.rx_crypt_proc], aes256_ctr_crypt
|
|
||||||
mov [ebx + sshlib_connection.rx_crypt_blocksize], AES256_BLOCKSIZE
|
|
||||||
|
|
||||||
stdcall aes256_ctr_init, [tx_iv]
|
|
||||||
test eax, eax
|
|
||||||
jz .err_nomem
|
|
||||||
mov [ebx + sshlib_connection.tx_crypt_ctx_ptr], eax
|
|
||||||
stdcall aes256_set_encrypt_key, eax, [tx_enc_key]
|
|
||||||
mov [ebx + sshlib_connection.tx_crypt_proc], aes256_ctr_crypt
|
|
||||||
mov [ebx + sshlib_connection.tx_crypt_blocksize], AES256_BLOCKSIZE
|
|
||||||
|
|
||||||
mov [ebx + sshlib_connection.tx_pad_size], AES256_BLOCKSIZE
|
|
||||||
mov [ebx + sshlib_connection.tx_pad_proc], MBRandom
|
|
||||||
|
|
||||||
lea ecx, [ebx + sshlib_connection.rx_mac_ctx]
|
|
||||||
stdcall hmac_sha256_setkey, ecx, [rx_int_key], SHA2_256_LEN
|
|
||||||
mov [ebx + sshlib_connection.rx_mac_proc], hmac_sha256
|
|
||||||
mov [ebx + sshlib_connection.rx_mac_length], SHA2_256_LEN
|
|
||||||
|
|
||||||
lea ecx, [ebx + sshlib_connection.tx_mac_ctx]
|
|
||||||
stdcall hmac_sha256_setkey, ecx, [tx_int_key], SHA2_256_LEN
|
|
||||||
mov [ebx + sshlib_connection.tx_mac_proc], hmac_sha256
|
|
||||||
mov [ebx + sshlib_connection.tx_mac_length], SHA2_256_LEN
|
|
||||||
|
|
||||||
mov [ebx + sshlib_connection.status], SSHLIB_CON_STAT_KEX_DONE
|
mov [ebx + sshlib_connection.status], SSHLIB_CON_STAT_KEX_DONE
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
|
|
||||||
.err:
|
.err:
|
||||||
push eax
|
push eax
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
mov ecx, (7*(MAX_BITS/8+4) + 7*SHA2_256_LEN + 2*LIBCRASH_CTX_LEN)/4
|
mov ecx, (7*(MAX_BITS/8+4) + 2*LIBCRASH_CTX_LEN + 1*SHA2_256_LEN )/4
|
||||||
mov edi, [mpint_tmp]
|
mov edi, [mpint_tmp]
|
||||||
rep stosd
|
rep stosd
|
||||||
|
|
||||||
|
|||||||
@ -1,33 +1,49 @@
|
|||||||
|
|
||||||
SSH_MSG_DISCONNECT = 1
|
SSH_MSG_DISCONNECT = 1
|
||||||
SSH_MSG_IGNORE = 2
|
SSH_MSG_IGNORE = 2
|
||||||
SSH_MSG_UNIMPLEMENTED = 3
|
SSH_MSG_UNIMPLEMENTED = 3
|
||||||
SSH_MSG_DEBUG = 4
|
SSH_MSG_DEBUG = 4
|
||||||
SSH_MSG_SERVICE_REQUEST = 5
|
SSH_MSG_SERVICE_REQUEST = 5
|
||||||
SSH_MSG_SERVICE_ACCEPT = 6
|
SSH_MSG_SERVICE_ACCEPT = 6
|
||||||
SSH_MSG_KEXINIT = 20
|
SSH_MSG_KEXINIT = 20
|
||||||
SSH_MSG_NEWKEYS = 21
|
SSH_MSG_NEWKEYS = 21
|
||||||
SSH_MSG_KEX_DH_GEX_REQUEST_OLD = 30
|
SSH_MSG_KEX_DH_GEX_REQUEST_OLD = 30
|
||||||
SSH_MSG_KEX_DH_GEX_GROUP = 31
|
SSH_MSG_KEX_DH_GEX_GROUP = 31
|
||||||
SSH_MSG_KEX_DH_GEX_INIT = 32
|
SSH_MSG_KEX_DH_GEX_INIT = 32
|
||||||
SSH_MSG_KEX_DH_GEX_REPLY = 33
|
SSH_MSG_KEX_DH_GEX_REPLY = 33
|
||||||
SSH_MSG_KEX_DH_GEX_REQUEST = 34
|
SSH_MSG_KEX_DH_GEX_REQUEST = 34
|
||||||
SSH_MSG_USERAUTH_REQUEST = 50
|
SSH_MSG_USERAUTH_REQUEST = 50
|
||||||
SSH_MSG_USERAUTH_FAILURE = 51
|
SSH_MSG_USERAUTH_FAILURE = 51
|
||||||
SSH_MSG_USERAUTH_SUCCESS = 52
|
SSH_MSG_USERAUTH_SUCCESS = 52
|
||||||
SSH_MSG_USERAUTH_BANNER = 53
|
SSH_MSG_USERAUTH_BANNER = 53
|
||||||
SSH_MSG_USERAUTH_PASSWD_CHANGEREQ = 60
|
SSH_MSG_USERAUTH_PASSWD_CHANGEREQ = 60
|
||||||
SSH_MSG_GLOBAL_REQUEST = 80
|
SSH_MSG_GLOBAL_REQUEST = 80
|
||||||
SSH_MSG_REQUEST_SUCCESS = 81
|
SSH_MSG_REQUEST_SUCCESS = 81
|
||||||
SSH_MSG_REQUEST_FAILURE = 82
|
SSH_MSG_REQUEST_FAILURE = 82
|
||||||
SSH_MSG_CHANNEL_OPEN = 90
|
SSH_MSG_CHANNEL_OPEN = 90
|
||||||
SSH_MSG_CHANNEL_OPEN_CONFIRMATION = 91
|
SSH_MSG_CHANNEL_OPEN_CONFIRMATION = 91
|
||||||
SSH_MSG_CHANNEL_OPEN_FAILURE = 92
|
SSH_MSG_CHANNEL_OPEN_FAILURE = 92
|
||||||
SSH_MSG_CHANNEL_WINDOW_ADJUST = 93
|
SSH_MSG_CHANNEL_WINDOW_ADJUST = 93
|
||||||
SSH_MSG_CHANNEL_DATA = 94
|
SSH_MSG_CHANNEL_DATA = 94
|
||||||
SSH_MSG_CHANNEL_EXTENDED_DATA = 95
|
SSH_MSG_CHANNEL_EXTENDED_DATA = 95
|
||||||
SSH_MSG_CHANNEL_EOF = 96
|
SSH_MSG_CHANNEL_EOF = 96
|
||||||
SSH_MSG_CHANNEL_CLOSE = 97
|
SSH_MSG_CHANNEL_CLOSE = 97
|
||||||
SSH_MSG_CHANNEL_REQUEST = 98
|
SSH_MSG_CHANNEL_REQUEST = 98
|
||||||
SSH_MSG_CHANNEL_SUCCESS = 99
|
SSH_MSG_CHANNEL_SUCCESS = 99
|
||||||
SSH_MSG_CHANNEL_FAILURE = 100
|
SSH_MSG_CHANNEL_FAILURE = 100
|
||||||
|
|
||||||
|
SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT = 1
|
||||||
|
SSH_DISCONNECT_PROTOCOL_ERROR = 2
|
||||||
|
SSH_DISCONNECT_KEY_EXCHANGE_FAILED = 3
|
||||||
|
SSH_DISCONNECT_RESERVED = 4
|
||||||
|
SSH_DISCONNECT_MAC_ERROR = 5
|
||||||
|
SSH_DISCONNECT_COMPRESSION_ERROR = 6
|
||||||
|
SSH_DISCONNECT_SERVICE_NOT_AVAILABLE = 7
|
||||||
|
SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED = 8
|
||||||
|
SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE = 9
|
||||||
|
SSH_DISCONNECT_CONNECTION_LOST = 10
|
||||||
|
SSH_DISCONNECT_BY_APPLICATION = 11
|
||||||
|
SSH_DISCONNECT_TOO_MANY_CONNECTIONS = 12
|
||||||
|
SSH_DISCONNECT_AUTH_CANCELLED_BY_USER = 13
|
||||||
|
SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE = 14
|
||||||
|
SSH_DISCONNECT_ILLEGAL_USER_NAME = 15
|
||||||
@ -1,6 +1,6 @@
|
|||||||
; sshlib_transport.inc - SSH transport layer
|
; sshlib_transport.inc - SSH transport layer
|
||||||
;
|
;
|
||||||
; Copyright (C) 2016-2021 Jeffrey Amelynck
|
; Copyright (C) 2016-2024 Jeffrey Amelynck
|
||||||
;
|
;
|
||||||
; This program is free software: you can redistribute it and/or modify
|
; This program is free software: you can redistribute it and/or modify
|
||||||
; it under the terms of the GNU General Public License as published by
|
; it under the terms of the GNU General Public License as published by
|
||||||
@ -16,22 +16,21 @@
|
|||||||
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
proc sshlib_padd_null
|
align 16
|
||||||
|
sshlib_recv_packet: ; con_ptr, flags
|
||||||
|
|
||||||
xor eax, eax
|
mov eax, [esp+4]
|
||||||
ret
|
jmp [eax+sshlib_connection.rx_proc]
|
||||||
|
|
||||||
endp
|
align 16
|
||||||
|
sshlib_send_packet: ; con_ptr, flags
|
||||||
|
|
||||||
proc sshlib_crypt_null ctx, src, dst
|
mov eax, [esp+4]
|
||||||
|
jmp [eax+sshlib_connection.tx_proc]
|
||||||
|
|
||||||
; Assume src == dst !
|
|
||||||
|
|
||||||
ret
|
align 16
|
||||||
|
proc sshlib_recv_packet_clear con_ptr, flags
|
||||||
endp
|
|
||||||
|
|
||||||
proc sshlib_recv_packet con_ptr, flags
|
|
||||||
|
|
||||||
locals
|
locals
|
||||||
data_length dd ? ; Total length of packet without MAC
|
data_length dd ? ; Total length of packet without MAC
|
||||||
@ -40,9 +39,9 @@ endl
|
|||||||
DEBUGF 3, "> "
|
DEBUGF 3, "> "
|
||||||
; Receive first block (Read length, padding length, message code)
|
; Receive first block (Read length, padding length, message code)
|
||||||
mov ebx, [con_ptr]
|
mov ebx, [con_ptr]
|
||||||
mov ecx, [ebx+sshlib_connection.socketnum]
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
mov esi, [ebx+sshlib_connection.rx_crypt_blocksize]
|
mov esi, 4
|
||||||
lea edx, [ebx+sshlib_connection.rx_buffer]
|
lea edx, [ebx + sshlib_connection.rx_buffer]
|
||||||
mov edi, [flags]
|
mov edi, [flags]
|
||||||
mcall recv
|
mcall recv
|
||||||
cmp eax, 0
|
cmp eax, 0
|
||||||
@ -50,33 +49,23 @@ endl
|
|||||||
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
||||||
DEBUGF 1, "chunk = %u ", eax
|
DEBUGF 1, "chunk = %u ", eax
|
||||||
mov ebx, [con_ptr]
|
mov ebx, [con_ptr]
|
||||||
cmp eax, [ebx+sshlib_connection.rx_crypt_blocksize]
|
cmp eax, 4
|
||||||
jne .proto_fail ; TODO: handle receives of 1, 2, and 3 bytes correctly
|
jne .proto_fail ; TODO: handle receives of 1, 2, and 3 bytes correctly
|
||||||
|
|
||||||
; Decrypt first block
|
|
||||||
pusha
|
|
||||||
lea esi, [ebx+sshlib_connection.rx_buffer]
|
|
||||||
stdcall [ebx+sshlib_connection.rx_crypt_proc], [ebx+sshlib_connection.rx_crypt_ctx_ptr], esi, esi
|
|
||||||
popa
|
|
||||||
|
|
||||||
; Check data length
|
; Check data length
|
||||||
mov esi, [ebx + sshlib_connection.rx_buffer.packet_length]
|
mov esi, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
bswap esi ; convert length to little endian
|
bswap esi ; convert length to little endian
|
||||||
mov [ebx+sshlib_connection.rx_buffer.packet_length], esi
|
mov [ebx + sshlib_connection.rx_buffer.packet_length], esi
|
||||||
DEBUGF 1, "packet length=%u ", esi
|
DEBUGF 1, "packet length=%u ", esi
|
||||||
cmp esi, BUFFERSIZE
|
cmp esi, BUFFERSIZE
|
||||||
ja .proto_fail ; packet is too large
|
ja .proto_fail ; packet is too large
|
||||||
|
test ecx, ecx
|
||||||
; Calculate amount of remaining data
|
jz .proto_fail
|
||||||
add esi, 4 ; Packet length field itself is not included in the count
|
|
||||||
sub esi, [ebx+sshlib_connection.rx_crypt_blocksize] ; Already received this amount of data
|
|
||||||
add esi, [ebx+sshlib_connection.rx_mac_length]
|
|
||||||
jz .packet_complete
|
|
||||||
|
|
||||||
; Receive remaining data
|
; Receive remaining data
|
||||||
lea edx, [ebx+sshlib_connection.rx_buffer]
|
lea edx, [ebx + sshlib_connection.rx_buffer]
|
||||||
add edx, [ebx+sshlib_connection.rx_crypt_blocksize]
|
add edx, 4
|
||||||
mov ecx, [ebx+sshlib_connection.socketnum]
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
mov edi, [flags]
|
mov edi, [flags]
|
||||||
.receive_loop:
|
.receive_loop:
|
||||||
DEBUGF 3, "want %d bytes.. ", esi
|
DEBUGF 3, "want %d bytes.. ", esi
|
||||||
@ -88,60 +77,21 @@ endl
|
|||||||
add edx, eax
|
add edx, eax
|
||||||
sub esi, eax
|
sub esi, eax
|
||||||
jnz .receive_loop
|
jnz .receive_loop
|
||||||
|
.packet_complete:
|
||||||
; Decrypt data
|
|
||||||
mov ebx, [con_ptr]
|
|
||||||
mov ecx, [ebx + sshlib_connection.rx_buffer.packet_length]
|
|
||||||
add ecx, 4 ; Packet_length field itself
|
|
||||||
sub ecx, [ebx+sshlib_connection.rx_crypt_blocksize] ; Already decrypted this amount of data
|
|
||||||
jz .decrypt_complete
|
|
||||||
|
|
||||||
lea esi, [ebx+sshlib_connection.rx_buffer]
|
|
||||||
add esi, [ebx+sshlib_connection.rx_crypt_blocksize]
|
|
||||||
.decrypt_loop:
|
|
||||||
pusha
|
|
||||||
stdcall [ebx+sshlib_connection.rx_crypt_proc], [ebx+sshlib_connection.rx_crypt_ctx_ptr], esi, esi
|
|
||||||
popa
|
|
||||||
add esi, [ebx+sshlib_connection.rx_crypt_blocksize]
|
|
||||||
sub ecx, [ebx+sshlib_connection.rx_crypt_blocksize]
|
|
||||||
jnz .decrypt_loop
|
|
||||||
.decrypt_complete:
|
|
||||||
|
|
||||||
; Authenticate message
|
|
||||||
cmp [ebx+sshlib_connection.rx_mac_proc], 0
|
|
||||||
je .mac_complete
|
|
||||||
lea esi, [ebx+sshlib_connection.rx_mac_seqnr]
|
|
||||||
mov ecx, [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
add ecx, 8 ; packet_length field itself + sequence number
|
|
||||||
lea eax, [ebx+sshlib_connection.rx_mac_ctx]
|
|
||||||
; push [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
mov edx, [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
bswap edx ; convert length to big endian
|
|
||||||
mov [ebx+sshlib_connection.rx_buffer.packet_length], edx
|
|
||||||
stdcall [ebx+sshlib_connection.rx_mac_proc], eax, esi, ecx
|
|
||||||
; pop [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
mov edx, [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
bswap edx ; convert length to little endian
|
|
||||||
mov [ebx+sshlib_connection.rx_buffer.packet_length], edx
|
|
||||||
|
|
||||||
lea esi, [ebx+sshlib_connection.rx_mac_ctx]
|
|
||||||
lea edi, [ebx+sshlib_connection.rx_buffer+4]
|
|
||||||
add edi, [ebx+sshlib_connection.rx_buffer.packet_length]
|
|
||||||
mov ecx, [ebx+sshlib_connection.rx_mac_length]
|
|
||||||
shr ecx, 2
|
|
||||||
repe cmpsd
|
|
||||||
jne .mac_fail
|
|
||||||
.mac_complete:
|
|
||||||
add byte[ebx+sshlib_connection.rx_mac_seqnr+3], 1 ; Update sequence counter
|
|
||||||
adc byte[ebx+sshlib_connection.rx_mac_seqnr+2], 0
|
|
||||||
adc byte[ebx+sshlib_connection.rx_mac_seqnr+1], 0
|
|
||||||
adc byte[ebx+sshlib_connection.rx_mac_seqnr+0], 0
|
|
||||||
|
|
||||||
; Return useful data length to the caller via eax register
|
; Return useful data length to the caller via eax register
|
||||||
.packet_complete:
|
mov ebx, [con_ptr]
|
||||||
mov eax, [ebx+sshlib_connection.rx_buffer.packet_length]
|
mov eax, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
movzx ebx, [ebx+sshlib_connection.rx_buffer.padding_length]
|
movzx ebx, [ebx + sshlib_connection.rx_buffer.padding_length]
|
||||||
sub eax, ebx
|
sub eax, ebx
|
||||||
|
|
||||||
|
; Update sequence counter
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add byte[ebx + sshlib_connection.rx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+0], 0
|
||||||
|
|
||||||
DEBUGF 1, "useful data length=%u\n", eax
|
DEBUGF 1, "useful data length=%u\n", eax
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -150,12 +100,6 @@ endl
|
|||||||
mov eax, SSHLIB_ERR_SOCKET
|
mov eax, SSHLIB_ERR_SOCKET
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.mac_fail:
|
|
||||||
DEBUGF 3, "ssh_recv_packet message authentication failed!\n"
|
|
||||||
mov eax, SSHLIB_ERR_MAC_VERIFY_FAIL
|
|
||||||
xor ebx, ebx
|
|
||||||
ret
|
|
||||||
|
|
||||||
.proto_fail:
|
.proto_fail:
|
||||||
DEBUGF 3, "ssh_recv_packet protocol failure!\n"
|
DEBUGF 3, "ssh_recv_packet protocol failure!\n"
|
||||||
mov eax, SSHLIB_ERR_PROTOCOL
|
mov eax, SSHLIB_ERR_PROTOCOL
|
||||||
@ -165,7 +109,8 @@ endl
|
|||||||
endp
|
endp
|
||||||
|
|
||||||
|
|
||||||
proc sshlib_send_packet con_ptr, buf, payload_size, flags
|
align 16
|
||||||
|
proc sshlib_send_packet_clear con_ptr, buf, payload_size, flags
|
||||||
|
|
||||||
locals
|
locals
|
||||||
packet_size dd ?
|
packet_size dd ?
|
||||||
@ -191,7 +136,7 @@ endl
|
|||||||
; Start building the packet
|
; Start building the packet
|
||||||
; First comes the packet length, in network byte order ofcourse.
|
; First comes the packet length, in network byte order ofcourse.
|
||||||
add eax, edx
|
add eax, edx
|
||||||
DEBUGF 1, "total size: %u ", eax
|
DEBUGF 2, "total size: %u ", eax
|
||||||
bswap eax
|
bswap eax
|
||||||
lea edi, [ecx+sshlib_connection.tx_buffer]
|
lea edi, [ecx+sshlib_connection.tx_buffer]
|
||||||
stosd
|
stosd
|
||||||
@ -212,62 +157,31 @@ endl
|
|||||||
mov ebx, edx
|
mov ebx, edx
|
||||||
and ebx, 3
|
and ebx, 3
|
||||||
inc ebx ; number bytes in first write (1-4)
|
inc ebx ; number bytes in first write (1-4)
|
||||||
mov edx, [con_ptr]
|
mov dword[edi], 0
|
||||||
call [edx+sshlib_connection.tx_pad_proc]
|
|
||||||
mov dword[edi], eax
|
|
||||||
add edi, ebx
|
add edi, ebx
|
||||||
; Then, do as many aligned writes as nescessary
|
; Then, do as many aligned writes as nescessary
|
||||||
mov ebx, [con_ptr]
|
xor eax, eax
|
||||||
@@:
|
@@:
|
||||||
call [ebx+sshlib_connection.tx_pad_proc]
|
|
||||||
stosd
|
stosd
|
||||||
dec esi
|
dec esi
|
||||||
jnz @r
|
jnz @r
|
||||||
|
|
||||||
; Append the packet with Message Authentication Code
|
|
||||||
mov edx, [con_ptr]
|
|
||||||
cmp [edx+sshlib_connection.tx_mac_proc], 0
|
|
||||||
je .mac_complete
|
|
||||||
DEBUGF 1, "MAC sequence number: 0x%x\n", [edx+sshlib_connection.tx_mac_seqnr]
|
|
||||||
lea esi, [edx+sshlib_connection.tx_mac_seqnr]
|
|
||||||
mov ecx, [packet_size]
|
|
||||||
add ecx, 4 ; Sequence number length
|
|
||||||
lea eax, [edx+sshlib_connection.tx_mac_ctx]
|
|
||||||
stdcall [edx+sshlib_connection.tx_mac_proc], eax, esi, ecx
|
|
||||||
|
|
||||||
lea esi, [edx+sshlib_connection.tx_mac_ctx]
|
|
||||||
lea edi, [edx+sshlib_connection.tx_buffer]
|
|
||||||
add edi, [packet_size]
|
|
||||||
mov ecx, [edx+sshlib_connection.tx_mac_length]
|
|
||||||
shr ecx, 2
|
|
||||||
rep movsd
|
|
||||||
.mac_complete:
|
|
||||||
add byte[edx+sshlib_connection.tx_mac_seqnr+3], 1 ; Update sequence counter
|
|
||||||
adc byte[edx+sshlib_connection.tx_mac_seqnr+2], 0
|
|
||||||
adc byte[edx+sshlib_connection.tx_mac_seqnr+1], 0
|
|
||||||
adc byte[edx+sshlib_connection.tx_mac_seqnr+0], 0
|
|
||||||
|
|
||||||
; Now, encrypt everything but MAC
|
|
||||||
lea esi, [edx+sshlib_connection.tx_buffer]
|
|
||||||
mov ecx, [packet_size]
|
|
||||||
.encrypt_loop:
|
|
||||||
pusha
|
|
||||||
stdcall [edx+sshlib_connection.tx_crypt_proc], [edx+sshlib_connection.tx_crypt_ctx_ptr], esi, esi
|
|
||||||
popa
|
|
||||||
add esi, [edx+sshlib_connection.tx_crypt_blocksize]
|
|
||||||
sub ecx, [edx+sshlib_connection.tx_crypt_blocksize]
|
|
||||||
jnz .encrypt_loop
|
|
||||||
|
|
||||||
; Send the packet
|
; Send the packet
|
||||||
mov ebx, [con_ptr]
|
mov ebx, [con_ptr]
|
||||||
mov ecx, [ebx+sshlib_connection.socketnum]
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
lea edx, [ebx+sshlib_connection.tx_buffer]
|
lea edx, [ebx + sshlib_connection.tx_buffer]
|
||||||
mov esi, [packet_size]
|
mov esi, [packet_size]
|
||||||
add esi, [ebx+sshlib_connection.tx_mac_length]
|
|
||||||
mov edi, [flags]
|
mov edi, [flags]
|
||||||
mcall send
|
mcall send
|
||||||
|
|
||||||
DEBUGF 1, "\n"
|
; Update sequence counter
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add byte[ebx + sshlib_connection.tx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+0], 0
|
||||||
|
|
||||||
|
DEBUGF 2, "\n"
|
||||||
|
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|||||||
257
programs/network/ssh/sshlib_transport_hmac.inc
Executable file
257
programs/network/ssh/sshlib_transport_hmac.inc
Executable file
@ -0,0 +1,257 @@
|
|||||||
|
; sshlib_transport.inc - SSH transport layer
|
||||||
|
;
|
||||||
|
; Copyright (C) 2016-2024 Jeffrey Amelynck
|
||||||
|
;
|
||||||
|
; This program is free software: you can redistribute it and/or modify
|
||||||
|
; it under the terms of the GNU General Public License as published by
|
||||||
|
; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
; (at your option) any later version.
|
||||||
|
;
|
||||||
|
; This program is distributed in the hope that it will be useful,
|
||||||
|
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
; GNU General Public License for more details.
|
||||||
|
;
|
||||||
|
; You should have received a copy of the GNU General Public License
|
||||||
|
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
align 16
|
||||||
|
proc sshlib_recv_packet_hmac con_ptr, flags
|
||||||
|
|
||||||
|
locals
|
||||||
|
data_length dd ? ; Total length of packet without MAC
|
||||||
|
endl
|
||||||
|
|
||||||
|
DEBUGF 3, "> "
|
||||||
|
; Receive first block
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
|
mov esi, [ebx + sshlib_connection.rx_crypt_blocksize]
|
||||||
|
lea edx, [ebx + sshlib_connection.rx_buffer]
|
||||||
|
mov edi, [flags]
|
||||||
|
mcall recv
|
||||||
|
cmp eax, 0
|
||||||
|
jle .sock_fail
|
||||||
|
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
||||||
|
DEBUGF 2, "chunk = %u ", eax
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
cmp eax, [ebx + sshlib_connection.rx_crypt_blocksize]
|
||||||
|
jne .proto_fail ; TODO: handle receives of 1, 2, and 3 bytes correctly
|
||||||
|
|
||||||
|
; Decrypt first block
|
||||||
|
pusha
|
||||||
|
lea esi, [ebx + sshlib_connection.rx_buffer]
|
||||||
|
lea ecx, [ebx + sshlib_connection.rx_crypt_ctx]
|
||||||
|
stdcall [ebx + sshlib_connection.rx_crypt_proc], ecx, esi, eax, esi
|
||||||
|
popa
|
||||||
|
|
||||||
|
; Check data length
|
||||||
|
mov esi, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
bswap esi ; convert length to little endian
|
||||||
|
mov [ebx + sshlib_connection.rx_buffer.packet_length], esi
|
||||||
|
DEBUGF 2, "packet length=%u ", esi
|
||||||
|
cmp esi, BUFFERSIZE
|
||||||
|
ja .proto_fail ; packet is too large
|
||||||
|
|
||||||
|
; Calculate amount of remaining data
|
||||||
|
add esi, 4 ; Packet length field itself is not included in the count
|
||||||
|
sub esi, [ebx + sshlib_connection.rx_crypt_blocksize] ; Already received this amount of data
|
||||||
|
add esi, [ebx + sshlib_connection.rx_mac_length]
|
||||||
|
jz .packet_complete
|
||||||
|
|
||||||
|
; Receive remaining data
|
||||||
|
lea edx, [ebx + sshlib_connection.rx_buffer]
|
||||||
|
add edx, [ebx + sshlib_connection.rx_crypt_blocksize]
|
||||||
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
|
mov edi, [flags]
|
||||||
|
.receive_loop:
|
||||||
|
DEBUGF 3, "want %d bytes.. ", esi
|
||||||
|
mcall recv
|
||||||
|
cmp eax, 0
|
||||||
|
jle .sock_fail
|
||||||
|
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
||||||
|
DEBUGF 3, "got %d bytes\n", eax
|
||||||
|
add edx, eax
|
||||||
|
sub esi, eax
|
||||||
|
jnz .receive_loop
|
||||||
|
.packet_complete:
|
||||||
|
|
||||||
|
; Decrypt data
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
mov ecx, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
add ecx, 4 ; Packet_length field itself
|
||||||
|
sub ecx, [ebx + sshlib_connection.rx_crypt_blocksize] ; Already decrypted this amount of data
|
||||||
|
jz .decrypt_complete
|
||||||
|
|
||||||
|
lea esi, [ebx + sshlib_connection.rx_buffer]
|
||||||
|
add esi, [ebx + sshlib_connection.rx_crypt_blocksize]
|
||||||
|
pusha
|
||||||
|
lea eax, [ebx + sshlib_connection.rx_crypt_ctx]
|
||||||
|
stdcall [ebx + sshlib_connection.rx_crypt_proc], eax, esi, ecx, esi
|
||||||
|
popa
|
||||||
|
.decrypt_complete:
|
||||||
|
|
||||||
|
; Authenticate message
|
||||||
|
lea esi, [ebx + sshlib_connection.rx_mac_seqnr]
|
||||||
|
mov ecx, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
add ecx, 8 ; packet_length field itself + sequence number
|
||||||
|
lea eax, [ebx + sshlib_connection.rx_mac_ctx]
|
||||||
|
mov edx, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
bswap edx ; convert length to big endian
|
||||||
|
mov [ebx + sshlib_connection.rx_buffer.packet_length], edx
|
||||||
|
lea edx, [ebx + sshlib_connection.rx_int_key]
|
||||||
|
stdcall [ebx + sshlib_connection.rx_mac_proc], eax, esi, ecx, edx, SHA2_256_LEN
|
||||||
|
mov edx, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
bswap edx ; convert length to little endian
|
||||||
|
mov [ebx + sshlib_connection.rx_buffer.packet_length], edx
|
||||||
|
|
||||||
|
lea esi, [ebx + sshlib_connection.rx_mac_ctx]
|
||||||
|
lea edi, [ebx + sshlib_connection.rx_buffer+4]
|
||||||
|
add edi, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
mov ecx, [ebx + sshlib_connection.rx_mac_length]
|
||||||
|
shr ecx, 2
|
||||||
|
repe cmpsd ; TODO: constant time
|
||||||
|
jne .mac_fail
|
||||||
|
|
||||||
|
; Return useful data length to the caller via eax register
|
||||||
|
mov eax, [ebx + sshlib_connection.rx_buffer.packet_length]
|
||||||
|
movzx ebx, [ebx + sshlib_connection.rx_buffer.padding_length]
|
||||||
|
sub eax, ebx
|
||||||
|
|
||||||
|
; Update sequence counter
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add byte[ebx + sshlib_connection.rx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx + sshlib_connection.rx_mac_seqnr+0], 0
|
||||||
|
|
||||||
|
DEBUGF 1, "useful data length=%u\n", eax
|
||||||
|
|
||||||
|
ret
|
||||||
|
|
||||||
|
.sock_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet failed!\n"
|
||||||
|
mov eax, SSHLIB_ERR_SOCKET
|
||||||
|
ret
|
||||||
|
|
||||||
|
.mac_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet message authentication failed!\n"
|
||||||
|
mov eax, SSHLIB_ERR_MAC_VERIFY_FAIL
|
||||||
|
xor ebx, ebx
|
||||||
|
ret
|
||||||
|
|
||||||
|
.proto_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet protocol failure!\n"
|
||||||
|
mov eax, SSHLIB_ERR_PROTOCOL
|
||||||
|
xor ebx, ebx
|
||||||
|
ret
|
||||||
|
|
||||||
|
endp
|
||||||
|
|
||||||
|
|
||||||
|
align 16
|
||||||
|
proc sshlib_send_packet_hmac con_ptr, buf, payload_size, flags
|
||||||
|
|
||||||
|
locals
|
||||||
|
packet_size dd ?
|
||||||
|
endl
|
||||||
|
DEBUGF 2, "< "
|
||||||
|
|
||||||
|
; Check how many bytes we should pad
|
||||||
|
mov eax, [payload_size]
|
||||||
|
inc eax ; padding length byte
|
||||||
|
lea edx, [eax+4] ; total packet size (without padding and MAC)
|
||||||
|
mov [packet_size], edx
|
||||||
|
|
||||||
|
mov ecx, [con_ptr]
|
||||||
|
; mov edx, eax;;;;;;;;;;;;;;;
|
||||||
|
mov ebx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
dec ebx
|
||||||
|
and edx, ebx
|
||||||
|
neg edx
|
||||||
|
add edx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
add edx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
DEBUGF 1, "padding %u bytes ", edx
|
||||||
|
add [packet_size], edx ; total packet size with padding
|
||||||
|
|
||||||
|
; Start building the packet
|
||||||
|
; First comes the packet length, in network byte order ofcourse.
|
||||||
|
add eax, edx
|
||||||
|
DEBUGF 2, "total size: %u ", eax
|
||||||
|
bswap eax
|
||||||
|
lea edi, [ecx+sshlib_connection.tx_buffer]
|
||||||
|
stosd
|
||||||
|
; Then the padding length
|
||||||
|
mov al, dl
|
||||||
|
stosb
|
||||||
|
; And the actual payload bytes
|
||||||
|
mov esi, [buf]
|
||||||
|
mov ecx, [payload_size]
|
||||||
|
rep movsb
|
||||||
|
|
||||||
|
; Append the packet with #edx padding bytes.
|
||||||
|
; Since we must pad at least 8 bytes, we can always use DWORD writes.
|
||||||
|
; First do an (unaligned) write exactly following the data
|
||||||
|
dec edx
|
||||||
|
mov esi, edx
|
||||||
|
shr esi, 2 ; number dwords
|
||||||
|
mov ebx, edx
|
||||||
|
and ebx, 3
|
||||||
|
inc ebx ; number bytes in first write (1-4)
|
||||||
|
call MBRandom
|
||||||
|
mov dword[edi], eax
|
||||||
|
add edi, ebx
|
||||||
|
; Then, do as many aligned writes as nescessary
|
||||||
|
@@:
|
||||||
|
call MBRandom
|
||||||
|
stosd
|
||||||
|
dec esi
|
||||||
|
jnz @r
|
||||||
|
|
||||||
|
; Append the packet with Message Authentication Code
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
DEBUGF 1, "MAC sequence number: 0x%x\n", [ebx + sshlib_connection.tx_mac_seqnr]
|
||||||
|
lea esi, [ebx + sshlib_connection.tx_mac_seqnr]
|
||||||
|
mov ecx, [packet_size]
|
||||||
|
add ecx, 4 ; Sequence number length
|
||||||
|
lea eax, [ebx + sshlib_connection.tx_mac_ctx]
|
||||||
|
lea edx, [ebx + sshlib_connection.tx_int_key]
|
||||||
|
stdcall [ebx + sshlib_connection.tx_mac_proc], eax, esi, ecx, edx, SHA2_256_LEN
|
||||||
|
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea esi, [ebx + sshlib_connection.tx_mac_ctx]
|
||||||
|
lea edi, [ebx + sshlib_connection.tx_buffer]
|
||||||
|
add edi, [packet_size]
|
||||||
|
mov ecx, [ebx + sshlib_connection.tx_mac_length]
|
||||||
|
shr ecx, 2
|
||||||
|
rep movsd
|
||||||
|
|
||||||
|
; Now, encrypt everything but MAC
|
||||||
|
lea esi, [ebx + sshlib_connection.tx_buffer]
|
||||||
|
lea eax, [ebx + sshlib_connection.tx_crypt_ctx]
|
||||||
|
stdcall [ebx + sshlib_connection.tx_crypt_proc], eax, esi, [packet_size], esi
|
||||||
|
|
||||||
|
; Send the packet
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
mov ecx, [ebx + sshlib_connection.socketnum]
|
||||||
|
lea edx, [ebx + sshlib_connection.tx_buffer]
|
||||||
|
mov esi, [packet_size]
|
||||||
|
add esi, [ebx + sshlib_connection.tx_mac_length]
|
||||||
|
mov edi, [flags]
|
||||||
|
mcall send
|
||||||
|
|
||||||
|
; Update sequence counter
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
add byte[ebx + sshlib_connection.tx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx + sshlib_connection.tx_mac_seqnr+0], 0
|
||||||
|
|
||||||
|
DEBUGF 2, "\n"
|
||||||
|
|
||||||
|
ret
|
||||||
|
|
||||||
|
endp
|
||||||
|
|
||||||
290
programs/network/ssh/sshlib_transport_polychacha.inc
Executable file
290
programs/network/ssh/sshlib_transport_polychacha.inc
Executable file
@ -0,0 +1,290 @@
|
|||||||
|
; sshlib_transport.inc - SSH transport layer
|
||||||
|
;
|
||||||
|
; Copyright (C) 2016-2024 Jeffrey Amelynck
|
||||||
|
;
|
||||||
|
; This program is free software: you can redistribute it and/or modify
|
||||||
|
; it under the terms of the GNU General Public License as published by
|
||||||
|
; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
; (at your option) any later version.
|
||||||
|
;
|
||||||
|
; This program is distributed in the hope that it will be useful,
|
||||||
|
; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
; GNU General Public License for more details.
|
||||||
|
;
|
||||||
|
; You should have received a copy of the GNU General Public License
|
||||||
|
; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
iglobal
|
||||||
|
|
||||||
|
align 16
|
||||||
|
null_bytes: times 64 db 0
|
||||||
|
|
||||||
|
endg
|
||||||
|
|
||||||
|
|
||||||
|
align 16
|
||||||
|
proc sshlib_recv_packet_poly1305chacha20 con_ptr, flags
|
||||||
|
|
||||||
|
locals
|
||||||
|
data_length dd ? ; Total length of packet without MAC
|
||||||
|
mac_otk rb 64 ;256/8
|
||||||
|
iv rd 4
|
||||||
|
endl
|
||||||
|
|
||||||
|
DEBUGF 3, "> "
|
||||||
|
; Receive first block (Read length)
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
mov ecx, [ebx+sshlib_connection.socketnum]
|
||||||
|
mov esi, 4
|
||||||
|
lea edx, [ebx+sshlib_connection.rx_buffer]
|
||||||
|
mov edi, [flags]
|
||||||
|
mcall recv
|
||||||
|
cmp eax, 0
|
||||||
|
jle .sock_fail
|
||||||
|
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
||||||
|
DEBUGF 1, "chunk = %u ", eax
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
cmp eax, 4
|
||||||
|
jne .proto_fail ; TODO: handle receives of 1, 2, and 3 bytes correctly
|
||||||
|
|
||||||
|
; Decrypt data length
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
|
||||||
|
lea eax, [iv]
|
||||||
|
mov dword[eax+0], 0
|
||||||
|
mov dword[eax+4], 0
|
||||||
|
mov dword[eax+8], 0
|
||||||
|
push [ebx+sshlib_connection.rx_mac_seqnr]
|
||||||
|
pop dword[eax+12]
|
||||||
|
|
||||||
|
lea ecx, [ebx+sshlib_connection.rx_crypt_ctx]
|
||||||
|
lea edx, [ebx+sshlib_connection.rx_enc_key+256/8]
|
||||||
|
lea esi, [ebx+sshlib_connection.rx_buffer]
|
||||||
|
lea edi, [data_length]
|
||||||
|
invoke chacha20_oneshot, ecx, edx, eax, 0, esi, 4, edi
|
||||||
|
|
||||||
|
mov eax, [data_length]
|
||||||
|
bswap eax
|
||||||
|
mov [data_length], eax
|
||||||
|
DEBUGF 2, "decrypted packet length=%u\n", [data_length]
|
||||||
|
|
||||||
|
cmp eax, BUFFERSIZE-4-128/8
|
||||||
|
ja .proto_fail
|
||||||
|
|
||||||
|
; Receive remaining data
|
||||||
|
lea edx, [ebx+sshlib_connection.rx_buffer+4]
|
||||||
|
mov ecx, [ebx+sshlib_connection.socketnum]
|
||||||
|
mov edi, [flags]
|
||||||
|
lea esi, [eax + 128/8] ; We already got 4 bytes but they are not counted, MAC is also not counted so add that
|
||||||
|
.recv_loop:
|
||||||
|
DEBUGF 3, "want %u bytes.. ", esi
|
||||||
|
mcall recv
|
||||||
|
cmp eax, 0
|
||||||
|
jle .sock_fail
|
||||||
|
sub [ssh_chan.rcv_wnd], eax ;;; FIXME
|
||||||
|
DEBUGF 3, "got %u bytes\n", eax
|
||||||
|
add edx, eax
|
||||||
|
sub esi, eax
|
||||||
|
jnz .recv_loop
|
||||||
|
|
||||||
|
; Calculate the OTK
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
lea eax, [ebx+sshlib_connection.rx_crypt_ctx]
|
||||||
|
lea esi, [ebx+sshlib_connection.rx_enc_key]
|
||||||
|
lea edx, [mac_otk]
|
||||||
|
lea ecx, [iv]
|
||||||
|
invoke chacha20_oneshot, eax, esi, ecx, 0, null_bytes, 64, edx
|
||||||
|
|
||||||
|
; Calculate the MAC
|
||||||
|
lea esi, [ebx+sshlib_connection.rx_mac_ctx]
|
||||||
|
lea edi, [ebx+sshlib_connection.rx_buffer]
|
||||||
|
mov ecx, [data_length]
|
||||||
|
add ecx, 4
|
||||||
|
lea edx, [mac_otk]
|
||||||
|
push ecx
|
||||||
|
invoke poly1305_oneshot, esi, edi, ecx, edx, 256/8
|
||||||
|
pop ecx
|
||||||
|
|
||||||
|
; Compare in constant time
|
||||||
|
add edi, ecx
|
||||||
|
cmpsd
|
||||||
|
lahf
|
||||||
|
mov edx, eax
|
||||||
|
cmpsd
|
||||||
|
lahf
|
||||||
|
and edx, eax
|
||||||
|
cmpsd
|
||||||
|
lahf
|
||||||
|
and edx, eax
|
||||||
|
cmpsd
|
||||||
|
lahf
|
||||||
|
and eax, edx
|
||||||
|
sahf
|
||||||
|
jne .mac_fail
|
||||||
|
|
||||||
|
; Decrypt the payload
|
||||||
|
lea eax, [ebx+sshlib_connection.rx_crypt_ctx]
|
||||||
|
lea edi, [ebx+sshlib_connection.rx_buffer+4]
|
||||||
|
invoke chacha20_update, eax, edi, [data_length], edi
|
||||||
|
|
||||||
|
; Put decrypted length in rx buffer
|
||||||
|
push [data_length]
|
||||||
|
pop dword[ebx+sshlib_connection.rx_buffer]
|
||||||
|
|
||||||
|
; Update sequence counter
|
||||||
|
add byte[ebx+sshlib_connection.rx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx+sshlib_connection.rx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx+sshlib_connection.rx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx+sshlib_connection.rx_mac_seqnr+0], 0
|
||||||
|
|
||||||
|
; Return useful data length to the caller via eax register
|
||||||
|
;;; .packet_complete:
|
||||||
|
mov eax, [ebx+sshlib_connection.rx_buffer.packet_length]
|
||||||
|
movzx ebx, [ebx+sshlib_connection.rx_buffer.padding_length]
|
||||||
|
sub eax, ebx
|
||||||
|
DEBUGF 1, "useful data length=%u\n", eax
|
||||||
|
ret
|
||||||
|
|
||||||
|
.sock_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet failed!\n"
|
||||||
|
mov eax, SSHLIB_ERR_SOCKET
|
||||||
|
ret
|
||||||
|
|
||||||
|
.mac_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet message authentication failed!\n"
|
||||||
|
mov eax, SSHLIB_ERR_MAC_VERIFY_FAIL
|
||||||
|
xor ebx, ebx
|
||||||
|
ret
|
||||||
|
|
||||||
|
.proto_fail:
|
||||||
|
DEBUGF 3, "ssh_recv_packet protocol failure!\n"
|
||||||
|
mov eax, SSHLIB_ERR_PROTOCOL
|
||||||
|
xor ebx, ebx
|
||||||
|
ret
|
||||||
|
|
||||||
|
endp
|
||||||
|
|
||||||
|
|
||||||
|
align 16
|
||||||
|
proc sshlib_send_packet_poly1305chacha20 con_ptr, buf, payload_size, flags
|
||||||
|
|
||||||
|
locals
|
||||||
|
packet_size dd ?
|
||||||
|
mac_otk rb 64 ;256/8
|
||||||
|
iv rd 4
|
||||||
|
endl
|
||||||
|
DEBUGF 2, "< "
|
||||||
|
|
||||||
|
; Check how many bytes we should pad
|
||||||
|
mov eax, [payload_size]
|
||||||
|
inc eax ; padding length byte
|
||||||
|
lea edx, [eax+4] ; total packet size without padding and MAC
|
||||||
|
mov [packet_size], edx
|
||||||
|
|
||||||
|
mov ecx, [con_ptr]
|
||||||
|
mov edx, eax
|
||||||
|
mov ebx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
dec ebx
|
||||||
|
and edx, ebx
|
||||||
|
neg edx
|
||||||
|
add edx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
add edx, [ecx+sshlib_connection.tx_pad_size]
|
||||||
|
DEBUGF 2, "padding %u bytes ", edx
|
||||||
|
add [packet_size], edx ; total packet size with padding, without MAC
|
||||||
|
|
||||||
|
; Start building the packet
|
||||||
|
; First comes the packet length, in network byte order ofcourse.
|
||||||
|
add eax, edx
|
||||||
|
DEBUGF 2, "total size: %u ", eax
|
||||||
|
bswap eax
|
||||||
|
lea edi, [ecx+sshlib_connection.tx_buffer]
|
||||||
|
stosd
|
||||||
|
; Then the padding length
|
||||||
|
mov al, dl
|
||||||
|
stosb
|
||||||
|
;;; And the actual payload bytes
|
||||||
|
mov esi, [buf]
|
||||||
|
mov ecx, [payload_size]
|
||||||
|
rep movsb
|
||||||
|
|
||||||
|
; Append the packet with #edx padding bytes.
|
||||||
|
; Since we must pad at least 8 bytes, we can always use DWORD writes.
|
||||||
|
; First do an (unaligned) write exactly following the data
|
||||||
|
dec edx
|
||||||
|
mov esi, edx
|
||||||
|
shr esi, 2 ; number dwords
|
||||||
|
mov ebx, edx
|
||||||
|
and ebx, 3
|
||||||
|
inc ebx ; number bytes in first write (1-4)
|
||||||
|
mov edx, [con_ptr]
|
||||||
|
call MBRandom
|
||||||
|
mov dword[edi], eax
|
||||||
|
add edi, ebx
|
||||||
|
; Then, do as many aligned writes as nescessary
|
||||||
|
mov ebx, [con_ptr]
|
||||||
|
@@:
|
||||||
|
call MBRandom
|
||||||
|
stosd
|
||||||
|
dec esi
|
||||||
|
jnz @r
|
||||||
|
|
||||||
|
; Encrypt data length
|
||||||
|
lea eax, [iv]
|
||||||
|
mov dword[eax+0], 0
|
||||||
|
mov dword[eax+4], 0
|
||||||
|
mov dword[eax+8], 0
|
||||||
|
push [ebx+sshlib_connection.tx_mac_seqnr]
|
||||||
|
pop dword[eax+12]
|
||||||
|
|
||||||
|
lea esi, [ebx+sshlib_connection.tx_crypt_ctx]
|
||||||
|
lea edx, [ebx+sshlib_connection.tx_enc_key+256/8]
|
||||||
|
lea edi, [ebx+sshlib_connection.tx_buffer]
|
||||||
|
invoke chacha20_oneshot, esi, edx, eax, 0, edi, 4, edi
|
||||||
|
|
||||||
|
; Calculate the OTK
|
||||||
|
lea eax, [iv]
|
||||||
|
lea edx, [ebx+sshlib_connection.tx_enc_key]
|
||||||
|
lea edi, [mac_otk]
|
||||||
|
invoke chacha20_oneshot, esi, edx, eax, 0, null_bytes, 64, edi
|
||||||
|
|
||||||
|
; Encrypt the payload
|
||||||
|
lea edi, [ebx+sshlib_connection.tx_buffer+4]
|
||||||
|
mov eax, [packet_size]
|
||||||
|
sub eax, 4
|
||||||
|
invoke chacha20_update, esi, edi, eax, edi
|
||||||
|
|
||||||
|
; Calculate the MAC
|
||||||
|
lea esi, [ebx+sshlib_connection.tx_mac_ctx]
|
||||||
|
lea edi, [ebx+sshlib_connection.tx_buffer]
|
||||||
|
lea edx, [mac_otk]
|
||||||
|
invoke poly1305_oneshot, esi, edi, [packet_size], edx, 256/8
|
||||||
|
|
||||||
|
; Write it to the send buffer
|
||||||
|
add edi, [packet_size]
|
||||||
|
movsd
|
||||||
|
movsd
|
||||||
|
movsd
|
||||||
|
movsd
|
||||||
|
|
||||||
|
; Update sequence counter
|
||||||
|
add byte[ebx+sshlib_connection.tx_mac_seqnr+3], 1
|
||||||
|
adc byte[ebx+sshlib_connection.tx_mac_seqnr+2], 0
|
||||||
|
adc byte[ebx+sshlib_connection.tx_mac_seqnr+1], 0
|
||||||
|
adc byte[ebx+sshlib_connection.tx_mac_seqnr+0], 0
|
||||||
|
|
||||||
|
; Send the packet
|
||||||
|
; mov ebx, [con_ptr]
|
||||||
|
mov ecx, [ebx+sshlib_connection.socketnum]
|
||||||
|
lea edx, [ebx+sshlib_connection.tx_buffer]
|
||||||
|
mov esi, [packet_size]
|
||||||
|
add esi, 16 ;[ebx+sshlib_connection.tx_mac_length]
|
||||||
|
mov edi, [flags]
|
||||||
|
mcall send
|
||||||
|
|
||||||
|
DEBUGF 2, "\n"
|
||||||
|
|
||||||
|
ret
|
||||||
|
|
||||||
|
endp
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user