diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-26 21:45:33 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-08-29 12:46:45 +0000 |
| commit | 3cb08277f1d46c6c74c4bb6e254a57ffb9ac3834 (patch) | |
| tree | c275c022fec7456430c7b62f3218334ca3bc04e1 /utils | |
| parent | 4315e01f5a8658399fedfb68d0647624666a86e0 (diff) | |
osmo-auc-gen: umts: add --ind arg
During UMTS AKA, the caller typically indicates which IND slot the next used
SQN should belong to. Without this option, osmo-auc-gen will always produce SQN
from IND-slot 0. Add --ind option.
Enhance the osmo-auc-gen_test.sh to expect errors with useful printouts on
stderr, and add tests that verify valid --ind ranges.
Related: OS#2465
Change-Id: Ib60eec80d58ca9a0a01e7fbd2bcbbd4339b1a6d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/osmo-auc-gen.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index 4e07fa74..4f36dee5 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -80,6 +80,7 @@ static void help() "-O --op\tSpecify OP (only for 3G)\n" "-f --amf\tSpecify AMF (only for 3G)\n" "-s --sqn\tSpecify SQN (only for 3G)\n" + "-i --ind\tSpecify IND slot for new SQN after AUTS (only for 3G)\n" "-A --auts\tSpecify AUTS (only for 3G)\n" "-r --rand\tSpecify random value\n" "-I --ipsec\tOutput in triplets.dat format for strongswan\n"); @@ -96,10 +97,12 @@ int main(int argc, char **argv) struct osmo_auth_vector *vec = &_vec; uint8_t _rand[16], _auts[14]; uint64_t sqn; + unsigned int ind; int rc, option_index; int rand_is_set = 0; int auts_is_set = 0; int sqn_is_set = 0; + int ind_is_set = 0; int fmt_triplets_dat = 0; printf("osmo-auc-gen (C) 2011-2012 by Harald Welte\n"); @@ -118,6 +121,7 @@ int main(int argc, char **argv) { "op", 1, 0, 'O' }, { "amf", 1, 0, 'f' }, { "sqn", 1, 0, 's' }, + { "ind", 1, 0, 'i' }, { "rand", 1, 0, 'r' }, { "auts", 1, 0, 'A' }, { "help", 0, 0, 'h' }, @@ -126,7 +130,7 @@ int main(int argc, char **argv) rc = 0; - c = getopt_long(argc, argv, "23a:k:o:f:s:r:hO:A:I", long_options, + c = getopt_long(argc, argv, "23a:k:o:f:s:i:r:hO:A:I", long_options, &option_index); if (c == -1) @@ -202,6 +206,14 @@ int main(int argc, char **argv) sqn = strtoull(optarg, 0, 10); sqn_is_set = 1; break; + case 'i': + if (test_aud.type != OSMO_AUTH_TYPE_UMTS) { + fprintf(stderr, "Only UMTS has IND\n"); + exit(2); + } + ind = atoi(optarg); + ind_is_set = 1; + break; case 'r': rc = osmo_hexparse(optarg, _rand, sizeof(_rand)); rand_is_set = 1; @@ -257,6 +269,22 @@ int main(int argc, char **argv) test_aud.u.umts.sqn = sqn - seq_1; test_aud.u.umts.ind = sqn & ind_mask; } + + if (sqn_is_set && ind_is_set) { + fprintf(stderr, "Requesting --sqn %"PRIu64" implies IND=%u," + " so no further --ind argument is allowed.\n", + sqn, test_aud.u.umts.ind); + exit(2); + } + + if (ind_is_set) { + if (ind >= (1 << test_aud.u.umts.ind_bitlen)) { + fprintf(stderr, "Requested --ind %u is too large for IND bitlen of %u\n", + ind, test_aud.u.umts.ind_bitlen); + exit(2); + } + test_aud.u.umts.ind = ind; + } } if (!auts_is_set) |