From dba349091c13d0cf836f60456506c79ed684cc05 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Sat, 8 Dec 2012 13:00:17 +0100 Subject: [PATCH] PSK option added --- nb_verify.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nb_verify.py b/nb_verify.py index 0880508..06c049b 100644 --- a/nb_verify.py +++ b/nb_verify.py @@ -55,9 +55,15 @@ parser = OptionParser(usage) #parser.add_option("-i","--id", dest="id", help="id of the netbeacon message processed") parser.add_option("-t","--timedelta",dest="timedelta", action='store_true', help="show timedelta") parser.add_option("-s","--storeseq", dest="storeseq", action='store_true', help="store sequence and validate sequence") +parser.add_option("-p","--psk", dest="psk", help="pre-shared key used by the HMAC-SHA1 (default: netbeacon)") (options, args) = parser.parse_args() +if options.psk: + psk = options.psk +else: + psk = "netbeacon" + if options.storeseq: import shelve s = shelve.open("netbeacon.seq") @@ -68,7 +74,7 @@ for line in sys.stdin: m = nbparse(message=line) print m['hmac'] message = m['header']+";"+str(m['epoch'])+";"+str(m['sequence'])+";" - if m['hmac'] == nbsign(message=message): + if m['hmac'] == nbsign(message=message, psk=psk): print "valid signature for "+message if options.timedelta: timedelta = deltafromnow(epoch=m['epoch'])