wbokslag has uploaded this change for review.

View Change

Added keyfile loading

Added an additional command line flag -k to tetra-rx that allows for the
loading of a file containing network and key definitions. Also added
parsing code in tetra_crypto.c to interpret said definitions, and maintain
a global tetra_crypto_database struct.

Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c
---
M src/tetra-rx.c
1 file changed, 18 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/98/33998/1
diff --git a/src/tetra-rx.c b/src/tetra-rx.c
index b37b4c0..121e7b7 100644
--- a/src/tetra-rx.c
+++ b/src/tetra-rx.c
@@ -53,11 +53,14 @@
trs = talloc_zero(tetra_tall_ctx, struct tetra_rx_state);
trs->burst_cb_priv = tms;

- while ((opt = getopt(argc, argv, "d:")) != -1) {
+ while ((opt = getopt(argc, argv, "d:k:")) != -1) {
switch (opt) {
case 'd':
tms->dumpdir = strdup(optarg);
break;
+ case 'k':
+ load_keystore(optarg);
+ break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
}

To view, visit change 33998. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c
Gerrit-Change-Number: 33998
Gerrit-PatchSet: 1
Gerrit-Owner: wbokslag <w.bokslag@midnightblue.nl>
Gerrit-MessageType: newchange