Remove #include and make the situation with snow3g clearer in a comment. May need...
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 16 Jan 2014 12:02:30 +0000 (12:02 +0000)
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 16 Jan 2014 12:02:30 +0000 (12:02 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54827 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-pdcp-lte.c

index fe64f6b251c5cf53027c036dc0c82dad554180e8..abd58b37495e443fbe8ec2715b04dd6b297f0e5f 100644 (file)
 #include <wsutil/wsgcrypt.h>
 #endif /* HAVE_LIBGCRYPT */
 
-/* Define this symbol if you have a working implementation of SNOW3G f8() and f9() available */
+/* Define this symbol if you have a working implementation of SNOW3G f8() and f9() available.
+   Note that the use of this algorithm is restricted, and that an administrative charge
+   may be applicable if you use it (see e.g. http://www.gsma.com/technicalprojects/fraud-security/security-algorithms).
+   A version of Wireshark with this enabled would not be distributable. */
 /* #define HAVE_SNOW3G */
-#ifdef HAVE_SNOW3G
-#include <epan/snow3g_algorithm.h>
-#endif
 
 #include "packet-rlc-lte.h"
 #include "packet-pdcp-lte.h"
@@ -1512,6 +1512,7 @@ static guint32 calculate_digest(pdu_security_settings_t *pdu_security_settings,
 
                 mac = (u8*)snow3g_f9(pdu_security_settings->integrityKey,
                                      pdu_security_settings->count,
+                                     /* 'Fresh' is the bearer bits then zeros */
                                      pdu_security_settings->bearer << 27,
                                      pdu_security_settings->direction,
                                      message_data,