/* Packet stream */
struct SilcPacketStreamStruct {
struct SilcPacketStreamStruct *next;
+ SilcAtomic refcnt; /* Reference counter */
SilcPacketEngine engine; /* Packet engine */
SilcStream stream; /* Underlaying stream */
SilcMutex lock; /* Stream lock */
SilcDList process; /* Packet processors, it set */
- SilcHashTable streamers; /* Valid if streamers exist */
void *stream_context; /* Stream context */
SilcBufferStruct inbuf; /* In buffer */
SilcBufferStruct outbuf; /* Out buffer */
SilcUInt32 send_psn; /* Sending sequence */
- SilcCipher send_key; /* Sending key */
- SilcHmac send_hmac; /* Sending HMAC */
+ SilcCipher send_key[2]; /* Sending key */
+ SilcHmac send_hmac[2]; /* Sending HMAC */
SilcUInt32 receive_psn; /* Receiving sequence */
- SilcCipher receive_key; /* Receiving key */
- SilcHmac receive_hmac; /* Receiving HMAC */
+ SilcCipher receive_key[2]; /* Receiving key */
+ SilcHmac receive_hmac[2]; /* Receiving HMAC */
unsigned char *src_id; /* Source ID */
unsigned char *dst_id; /* Destination ID */
unsigned int src_id_len : 6;
unsigned int src_id_type : 2;
unsigned int dst_id_len : 6;
unsigned int dst_id_type : 2;
- SilcUInt8 refcnt; /* Reference counter */
unsigned int is_router : 1; /* Set if router stream */
unsigned int destroyed : 1; /* Set if destroyed */
+ unsigned int iv_included : 1; /* Set if IV included */
+ SilcUInt8 sid; /* Security ID, set if IV included */
};
/* Initial size of stream buffers */
/* Header length without source and destination ID's. */
#define SILC_PACKET_HEADER_LEN 10
-/* Minimum length of SILC Packet Header. This much is decrypted always
- when packet is received to be able to get all the relevant data out
- from the header. */
+/* Minimum length of SILC Packet Header. */
#define SILC_PACKET_MIN_HEADER_LEN 16
+#define SILC_PACKET_MIN_HEADER_LEN_IV 32 + 1
/* Maximum padding length */
#define SILC_PACKET_MAX_PADLEN 128
/* Minimum packet length */
#define SILC_PACKET_MIN_LEN (SILC_PACKET_HEADER_LEN + 1)
-
-/* Macros */
-
/* Returns true length of the packet. */
#define SILC_PACKET_LENGTH(__packetdata, __ret_truelen, __ret_paddedlen) \
do { \
ps->engine = engine;
ps->stream = stream;
- ps->refcnt++;
+ silc_atomic_init(&ps->refcnt, 1);
/* Allocate buffers */
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
if (!stream)
return;
- if (stream->refcnt > 1) {
+ if (silc_atomic_get_int(&stream->refcnt) > 1) {
stream->destroyed = TRUE;
return;
}
/* Destroy the underlaying stream */
silc_stream_destroy(stream->stream);
+ silc_atomic_uninit(&stream->refcnt);
silc_dlist_uninit(stream->process);
silc_mutex_free(stream->lock);
silc_free(stream);
stream->is_router = TRUE;
}
+/* Mark to include IV in ciphertext */
+
+void silc_packet_stream_set_iv_included(SilcPacketStream stream)
+{
+ stream->iv_included = TRUE;
+}
/* Links `callbacks' to `stream' for specified packet types */
if (!stream->process) {
stream->process = silc_dlist_init();
- if (!stream->process)
+ if (!stream->process) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
}
/* According to priority set the procesor to correct position. First
void silc_packet_stream_ref(SilcPacketStream stream)
{
- silc_mutex_lock(stream->lock);
- stream->refcnt++;
- silc_mutex_unlock(stream->lock);
+ silc_atomic_add_int(&stream->refcnt, 1);
}
/* Unreference packet stream */
void silc_packet_stream_unref(SilcPacketStream stream)
{
- silc_mutex_lock(stream->lock);
- stream->refcnt--;
- silc_mutex_unlock(stream->lock);
- if (stream->refcnt == 0)
+ if (silc_atomic_sub_int(&stream->refcnt, 1) == 0)
silc_packet_stream_destroy(stream);
}
SilcCipher receive)
{
SILC_LOG_DEBUG(("Setting new ciphers to packet stream"));
+
silc_mutex_lock(stream->lock);
- stream->send_key = send;
- stream->receive_key = receive;
+
+ /* In case IV Included is set, save the old key */
+ if (stream->iv_included) {
+ if (stream->send_key[1]) {
+ silc_cipher_free(stream->send_key[1]);
+ stream->send_key[1] = stream->send_key[0];
+ }
+ if (stream->receive_key[1]) {
+ silc_cipher_free(stream->receive_key[1]);
+ stream->receive_key[1] = stream->receive_key[0];
+ }
+
+ stream->send_key[0] = send;
+ stream->receive_key[0] = receive;
+ } else {
+ if (stream->send_key[0])
+ silc_cipher_free(stream->send_key[0]);
+ if (stream->send_key[1])
+ silc_cipher_free(stream->receive_key[0]);
+
+ stream->send_key[0] = send;
+ stream->receive_key[0] = receive;
+ }
+
silc_mutex_unlock(stream->lock);
}
SilcBool silc_packet_get_ciphers(SilcPacketStream stream, SilcCipher *send,
SilcCipher *receive)
{
- if (!stream->send_key && !stream->receive_key)
+ if (!stream->send_key[0] && !stream->receive_key[0])
return FALSE;
silc_mutex_lock(stream->lock);
if (send)
- *send = stream->send_key;
+ *send = stream->send_key[0];
if (receive)
- *receive = stream->receive_key;
+ *receive = stream->receive_key[0];
silc_mutex_unlock(stream->lock);
SilcHmac receive)
{
SILC_LOG_DEBUG(("Setting new HMACs to packet stream"));
+
silc_mutex_lock(stream->lock);
- stream->send_hmac = send;
- stream->receive_hmac = receive;
+
+ /* In case IV Included is set, save the old HMAC */
+ if (stream->iv_included) {
+ if (stream->send_hmac[1]) {
+ silc_hmac_free(stream->send_hmac[1]);
+ stream->send_hmac[1] = stream->send_hmac[0];
+ }
+ if (stream->receive_hmac[1]) {
+ silc_hmac_free(stream->receive_hmac[1]);
+ stream->receive_hmac[1] = stream->receive_hmac[0];
+ }
+
+ stream->send_hmac[0] = send;
+ stream->receive_hmac[0] = receive;
+ } else {
+ if (stream->send_hmac[0])
+ silc_hmac_free(stream->send_hmac[0]);
+ if (stream->receive_hmac[0])
+ silc_hmac_free(stream->receive_hmac[0]);
+
+ stream->send_hmac[0] = send;
+ stream->receive_hmac[0] = receive;
+ }
+
silc_mutex_unlock(stream->lock);
}
SilcBool silc_packet_get_hmacs(SilcPacketStream stream, SilcHmac *send,
SilcHmac *receive)
{
- if (!stream->send_hmac && !stream->receive_hmac)
+ if (!stream->send_hmac[0] && !stream->receive_hmac[0])
return FALSE;
silc_mutex_lock(stream->lock);
if (send)
- *send = stream->send_hmac;
+ *send = stream->send_hmac[0];
if (receive)
- *receive = stream->receive_hmac;
+ *receive = stream->receive_hmac[0];
silc_mutex_unlock(stream->lock);
return TRUE;
}
+/* Adds Security ID (SID) */
+
+SilcBool silc_packet_set_sid(SilcPacketStream stream, SilcUInt8 sid)
+{
+ if (!stream->iv_included)
+ return FALSE;
+
+ SILC_LOG_DEBUG(("Set packet stream %p SID to %d", stream, sid));
+
+ stream->sid = sid;
+ return TRUE;
+}
+
/* Free packet */
void silc_packet_free(SilcPacket packet)
/* Put the packet back to freelist */
silc_list_add(stream->engine->packet_pool, packet);
+ if (silc_list_count(stream->engine->packet_pool) == 1)
+ silc_list_start(stream->engine->packet_pool);
silc_mutex_unlock(stream->engine->lock);
}
-/* Creates streamer */
-
-SilcStream silc_packet_streamer_create(SilcPacketStream stream,
- SilcPacketType packet_type,
- SilcPacketFlags packet_flags)
-{
- /* XXX TODO */
- return NULL;
-}
-
-/* Destroyes streamer */
-
-void silc_packet_streamer_destroy(SilcStream stream)
-{
-
-}
-
-
/****************************** Packet Sending ******************************/
/* Prepare outgoing data buffer for packet sending. Returns the
SilcCipher cipher,
SilcHmac hmac)
{
- unsigned char tmppad[SILC_PACKET_MAX_PADLEN];
+ unsigned char tmppad[SILC_PACKET_MAX_PADLEN], iv[33], psn[4];
int block_len = (cipher ? silc_cipher_get_block_len(cipher) : 0);
- int i, enclen, truelen, padlen;
+ int i, enclen, truelen, padlen, ivlen = 0, psnlen = 0;
SilcBufferStruct packet;
SILC_LOG_DEBUG(("Sending packet %s (%d) flags %d, src %d dst %d,"
enclen = truelen = (data_len + SILC_PACKET_HEADER_LEN +
src_id_len + dst_id_len);
+ /* If IV is included, the SID, IV and sequence number is added to packet */
+ if (stream->iv_included && cipher) {
+ psnlen = sizeof(psn);
+ ivlen = block_len + 1;
+ iv[0] = stream->sid;
+ memcpy(iv + 1, silc_cipher_get_iv(cipher), block_len);
+ }
+
/* We automatically figure out the packet structure from the packet
type and flags, and calculate correct length. Private messages with
private keys and channel messages are special packets as their
type == SILC_PACKET_CHANNEL_MESSAGE) {
/* Padding is calculated from header + IDs */
- SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN +
- src_id_len +
- dst_id_len), block_len, padlen);
+ SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
+ psnlen), block_len, padlen);
/* Length to encrypt, header + IDs + padding. */
- enclen = SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len + padlen;
+ enclen = (SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
+ padlen + psnlen);
} else {
/* Padding is calculated from true length of the packet */
if (flags & SILC_PACKET_FLAG_LONG_PAD)
- SILC_PACKET_PADLEN_MAX(truelen, block_len, padlen);
+ SILC_PACKET_PADLEN_MAX(truelen + psnlen, block_len, padlen);
else
- SILC_PACKET_PADLEN(truelen, block_len, padlen);
+ SILC_PACKET_PADLEN(truelen + psnlen, block_len, padlen);
- enclen += padlen;
+ enclen += padlen + psnlen;
}
/* Remove implementation specific flags */
silc_mutex_lock(stream->lock);
/* Get packet pointer from the outgoing buffer */
- if (!silc_packet_send_prepare(stream, truelen + padlen, hmac, &packet)) {
+ if (!silc_packet_send_prepare(stream, truelen + padlen + ivlen + psnlen,
+ hmac, &packet)) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
+ SILC_PUT32_MSB(stream->send_psn, psn);
+
/* Create the packet. This creates the SILC header, adds padding, and
the actual packet data. */
i = silc_buffer_format(&packet,
+ SILC_STR_UI_XNSTRING(iv, ivlen),
+ SILC_STR_UI_XNSTRING(psn, psnlen),
SILC_STR_UI_SHORT(truelen),
SILC_STR_UI_CHAR(flags),
SILC_STR_UI_CHAR(type),
}
SILC_LOG_HEXDUMP(("Assembled packet, len %d", silc_buffer_len(&packet)),
- packet.data, silc_buffer_len(&packet));
+ silc_buffer_data(&packet), silc_buffer_len(&packet));
/* Encrypt the packet */
if (cipher) {
SILC_LOG_DEBUG(("Encrypting packet"));
- if (!silc_cipher_encrypt(cipher, packet.data, packet.data,
- enclen, NULL)) {
+ if (!silc_cipher_encrypt(cipher, packet.data + ivlen,
+ packet.data + ivlen, enclen, NULL)) {
SILC_LOG_ERROR(("Packet encryption failed"));
silc_mutex_unlock(stream->lock);
return FALSE;
/* Compute HMAC */
if (hmac) {
- unsigned char psn[4];
SilcUInt32 mac_len;
/* MAC is computed from the entire encrypted packet data, and put
to the end of the packet. */
silc_hmac_init(hmac);
- SILC_PUT32_MSB(stream->send_psn, psn);
- silc_hmac_update(hmac, psn, 4);
+ silc_hmac_update(hmac, psn, sizeof(psn));
silc_hmac_update(hmac, packet.data, silc_buffer_len(&packet));
silc_hmac_final(hmac, packet.tail, &mac_len);
silc_buffer_pull_tail(&packet, mac_len);
stream->dst_id,
stream->dst_id_len,
data, data_len,
- stream->send_key,
- stream->send_hmac);
+ stream->send_key[0],
+ stream->send_hmac[0]);
}
/* Sends a packet, extended routine */
return FALSE;
return silc_packet_send_raw(stream, type, flags,
- src_id_type,
- src_id_data,
- src_id_len,
- dst_id_type,
- dst_id_data,
- dst_id_len,
+ src_id ? src_id_type : stream->src_id_type,
+ src_id ? src_id_data : stream->src_id,
+ src_id ? src_id_len : stream->src_id_len,
+ dst_id ? dst_id_type : stream->dst_id_type,
+ dst_id ? dst_id_data : stream->dst_id,
+ dst_id ? dst_id_len : stream->dst_id_len,
data, data_len,
- cipher,
- hmac);
+ cipher ? cipher : stream->send_key[0],
+ hmac ? hmac : stream->send_hmac[0]);
}
const unsigned char *data,
SilcUInt32 data_len,
const unsigned char *packet_mac,
+ const unsigned char *packet_seq,
SilcUInt32 sequence)
{
/* Check MAC */
/* Compute HMAC of packet */
silc_hmac_init(hmac);
- SILC_PUT32_MSB(sequence, psn);
- silc_hmac_update(hmac, psn, 4);
+
+ if (!packet_seq) {
+ SILC_PUT32_MSB(sequence, psn);
+ silc_hmac_update(hmac, psn, 4);
+ } else
+ silc_hmac_update(hmac, packet_seq, 4);
+
silc_hmac_update(hmac, data, data_len);
silc_hmac_final(hmac, mac, &mac_len);
static void silc_packet_read_process(SilcPacketStream stream)
{
+ SilcCipher cipher;
+ SilcHmac hmac;
SilcPacket packet;
+ SilcUInt8 sid;
SilcUInt16 packetlen;
- SilcUInt32 paddedlen, mac_len, block_len;
+ SilcUInt32 paddedlen, mac_len, block_len, ivlen, psnlen;
unsigned char tmp[SILC_PACKET_MIN_HEADER_LEN], *header;
- unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
+ unsigned char iv[SILC_CIPHER_MAX_IV_SIZE], *packet_seq = NULL;
SilcBool normal = TRUE;
int ret;
/* Parse the packets from the data */
while (silc_buffer_len(&stream->inbuf) > 0) {
+ ivlen = psnlen = 0;
+ cipher = stream->receive_key[0];
+ hmac = stream->receive_hmac[0];
- if (silc_buffer_len(&stream->inbuf) < SILC_PACKET_MIN_HEADER_LEN) {
+ if (silc_buffer_len(&stream->inbuf) <
+ stream->iv_included ? SILC_PACKET_MIN_HEADER_LEN_IV :
+ SILC_PACKET_MIN_HEADER_LEN) {
SILC_LOG_DEBUG(("Partial packet in queue, waiting for the rest"));
return;
}
- if (stream->receive_hmac)
- mac_len = silc_hmac_len(stream->receive_hmac);
+ if (hmac)
+ mac_len = silc_hmac_len(hmac);
else
mac_len = 0;
/* Decrypt first block of the packet to get the length field out */
- if (stream->receive_key) {
- block_len = silc_cipher_get_block_len(stream->receive_key);
- memcpy(iv, silc_cipher_get_iv(stream->receive_key), block_len);
- silc_cipher_decrypt(stream->receive_key, stream->inbuf.data,
- tmp, block_len, iv);
+ if (cipher) {
+ block_len = silc_cipher_get_block_len(cipher);
+
+ if (stream->iv_included) {
+ /* SID, IV and sequence number is included in the ciphertext */
+ sid = (SilcUInt8)stream->inbuf.data[0];
+ memcpy(iv, stream->inbuf.data + 1, block_len);
+ ivlen = block_len + 1;
+ psnlen = 4;
+
+ /* Check SID, and get correct decryption key */
+ if (sid != stream->sid) {
+ /* If SID is recent get the previous key and use it */
+ if (sid > 0 && stream->sid > 0 && stream->sid - 1 == sid &&
+ stream->receive_key[1] && !stream->receive_hmac[1]) {
+ cipher = stream->receive_key[1];
+ hmac = stream->receive_hmac[1];
+ } else {
+ /* The SID is unknown, drop rest of the data in buffer */
+ SILC_LOG_DEBUG(("Unknown Security ID %d in packet, expected %d",
+ sid, stream->sid));
+ silc_mutex_unlock(stream->lock);
+ SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_UNKNOWN_SID);
+ silc_mutex_lock(stream->lock);
+ silc_buffer_reset(&stream->inbuf);
+ return;
+ }
+ }
+ } else {
+ memcpy(iv, silc_cipher_get_iv(cipher), block_len);
+ }
+
+ silc_cipher_decrypt(cipher, stream->inbuf.data + ivlen, tmp,
+ block_len, iv);
+
header = tmp;
+ if (stream->iv_included) {
+ /* Take sequence number from packet */
+ packet_seq = header;
+ header += 4;
+ }
} else {
block_len = SILC_PACKET_MIN_HEADER_LEN;
header = stream->inbuf.data;
return;
}
- if (silc_buffer_len(&stream->inbuf) < paddedlen + mac_len) {
+ if (silc_buffer_len(&stream->inbuf) < paddedlen + ivlen + mac_len) {
SILC_LOG_DEBUG(("Received partial packet, waiting for the rest "
"(%d bytes)",
paddedlen + mac_len - silc_buffer_len(&stream->inbuf)));
}
/* Check MAC of the packet */
- if (!silc_packet_check_mac(stream->receive_hmac, stream->inbuf.data,
- paddedlen, stream->inbuf.data + paddedlen,
- stream->receive_psn)) {
+ if (!silc_packet_check_mac(hmac, stream->inbuf.data,
+ paddedlen + ivlen,
+ stream->inbuf.data + ivlen + paddedlen,
+ packet_seq, stream->receive_psn)) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_MAC_FAILED);
silc_mutex_lock(stream->lock);
}
SILC_LOG_HEXDUMP(("Incoming packet (%d) len %d",
- stream->receive_psn, paddedlen + mac_len),
- stream->inbuf.data, paddedlen + mac_len);
+ stream->receive_psn, paddedlen + ivlen + mac_len),
+ stream->inbuf.data, paddedlen + ivlen + mac_len);
/* Put the decrypted part, and rest of the encrypted data, and decrypt */
silc_buffer_pull_tail(&packet->buffer, paddedlen);
- silc_buffer_put(&packet->buffer, header, block_len);
- silc_buffer_pull(&packet->buffer, block_len);
- silc_buffer_put(&packet->buffer, stream->inbuf.data + block_len,
- paddedlen - block_len);
- if (stream->receive_key) {
- silc_cipher_set_iv(stream->receive_key, iv);
- ret = silc_packet_decrypt(stream->receive_key, stream->receive_hmac,
- stream->receive_psn, &packet->buffer, normal);
+ silc_buffer_put(&packet->buffer, header, block_len - psnlen);
+ silc_buffer_pull(&packet->buffer, block_len - psnlen);
+ silc_buffer_put(&packet->buffer, (stream->inbuf.data + ivlen +
+ psnlen + (block_len - psnlen)),
+ paddedlen - ivlen - psnlen - (block_len - psnlen));
+ if (cipher) {
+ silc_cipher_set_iv(cipher, iv);
+ ret = silc_packet_decrypt(cipher, hmac, stream->receive_psn,
+ &packet->buffer, normal);
if (ret < 0) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_DECRYPTION_FAILED);
SilcMutex wait_lock;
SilcCond wait_cond;
SilcList packet_queue;
- SilcBool waiting;
+ unsigned int stopped : 1;
} *SilcPacketWait;
/* Packet wait receive callback */
/* Signal the waiting thread for a new packet */
silc_mutex_lock(pw->wait_lock);
- if (!pw->waiting) {
+ if (pw->stopped) {
silc_mutex_unlock(pw->wait_lock);
return FALSE;
}
/* Uninitialize packet waiting */
-void silc_packet_wait_uninit(void *context, SilcPacketStream stream)
+void silc_packet_wait_uninit(void *waiter, SilcPacketStream stream)
{
- SilcPacketWait pw = context;
+ SilcPacketWait pw = waiter;
SilcPacket packet;
+ /* Signal any threads to stop waiting */
+ silc_mutex_lock(pw->wait_lock);
+ pw->stopped = TRUE;
+ silc_cond_broadcast(pw->wait_cond);
+ silc_mutex_unlock(pw->wait_lock);
+
+ /* Re-acquire lock and free resources */
silc_mutex_lock(pw->wait_lock);
silc_packet_stream_unlink(stream, &silc_packet_wait_cbs, pw);
silc_packet_free(packet);
silc_mutex_unlock(pw->wait_lock);
-
silc_cond_free(pw->wait_cond);
silc_mutex_free(pw->wait_lock);
silc_free(pw);
/* Blocks thread until a packet has been received. */
-int silc_packet_wait(void *context, int timeout, SilcPacket *return_packet)
+int silc_packet_wait(void *waiter, int timeout, SilcPacket *return_packet)
{
- SilcPacketWait pw = context;
+ SilcPacketWait pw = waiter;
SilcBool ret = FALSE;
silc_mutex_lock(pw->wait_lock);
/* Wait here until packet has arrived */
- pw->waiting = TRUE;
- while (silc_list_count(pw->packet_queue) == 0)
+ while (silc_list_count(pw->packet_queue) == 0) {
+ if (pw->stopped) {
+ silc_mutex_unlock(pw->wait_lock);
+ return -1;
+ }
ret = silc_cond_timedwait(pw->wait_cond, pw->wait_lock, timeout);
+ }
/* Return packet */
silc_list_start(pw->packet_queue);
projects / silc.git / blobdiff