aboutsummaryrefslogtreecommitdiff
path: root/ostp.d
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2024-09-26 14:57:08 -0400
committerIan Moffett <ian@osmora.org>2024-09-26 14:57:08 -0400
commitd382f150dcd1a4317a62c5af2412bd304b3bfee7 (patch)
tree9d2e2391d655fd559b92381c507f1581685a45d3 /ostp.d
parent7e6fb4b9f82dc4c6f7815a3fc4c60f6084928722 (diff)
project: Introduce actual connections
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'ostp.d')
-rw-r--r--ostp.d/include/net/auth.h1
-rw-r--r--ostp.d/net/otd_auth.c37
-rw-r--r--ostp.d/net/otd_param.c97
3 files changed, 135 insertions, 0 deletions
diff --git a/ostp.d/include/net/auth.h b/ostp.d/include/net/auth.h
index 752bfe2..76567c3 100644
--- a/ostp.d/include/net/auth.h
+++ b/ostp.d/include/net/auth.h
@@ -33,5 +33,6 @@
#include <net/stpsession.h>
int handle_srq(int client_fd, struct session_request *srq);
+int negotiate_spw(int client_fd, unsigned char *session_key);
#endif /* NET_AUTH_H_ */
diff --git a/ostp.d/net/otd_auth.c b/ostp.d/net/otd_auth.c
index 3511e0c..6e757ae 100644
--- a/ostp.d/net/otd_auth.c
+++ b/ostp.d/net/otd_auth.c
@@ -27,9 +27,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <arpa/inet.h>
#include <net/auth.h>
+#include <net/param.h>
#include <net/stpsession.h>
#include <crypto/ecdh.h>
+#include <otconfig.h>
#include <stdio.h>
#define KEY_BYTE_WIDTH 32
@@ -47,6 +50,17 @@ log_pubkey(uint8_t pubkey[KEY_BYTE_WIDTH])
printf("\n");
}
+static void
+send_motd(int client_fd, const unsigned char *session_key)
+{
+ char motd[] = MOTD;
+
+ printf("Sending MOTD...\n");
+ if (send_frame(client_fd, motd, sizeof(motd), session_key) < 0) {
+ printf("Failed to session MOTD\n");
+ }
+}
+
/*
* Verify the session request packet and handle
* the rest.
@@ -58,6 +72,8 @@ int
handle_srq(int client_fd, struct session_request *srq)
{
struct x25519_keypair keypair;
+ unsigned char *session_key;
+ int error;
printf("Got public key from peer: \n");
log_pubkey(srq->pubkey);
@@ -68,5 +84,26 @@ handle_srq(int client_fd, struct session_request *srq)
return -1;
}
+ /* Send back our our public key */
+ error = send(client_fd, keypair.pubkey, keypair.pubkey_len, 0);
+ if (error < 0) {
+ perror("Failed to send public key");
+ return error;
+ }
+
+ printf("Deriving session key...\n");
+ error = gen_session_key(keypair.privkey, srq->pubkey, &session_key);
+ if (error < 0) {
+ return error;
+ }
+
+ /* Handle any requested session parameters */
+ if ((error = negotiate_spw(client_fd, session_key)) < 0) {
+ free_session_key(session_key);
+ return error;
+ }
+
+ send_motd(client_fd, session_key);
+ free_session_key(session_key);
return 0;
}
diff --git a/ostp.d/net/otd_param.c b/ostp.d/net/otd_param.c
new file mode 100644
index 0000000..fe33bd8
--- /dev/null
+++ b/ostp.d/net/otd_param.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <net/stpsession.h>
+#include <net/param.h>
+#include <crypto/aes.h>
+#include <otconfig.h>
+#include <defs.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+static int
+handle_pap(int client_fd, const struct pap *pap, const unsigned char *session_key)
+{
+ int error = 0;
+ uint8_t attempts = 0;
+ struct pap tmp_pap = *pap;
+ const size_t LEN = sizeof(struct pap);
+
+ /* TODO: Support more SPW bits */
+ while (1) {
+ /* Quick session request, jump right in! */
+ if (ISSET(tmp_pap.spw, PAP_SPW_QSR)) {
+ printf("Got QSR, starting session...\n");
+ send_frame(client_fd, &tmp_pap, LEN, session_key);
+ return 0;
+ }
+
+ /* We have exhausted our attempts */
+ if (attempts >= ARBITRATION_MAX) {
+ printf("Too many arbitration attempts, bailing!\n");
+ return -1;
+ }
+
+ printf("Got bad SPW from client\n");
+ printf("Attempting arbitration...\n");
+
+ tmp_pap.spw = 0x0;
+ tmp_pap.code = PAP_BAD_SPW;
+
+ /* Send in PAP and wait for response */
+ if ((error = send_frame(client_fd, &tmp_pap, LEN, session_key)) < 0) {
+ printf("Failed to send PAP frame\n");
+ return -1;
+ }
+ if ((error = recv_frame(client_fd, LEN, session_key, &tmp_pap)) < 0) {
+ printf("Failed to recv PAP frame\n");
+ return error;
+ }
+
+ ++attempts;
+ }
+
+ return 0;
+}
+
+int
+negotiate_spw(int client_fd, unsigned char *session_key)
+{
+ const size_t LEN = sizeof(struct pap);
+ struct pap pap;
+ int error;
+
+ /* Get PAP from the network */
+ if ((error = recv_frame(client_fd, LEN, session_key, &pap)) < 0) {
+ return error;
+ }
+
+ return handle_pap(client_fd, &pap, session_key);
+}