From af15c38a054d969e9dd46e2c547a7064bce4a662 Mon Sep 17 00:00:00 2001 From: jaseg Date: Mon, 12 Nov 2018 23:18:45 +0900 Subject: New host-side arch working --- adjectives.py | 294 ++++---------------------------- hexdump.py | 27 +++ hexnoise.py | 452 ++++++++++++++++++++++++++++++++----------------- keymap.py | 176 ------------------- nouns.py | 294 ++++---------------------------- pairing.py | 27 +++ src/demo.c | 83 +++++---- src/packet_interface.h | 22 ++- 8 files changed, 487 insertions(+), 888 deletions(-) create mode 100644 hexdump.py create mode 100755 pairing.py diff --git a/adjectives.py b/adjectives.py index 78641ce..6d7deb0 100644 --- a/adjectives.py +++ b/adjectives.py @@ -1,260 +1,34 @@ - -ADJECTIVES = [ - "wrathful", # 0 - "worthy", # 1 - "weird", # 2 - "warm", # 3 - "volatile", # 4 - "veiled", # 5 - "vacuous", # 6 - "useless", # 7 - "upset", # 8 - "unsoiled", # 9 - "unsightly", # 10 - "unpronounceable", # 11 - "unfriendly", # 12 - "unfree", # 13 - "unfit", # 14 - "unfaithful", # 15 - "unchaste", # 16 - "unbroken", # 17 - "unbound", # 18 - "unblessed", # 19 - "unbefitting", # 20 - "unaltered", # 21 - "unabused", # 22 - "unable", # 23 - "ugly", # 24 - "tongued", # 25 - "thorny", # 26 - "thirsty", # 27 - "thick", # 28 - "terminal", # 29 - "ten-sided", # 30 - "teeming", # 31 - "tangerine", # 32 - "taken", # 33 - "substantial", # 34 - "stupefying", # 35 - "stringy", # 36 - "strange", # 37 - "stillborn", # 38 - "sticky", # 39 - "stagnant", # 40 - "spongy", # 41 - "sour", # 42 - "soul-destroying", # 43 - "smoldering", # 44 - "smitten", # 45 - "slain", # 46 - "six-sided", # 47 - "shifting", # 48 - "shadowy", # 49 - "severed", # 50 - "seven-sided", # 51 - "serene", # 52 - "salty", # 53 - "rust-red", # 54 - "royal", # 55 - "rotten", # 56 - "riddled", # 57 - "resentful", # 58 - "regrettable", # 59 - "reeking", # 60 - "rare", # 61 - "rank", # 62 - "rancid", # 63 - "quiescent", # 64 - "putrid", # 65 - "putrid", # 66 - "putrescent", # 67 - "prehistoric", # 68 - "predatory", # 69 - "predaceous", # 70 - "porous", # 71 - "poisonous", # 72 - "pierced", # 73 - "phlegmatic", # 74 - "petrifying", # 75 - "pessimal", # 76 - "pathetic", # 77 - "odorless", # 78 - "oddish", # 79 - "obsessed", # 80 - "obscene", # 81 - "numb", # 82 - "nine-sided", # 83 - "nasty", # 84 - "mysterious", # 85 - "mute", # 86 - "musky", # 87 - "morose", # 88 - "moribund", # 89 - "moldy", # 90 - "miasmic", # 91 - "material", # 92 - "many-lobed", # 93 - "malodorous", # 94 - "malign", # 95 - "maimed", # 96 - "luminescent", # 97 - "low-cut", # 98 - "lousy", # 99 - "live", # 100 - "limp", # 101 - "lifeless", # 102 - "leering", # 103 - "leaky", # 104 - "layered", # 105 - "latent", # 106 - "lackluster", # 107 - "jagged", # 108 - "irregular", # 109 - "iridescent", # 110 - "intangible", # 111 - "infinite", # 112 - "inept", # 113 - "incomprehensible", # 114 - "in-between", # 115 - "improper", # 116 - "idle", # 117 - "hunted", # 118 - "hideous", # 119 - "heavy", # 120 - "hairy", # 121 - "guilty", # 122 - "grotesque", # 123 - "grey", # 124 - "greedy", # 125 - "gory", # 126 - "gorgeous", # 127 - "gooey", # 128 - "golden-brown", # 129 - "golden", # 130 - "ghastly", # 131 - "frostbitten", # 132 - "fresh-cut", # 133 - "freakish", # 134 - "frantic", # 135 - "fossilized", # 136 - "formless", # 137 - "formidable", # 138 - "floccose", # 139 - "five-lobed", # 140 - "firstborn", # 141 - "filthy", # 142 - "fickle", # 143 - "fetid", # 144 - "fertile", # 145 - "fearful", # 146 - "fatal", # 147 - "familiar", # 148 - "fallen", # 149 - "fallacious", # 150 - "faint", # 151 - "faceless", # 152 - "extinct", # 153 - "esoteric", # 154 - "errant", # 155 - "emergent", # 156 - "elastic", # 157 - "eight-sided", # 158 - "eerie", # 159 - "ebon", # 160 - "dysphoric", # 161 - "dying", # 162 - "dumb", # 163 - "dull-purple", # 164 - "dull", # 165 - "dull", # 166 - "dull", # 167 - "dormant", # 168 - "doomed", # 169 - "disfigured", # 170 - "dirty", # 171 - "defenseless", # 172 - "deep-pink", # 173 - "deep", # 174 - "deconsecrated", # 175 - "deathlike", # 176 - "deadly", # 177 - "dead", # 178 - "dark-blue", # 179 - "dark", # 180 - "curly", # 181 - "curious", # 182 - "cured", # 183 - "cunning", # 184 - "crystalline", # 185 - "cryptic", # 186 - "crying", # 187 - "crumbly", # 188 - "crimson", # 189 - "crested", # 190 - "creepy", # 191 - "crazy", # 192 - "corrupt", # 193 - "corporeal", # 194 - "contemptible", # 195 - "contained", # 196 - "concrete", # 197 - "cloudy", # 198 - "chopped", # 199 - "chained", # 200 - "caustic", # 201 - "catholic", # 202 - "cathartic", # 203 - "captive", # 204 - "cancerous", # 205 - "cabalistic", # 206 - "burnt", # 207 - "buoyant", # 208 - "bronze-red", # 209 - "bronze", # 210 - "broken", # 211 - "bright-red", # 212 - "breathless", # 213 - "bound", # 214 - "bound", # 215 - "bottomless", # 216 - "bony", # 217 - "bodiless", # 218 - "blue-lilac", # 219 - "blue", # 220 - "bloody", # 221 - "bloodthirsty", # 222 - "bloodsucking", # 223 - "bloodstained", # 224 - "bloodcurdling", # 225 - "blonde", # 226 - "blistered", # 227 - "blank", # 228 - "bitter", # 229 - "bilgy", # 230 - "bewitched", # 231 - "befouled", # 232 - "beardless", # 233 - "bastardly", # 234 - "barbed", # 235 - "baleful", # 236 - "balding", # 237 - "awkward", # 238 - "awful", # 239 - "atrocious", # 240 - "arcane", # 241 - "appalling", # 242 - "antic", # 243 - "anonymous", # 244 - "angry", # 245 - "ample", # 246 - "ambiguous", # 247 - "amber-green", # 248 - "amber", # 249 - "aghast", # 250 - "activated", # 251 - "acidic", # 252 - "abused", # 253 - "abstruse", # 254 - "abject", # 255 -] - +ADJECTIVES = ''' + wrathful worthy weird warm volatile veiled vacuous useless + upset unsoiled unsightly unpronounceable unfriendly unfree unfit unfaithful + unchaste unbroken unbound unblessed unbefitting unaltered unabused unable + ugly tongued thorny thirsty thick terminal ten-sided teeming + tangerine taken substantial stupefying stringy strange stillborn sticky + stagnant spongy sour soul-destroying smoldering smitten slain six-sided + shifting shadowy severed seven-sided serene salty rust-red royal + rotten riddled resentful regrettable reeking rare rank rancid + quiescent putrid putrid putrescent prehistoric predatory predaceous porous + poisonous pierced phlegmatic petrifying pessimal pathetic odorless oddish + obsessed obscene numb nine-sided nasty mysterious mute musky + morose moribund moldy miasmic material many-lobed malodorous malign + maimed luminescent low-cut lousy live limp lifeless leering + leaky layered latent lackluster jagged irregular iridescent intangible + infinite inept incomprehensible in-between improper idle hunted hideous + heavy hairy guilty grotesque grey greedy gory gorgeous + gooey golden-brown golden ghastly frostbitten fresh-cut freakish frantic + fossilized formless formidable floccose five-lobed firstborn filthy fickle + fetid fertile fearful fatal familiar fallen fallacious faint + faceless extinct esoteric errant emergent elastic eight-sided eerie + ebon dysphoric dying dumb dull-purple dull dull dull + dormant doomed disfigured dirty defenseless deep-pink deep deconsecrated + deathlike deadly dead dark-blue dark curly curious cured + cunning crystalline cryptic crying crumbly crimson crested creepy + crazy corrupt corporeal contemptible contained concrete cloudy chopped + chained caustic catholic cathartic captive cancerous cabalistic burnt + buoyant bronze-red bronze broken bright-red breathless bound bound + bottomless bony bodiless blue-lilac blue bloody bloodthirsty bloodsucking + bloodstained bloodcurdling blonde blistered blank bitter bilgy bewitched + befouled beardless bastardly barbed baleful balding awkward awful + atrocious arcane appalling antic anonymous angry ample ambiguous + amber-green amber aghast activated acidic abused abstruse abject + '''.split() diff --git a/hexdump.py b/hexdump.py new file mode 100644 index 0000000..943d8e4 --- /dev/null +++ b/hexdump.py @@ -0,0 +1,27 @@ + +import string +import time + +startup = time.time() + +def _print_line(write, ts, line, width=16): + h,m,s,ms = int(ts//3600), int((ts//60)%60), int(ts%60), int((ts%1.0) * 1000) + timestamp = f'{h: 3d}:{m:02d}:{s:02d}:{ms:03d}' + line = list(line) + [None]*(width-len(line)) + hexcol = '\033[0m' + col = lambda b, s: s if b != 0 else f'\033[91m{s}{hexcol}' + hexfmt = ' '.join( + ' '.join(col(b, f'{b:02x}') if b is not None else ' ' for b in line[i*8:i*8+8]) + for i in range(1 + (len(line)-1)//8)) + asciifmt = ''.join(chr(c) if c is not None and chr(c) in string.printable and c>=0x20 else '.' for c in line) + write(f'\033[38;5;244m{timestamp} {hexcol}{hexfmt} \033[38;5;244m|\033[92m{asciifmt}\033[38;5;244m|\033[0m', flush=True, end='') + +def hexdump(write, packet, width=16): + ts = time.time() + while len(packet) > width: + chunk, packet = packet[:width], packet[width:] + _print_line(write, ts-startup, chunk, width=width) + write() + _print_line(write, ts-startup, packet, width=width) + write() + diff --git a/hexnoise.py b/hexnoise.py index 6b0aad8..8745159 100755 --- a/hexnoise.py +++ b/hexnoise.py @@ -1,33 +1,18 @@ #!/usr/bin/env python3 import time -import string import enum +import sys +from contextlib import contextmanager, suppress, wraps +import serial from cobs import cobs +import uinput +from noise.connection import NoiseConnection, Keypair +from noise.exceptions import NoiseInvalidMessage -def _print_line(write, ts, line, width=16): - h,m,s,ms = int(ts//3600), int((ts//60)%60), int(ts%60), int((ts%1.0) * 1000) - timestamp = f'{h: 3d}:{m:02d}:{s:02d}:{ms:03d}' - line = list(line) + [None]*(width-len(line)) - hexcol = '\033[0m' - col = lambda b, s: s if b != 0 else f'\033[91m{s}{hexcol}' - hexfmt = ' '.join( - ' '.join(col(b, f'{b:02x}') if b is not None else ' ' for b in line[i*8:i*8+8]) - for i in range(1 + (len(line)-1)//8)) - asciifmt = ''.join(chr(c) if c is not None and chr(c) in string.printable and c>=0x20 else '.' for c in line) - write(f'\033[38;5;244m{timestamp} {hexcol}{hexfmt} \033[38;5;244m|\033[92m{asciifmt}\033[38;5;244m|\033[0m', flush=True, end='') - -startup = time.time() - -def hexdump(write, packet, width=16): - ts = time.time() - while len(packet) > width: - chunk, packet = packet[:width], packet[width:] - _print_line(write, ts-startup, chunk, width=width) - write() - _print_line(write, ts-startup, packet, width=width) - write() +import keymap +from hexdump import hexdump class PacketType(enum.Enum): _RESERVED = 0 @@ -39,147 +24,308 @@ class ReportType(enum.Enum): _RESERVED = 0 KEYBOARD = 1 MOUSE = 2 - PAIRING = 3 # keyboard in disguise - -def send_packet(ser, pkt_type, data, width=16): - print(f'\033[93mSending {len(data)} bytes, packet type {pkt_type.name} ({pkt_type.value})\033[0m') - hexdump(print, data, width) - data = bytes([pkt_type.value]) + data - encoded = cobs.encode(data) + b'\0' - ser.write(encoded) - ser.flushOutput() - -def receive_packet(ser, width=16): - packet = ser.read_until(b'\0') - data = cobs.decode(packet[:-1]) - #print(f'\033[93mReceived {len(data)} bytes\033[0m') - #hexdump(print, data, width) - return data[0], data[1:] + PAIRING_INPUT = 3 + PAIRING_SUCESS = 4 + PAIRING_ERROR = 5 + +class Packetizer: + def __init__(self, serial, debug=False, width=16): + self.ser, self.debug, self.width = serial, debug, width + self.ser.write(b'\0') # COBS synchronization + + def send_packet(self, pkt_type, data): + if self.debug: + print(f'\033[93mSending {len(data)} bytes, packet type {pkt_type.name} ({pkt_type.value})\033[0m') + hexdump(print, data, self.width) + data = bytes([pkt_type.value]) + data + encoded = cobs.encode(data) + b'\0' + self.ser.write(encoded) + self.ser.flushOutput() + + def receive_packet(self): + packet = self.ser.read_until(b'\0') + data = cobs.decode(packet[:-1]) + if self.debug: + print(f'\033[93mReceived {len(data)} bytes\033[0m') + hexdump(print, data, self.width) + return PacketType(data[0]), data[1:] + +class KeyMapper: + Keycode = enum.Enum('Keycode', start=0, names=''' + KEY_NONE _RESERVED_0x01 _RESERVED_0x02 _RESERVED_0x03 KEY_A KEY_B KEY_C KEY_D + KEY_E KEY_F KEY_G KEY_H KEY_I KEY_J KEY_K KEY_L + KEY_M KEY_N KEY_O KEY_P KEY_Q KEY_R KEY_S KEY_T + KEY_U KEY_V KEY_W KEY_X KEY_Y KEY_Z KEY_1 KEY_2 + KEY_3 KEY_4 KEY_5 KEY_6 KEY_7 KEY_8 KEY_9 KEY_0 + KEY_ENTER KEY_ESC KEY_BACKSPACE KEY_TAB KEY_SPACE KEY_MINUS KEY_EQUAL KEY_LEFTBRACE + KEY_RIGHTBRACE KEY_BACKSLASH KEY_HASH KEY_SEMICOLON KEY_APOSTROPHE KEY_GRAVE KEY_COMMA KEY_DOT + KEY_SLASH KEY_CAPSLOCK KEY_F1 KEY_F2 KEY_F3 KEY_F4 KEY_F5 KEY_F6 + KEY_F7 KEY_F8 KEY_F9 KEY_F10 KEY_F11 KEY_F12 KEY_SYSRQ KEY_SCROLLLOCK + KEY_PAUSE KEY_INSERT KEY_HOME KEY_PAGEUP KEY_DELETE KEY_END KEY_PAGEDOWN KEY_RIGHT + KEY_LEFT KEY_DOWN KEY_UP KEY_NUMLOCK KEY_KPSLASH KEY_KPASTERISK KEY_KPMINUS KEY_KPPLUS + KEY_KPENTER KEY_KP1 KEY_KP2 KEY_KP3 KEY_KP4 KEY_KP5 KEY_KP6 KEY_KP7 + KEY_KP8 KEY_KP9 KEY_KP0 KEY_KPDOT KEY_102ND KEY_COMPOSE KEY_POWER KEY_KPEQUAL + KEY_F13 KEY_F14 KEY_F15 KEY_F16 KEY_F17 KEY_F18 KEY_F19 KEY_F20 + KEY_F21 KEY_F22 KEY_F23 KEY_F24 KEY_OPEN KEY_HELP KEY_PROPS KEY_FRONT + KEY_STOP KEY_AGAIN KEY_UNDO KEY_CUT KEY_COPY KEY_PASTE KEY_FIND KEY_MUTE + KEY_VOLUMEUP KEY_VOLUMEDOWN _RESERVED_0x82 _RESERVED_0x83 _RESERVED_0x84 KEY_KPCOMMA _RESERVED_0x86 KEY_RO + KEY_KATAKANAHIRAGANA KEY_YEN KEY_HENKAN KEY_MUHENKAN KEY_KPJPCOMMA _RESERVED_0x8D _RESERVED_0x8E _RESERVED_0x8F + KEY_HANGEUL KEY_HANJA KEY_KATAKANA KEY_HIRAGANA KEY_ZENKAKUHANKAKU _RESERVED_0x95 _RESERVED_0x96 _RESERVED_0x97 + _RESERVED_0x98 _RESERVED_0x99 _RESERVED_0x9A _RESERVED_0x9B _RESERVED_0x9C _RESERVED_0x9D _RESERVED_0x9E _RESERVED_0x9F + _RESERVED_0xA0 _RESERVED_0xA1 _RESERVED_0xA2 _RESERVED_0xA3 _RESERVED_0xA4 _RESERVED_0xA5 _RESERVED_0xA6 _RESERVED_0xA7 + _RESERVED_0xA8 _RESERVED_0xA9 _RESERVED_0xAA _RESERVED_0xAB _RESERVED_0xAC _RESERVED_0xAD _RESERVED_0xAE _RESERVED_0xAF + _RESERVED_0xB0 _RESERVED_0xB1 _RESERVED_0xB2 _RESERVED_0xB3 _RESERVED_0xB4 _RESERVED_0xB5 KEY_KPLEFTPAREN KEY_KPRIGHTPAREN + _RESERVED_0xB8 _RESERVED_0xB9 _RESERVED_0xBA _RESERVED_0xBB _RESERVED_0xBC _RESERVED_0xBD _RESERVED_0xBE _RESERVED_0xBF + _RESERVED_0xC0 _RESERVED_0xC1 _RESERVED_0xC2 _RESERVED_0xC3 _RESERVED_0xC4 _RESERVED_0xC5 _RESERVED_0xC6 _RESERVED_0xC7 + _RESERVED_0xC8 _RESERVED_0xC9 _RESERVED_0xCA _RESERVED_0xCB _RESERVED_0xCC _RESERVED_0xCD _RESERVED_0xCE _RESERVED_0xCF + _RESERVED_0xD0 _RESERVED_0xD1 _RESERVED_0xD2 _RESERVED_0xD3 _RESERVED_0xD4 _RESERVED_0xD5 _RESERVED_0xD6 _RESERVED_0xD7 + _RESERVED_0xD8 _RESERVED_0xD9 _RESERVED_0xDA _RESERVED_0xDB _RESERVED_0xDC _RESERVED_0xDD _RESERVED_0xDE _RESERVED_0xDF + _RESERVED_0xE0 _RESERVED_0xE1 _RESERVED_0xE2 _RESERVED_0xE3 _RESERVED_0xE4 _RESERVED_0xE5 _RESERVED_0xE6 _RESERVED_0xE7 + _RESERVED_0xE8 _RESERVED_0xE9 _RESERVED_0xEA _RESERVED_0xEB _RESERVED_0xEC _RESERVED_0xED _RESERVED_0xEE _RESERVED_0xEF + _RESERVED_0xF0 _RESERVED_0xF1 _RESERVED_0xF2 _RESERVED_0xF3 _RESERVED_0xF4 _RESERVED_0xF5 _RESERVED_0xF6 _RESERVED_0xF7 + _RESERVED_0xF8 _RESERVED_0xF9 _RESERVED_0xFA _RESERVED_0xFB _RESERVED_0xFC _RESERVED_0xFD _RESERVED_0xFE _RESERVED_0xFF + ''') + + MODIFIERS = [ uinput.ev.KEY_LEFTCTRL, uinput.ev.KEY_LEFTSHIFT, uinput.ev.KEY_LEFTALT, uinput.ev.KEY_LEFTMETA, + uinput.ev.KEY_RIGHTCTRL, uinput.ev.KEY_RIGHTSHIFT, uinput.ev.KEY_RIGHTALT, uinput.ev.KEY_RIGHTMETA ] + + ALL_KEYS = [ v for k, v in uinput.ev.__dict__.items() if k.startswith('KEY_') ] + REGULAR_MAP = { kc.value: getattr(uinput.ev, kc.name) for kc in Keycode if hasattr(uinput.ev, kc.name) } + + @classmethod + def map_modifiers(kls, val): + return [ mod for i, mod in enumerate(kls.MODIFIERS) if val & (1<Step 1\n\nSearching for device') + self.vbox.add(self.label) + + self.add(self.vbox) + +if __name__ == '__main__': + window = PairingWindow() + window.connect('destroy', Gtk.main_quit) + window.show_all() + Gtk.main() + diff --git a/src/demo.c b/src/demo.c index 8febe9b..6c519e1 100644 --- a/src/demo.c +++ b/src/demo.c @@ -184,6 +184,7 @@ int pairing_check(struct NoiseState *st, const char *buf) { } void pairing_input(uint8_t modbyte, uint8_t keycode) { + char ch = 0; uint8_t level = modbyte & MOD_XSHIFT ? LEVEL_SHIFT : LEVEL_NONE; switch (keycode) { case KEY_ENTER: @@ -191,8 +192,17 @@ void pairing_input(uint8_t modbyte, uint8_t keycode) { if (!pairing_check(&noise_state, pairing_buf)) { persist_remote_key(&noise_state); /* FIXME write key to backup memory */ + + uint8_t response = REPORT_PAIRING_SUCCESS; + if (send_encrypted_message(&noise_state, &response, sizeof(response))) + LOG_PRINTF("Error sending pairing response packet\n"); + } else { /* FIXME sound alarm */ + + uint8_t response = REPORT_PAIRING_ERROR; + if (send_encrypted_message(&noise_state, &response, sizeof(response))) + LOG_PRINTF("Error sending pairing response packet\n"); } break; @@ -200,17 +210,18 @@ void pairing_input(uint8_t modbyte, uint8_t keycode) { if (pairing_buf_pos > 0) pairing_buf_pos--; pairing_buf[pairing_buf_pos] = '\0'; /* FIXME debug */ + ch = '\b'; break; default: for (size_t i=0; keycode_mapping[i].kc != KEY_NONE; i++) { if (keycode_mapping[i].kc == keycode) { - char ch = keycode_mapping[i].ch[level]; - /* FIXME send decoded char to host here instead of raw hid report to reduce buggability */ + ch = keycode_mapping[i].ch[level]; if (!(('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') || ('0' <= ch && ch <= '9') || - (ch == ' '))) + (ch == ' ') || + (ch == '-'))) break; /* ignore special chars */ if (pairing_buf_pos < sizeof(pairing_buf)-1) /* allow for terminating null byte */ { @@ -218,14 +229,28 @@ void pairing_input(uint8_t modbyte, uint8_t keycode) { pairing_buf[pairing_buf_pos] = '\0'; /* FIXME debug */ } else { LOG_PRINTF("Pairing confirmation user input buffer full\n"); - /* FIXME return error to host? */ + + uint8_t response = REPORT_PAIRING_ERROR; + if (send_encrypted_message(&noise_state, &response, sizeof(response))) + LOG_PRINTF("Error sending pairing response packet\n"); } break; } } break; } - LOG_PRINTF("Input: %s\n", pairing_buf); + + if (ch) { + LOG_PRINTF("Input: %s\n", pairing_buf); + struct hid_report_packet pkt = { + .type = REPORT_PAIRING_INPUT, + .pairing_input = { .c = ch } + }; + if (send_encrypted_message(&noise_state, (uint8_t *)&pkt, sizeof(pkt))) { + LOG_PRINTF("Error sending pairing input packet\n"); + return; + } + } } void pairing_parse_report(struct hid_report *buf, uint8_t len) { @@ -249,44 +274,36 @@ void pairing_parse_report(struct hid_report *buf, uint8_t len) { memcpy(old_keycodes, buf->keycodes, 6); } -static void hid_in_message_handler(uint8_t device_id, const uint8_t *data, uint32_t length) -{ - if (length < 4) { - LOG_PRINTF("HID report too short\n"); - return; - } - if (length > 8) { - LOG_PRINTF("HID report too long\n"); +static void hid_in_message_handler(uint8_t device_id, const uint8_t *data, uint32_t length) { + if (length < 4 || length > 8) { + LOG_PRINTF("HID report length must be 4 < len < 8, is %d bytes\n", length); return; } //LOG_PRINTF("Sending event %02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]); - struct hid_report_packet pkt = { - .len = length, - .report = {0} - }; - memcpy(pkt.report, data, length); - int type = hid_get_type(device_id); - if (type == HID_TYPE_KEYBOARD) { - if (noise_state.handshake_state == HANDSHAKE_DONE_UNKNOWN_HOST) { - pkt.type = PAIRING; + if (type != HID_TYPE_KEYBOARD && type != HID_TYPE_MOUSE) { + LOG_PRINTF("Unsupported HID report type %x\n", type); + return; + } + + if (noise_state.handshake_state == HANDSHAKE_DONE_UNKNOWN_HOST) { + if (type == HID_TYPE_KEYBOARD) pairing_parse_report((struct hid_report *)data, length); - } else { - pkt.type = HID_KEYBOARD_REPORT; - } - } else if (type == HID_TYPE_MOUSE) { - if (noise_state.handshake_state == HANDSHAKE_DONE_UNKNOWN_HOST) { + else LOG_PRINTF("Not sending HID mouse report during pairing\n"); - return; - } else { - pkt.type = HID_MOUSE_REPORT; - } - } else { - LOG_PRINTF("Unsupported HID report type %x\n", type); return; } + struct hid_report_packet pkt = { + .type = type == HID_TYPE_KEYBOARD ? REPORT_KEYBOARD : REPORT_MOUSE, + .report = { + .len = length, + .report = {0} + } + }; + memcpy(pkt.report.report, data, length); + if (send_encrypted_message(&noise_state, (uint8_t *)&pkt, sizeof(pkt))) { LOG_PRINTF("Error sending HID report packet\n"); return; diff --git a/src/packet_interface.h b/src/packet_interface.h index 9e1327d..638405a 100644 --- a/src/packet_interface.h +++ b/src/packet_interface.h @@ -14,18 +14,28 @@ enum control_packet_types { }; enum packet_types { - _PACKET_RESERVED = 0, - HID_KEYBOARD_REPORT = 1, - HID_MOUSE_REPORT = 2, - PAIRING = 3, + _REPORT_RESERVED = 0, + REPORT_KEYBOARD= 1, + REPORT_MOUSE= 2, + REPORT_PAIRING_INPUT = 3, + REPORT_PAIRING_SUCCESS = 4, + REPORT_PAIRING_ERROR = 5, }; struct hid_report_packet { uint8_t type; - uint8_t len; - uint8_t report[8]; + union { + struct { + uint8_t len; + uint8_t report[8]; + } report; + struct { + char c; + } pairing_input; + }; } __attribute__((__packed__)); + struct control_packet { uint8_t type; uint8_t payload[0]; -- cgit