vacp2p
/
nim-quic
mirror of https://github.com/vacp2p/nim-quic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: extract proc that handles incoming crypto data

This commit is contained in:
Mark Spanbroek 2020-10-07 10:14:27 +02:00 committed by markspanbroek
parent f450408d1c
commit fc50ef8e13
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/quic/helpers/client.nim
View File

@ -6,7 +6,6 @@ import decrypt
import hp import hp
import keys import keys
import settings import settings
import params
import crypto import crypto
let zeroKey = Key() let zeroKey = Key()
@ -16,11 +15,8 @@ proc clientInitial(connection: ptr ngtcp2_conn, user_data: pointer): cint {.cdec
connection.submitCryptoData() connection.submitCryptoData()
proc receiveCryptoData(connection: ptr ngtcp2_conn, level: ngtcp2_crypto_level, offset: uint64, data: ptr uint8, datalen: uint, userData: pointer): cint {.cdecl.} = proc receiveCryptoData(connection: ptr ngtcp2_conn, level: ngtcp2_crypto_level, offset: uint64, data: ptr uint8, datalen: uint, userData: pointer): cint {.cdecl.} =
var params = decodeTransportParameters(toOpenArray(data, datalen)) connection.handleCryptoData(toOpenArray(data, datalen))
assert 0 == ngtcp2_conn_set_remote_transport_params(connection, addr params)
connection.installHandshakeKeys(zeroKey, zeroKey) connection.installHandshakeKeys(zeroKey, zeroKey)
ngtcp2_conn_handshake_completed(connection) ngtcp2_conn_handshake_completed(connection)
proc updateKey(conn: ptr ngtcp2_conn, rx_secret: ptr uint8, tx_secret: ptr uint8, rx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, rx_iv: ptr uint8, tx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, tx_iv: ptr uint8, current_rx_secret: ptr uint8, current_tx_secret: ptr uint8, secretlen: uint, user_data: pointer): cint {.cdecl} = proc updateKey(conn: ptr ngtcp2_conn, rx_secret: ptr uint8, tx_secret: ptr uint8, rx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, rx_iv: ptr uint8, tx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, tx_iv: ptr uint8, current_rx_secret: ptr uint8, current_tx_secret: ptr uint8, secretlen: uint, user_data: pointer): cint {.cdecl} =

4
tests/quic/helpers/crypto.nim
View File

@ -9,3 +9,7 @@ proc submitCryptoData*(connection: ptr ngtcp2_conn) =
addr cryptoData[0], addr cryptoData[0],
cryptoData.len.uint cryptoData.len.uint
) )
proc handleCryptoData*(connection: ptr ngtcp2_conn, data: openArray[byte]) =
var params = decodeTransportParameters(data)
assert 0 == ngtcp2_conn_set_remote_transport_params(connection, addr params)

6
tests/quic/helpers/server.nim
View File

@ -6,7 +6,6 @@ import hp
import ids import ids
import keys import keys
import settings import settings
import params
import crypto import crypto
let zeroKey = Key() let zeroKey = Key()
@ -16,11 +15,8 @@ proc receiveClientInitial(connection: ptr ngtcp2_conn, dcid: ptr ngtcp2_cid, use
connection.installHandshakeKeys(zeroKey, zeroKey) connection.installHandshakeKeys(zeroKey, zeroKey)
proc receiveCryptoData(connection: ptr ngtcp2_conn, level: ngtcp2_crypto_level, offset: uint64, data: ptr uint8, datalen: uint, userData: pointer): cint {.cdecl.} = proc receiveCryptoData(connection: ptr ngtcp2_conn, level: ngtcp2_crypto_level, offset: uint64, data: ptr uint8, datalen: uint, userData: pointer): cint {.cdecl.} =
var params = decodeTransportParameters(toOpenArray(data, datalen)) connection.handleCryptoData(toOpenArray(data, datalen))
assert 0 == ngtcp2_conn_set_remote_transport_params(connection, addr params)
connection.submitCryptoData() connection.submitCryptoData()
ngtcp2_conn_handshake_completed(connection) ngtcp2_conn_handshake_completed(connection)
proc updateKey(conn: ptr ngtcp2_conn, rx_secret: ptr uint8, tx_secret: ptr uint8, rx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, rx_iv: ptr uint8, tx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, tx_iv: ptr uint8, current_rx_secret: ptr uint8, current_tx_secret: ptr uint8, secretlen: uint, user_data: pointer): cint {.cdecl} = proc updateKey(conn: ptr ngtcp2_conn, rx_secret: ptr uint8, tx_secret: ptr uint8, rx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, rx_iv: ptr uint8, tx_aead_ctx: ptr ngtcp2_crypto_aead_ctx, tx_iv: ptr uint8, current_rx_secret: ptr uint8, current_tx_secret: ptr uint8, secretlen: uint, user_data: pointer): cint {.cdecl} =