diff options
| author | Piotr Krysik <perper@o2.pl> | 2009-07-21 20:37:54 +0200 |
|---|---|---|
| committer | Piotr Krysik <perper@o2.pl> | 2009-07-21 20:37:54 +0200 |
| commit | daee9c0f855dd7bce6d3257c814d32b15cc5c4e1 (patch) | |
| tree | ab9b36ce8ac6728177ecff23edd97e13b13e3b20 /gsm-receiver | |
| parent | e9ebf57cd87f097bacc32accac8d73d079bae4ba (diff) | |
little cleanup, removed one comment, printfs and changed defauld Kc key
Diffstat (limited to 'gsm-receiver')
| -rw-r--r-- | gsm-receiver/src/lib/gsm_receiver_cf.cc | 5 | ||||
| -rwxr-xr-x | gsm-receiver/src/python/gsm_receive.py | 4 | ||||
| -rwxr-xr-x | gsm-receiver/src/python/gsm_receive_usrp.py | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.cc b/gsm-receiver/src/lib/gsm_receiver_cf.cc index 9b2057d..db662ae 100644 --- a/gsm-receiver/src/lib/gsm_receiver_cf.cc +++ b/gsm-receiver/src/lib/gsm_receiver_cf.cc @@ -72,14 +72,11 @@ void gsm_receiver_cf::read_key(std::string key) for (i = 0;i < 8;i++) { b = d_hex_to_int[(char)key[(i)*2]]*16 + d_hex_to_int[(char)key[i*2+1]]; d_KC[i] = (byte)b; - } + } } void gsm_receiver_cf::process_normal_burst(burst_counter burst_nr, const unsigned char * burst_binary) { -// static byte KC[] = { 0xAD, 0x6A, 0x3E, 0xC2, 0xB4, 0x42, 0xE4, 0x00 }; -// static byte KC[] = { 0x2B, 0x08, 0x74, 0x9F, 0xDD, 0x0D, 0x9C, 0x00 }; -// printf("%x", KC[0]); float decrypted_data[148]; unsigned char * voice_frame; diff --git a/gsm-receiver/src/python/gsm_receive.py b/gsm-receiver/src/python/gsm_receive.py index 4cfb876..130eb05 100755 --- a/gsm-receiver/src/python/gsm_receive.py +++ b/gsm-receiver/src/python/gsm_receive.py @@ -6,7 +6,7 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser from os import sys -for extdir in ['../../debug/src/lib','../../debug/src/lib/.libs','../lib','../lib/.libs','../..debug/src/lib/decoder/openbts/SIP']: +for extdir in ['../../debug/src/lib','../../debug/src/lib/.libs','../lib','../lib/.libs']: if extdir not in sys.path: sys.path.append(extdir) import gsm @@ -95,7 +95,7 @@ class gsm_receiver_first_blood(gr.top_block): help="Input filename") parser.add_option("-O", "--outputfile", type="string", default="cfile2.out", help="Output filename") - parser.add_option("-k", "--key", type="string", default="2B 08 74 9F DD 0D 9C 00", + parser.add_option("-k", "--key", type="string", default="AD 6A 3E C2 B4 42 E4 00", help="KC session key") (options, args) = parser.parse_args () diff --git a/gsm-receiver/src/python/gsm_receive_usrp.py b/gsm-receiver/src/python/gsm_receive_usrp.py index a4e9720..7418d54 100755 --- a/gsm-receiver/src/python/gsm_receive_usrp.py +++ b/gsm-receiver/src/python/gsm_receive_usrp.py @@ -10,7 +10,7 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser from os import sys -for extdir in ['../../debug/src/lib','../../debug/src/lib/.libs']: +for extdir in ['../../debug/src/lib','../../debug/src/lib/.libs','../lib','../lib/.libs']: if extdir not in sys.path: sys.path.append(extdir) import gsm |