#!/usr/bin/perl -w
#
# extract-mod-sig <part> <module-file>
#
# Reads the module file and writes out some or all of the signature
# section to stdout.  Part is the bit to be written and is one of:
#
#  -0: The unsigned module, no signature data at all
#  -a: All of the signature data, including magic number
#  -d: Just the descriptor values as a sequence of numbers
#  -n: Just the signer's name
#  -k: Just the key ID
#  -s: Just the crypto signature or PKCS#7 message
#
use strict;

die "Format: $0 -[0adnks] module-file >out\n"
    if ($#ARGV != 1);

my $part = $ARGV[0];
my $modfile = $ARGV[1];

my $magic_number = "~Module signature appended~\n";

#
# Read the module contents
#
open FD, "<$modfile" || die $modfile;
binmode(FD);
my @st = stat(FD);
die "$modfile" unless (@st);
my $buf = "";
my $len = sysread(FD, $buf, $st[7]);
die "$modfile" unless (defined($len));
die "Short read on $modfile\n" unless ($len == $st[7]);
close(FD) || die $modfile;

print STDERR "Read ", $len, " bytes from module file\n";

die "The file is too short to have a sig magic number and descriptor\n"
    if ($len < 12 + length($magic_number));

#
# Check for the magic number and extract the information block
#
my $p = $len - length($magic_number);
my $raw_magic = substr($buf, $p);

die "Magic number not found at $len\n"
    if ($raw_magic ne $magic_number);
print STDERR "Found magic number at $len\n";

$p -= 12;
my $raw_info = substr($buf, $p, 12);

my @info = unpack("CCCCCxxxN", $raw_info);
my ($algo, $hash, $id_type, $name_len, $kid_len, $sig_len) = @info;

if ($id_type == 0) {
    print STDERR "Found PGP key identifier\n";
} elsif ($id_type == 1) {
    print STDERR "Found X.509 cert identifier\n";
} elsif ($id_type == 2) {
    print STDERR "Found PKCS#7/CMS encapsulation\n";
} else {
    print STDERR "Found unsupported identifier type $id_type\n";
}

#
# Extract the three pieces of info data
#
die "Insufficient name+kid+sig data in file\n"
    unless ($p >= $name_len + $kid_len + $sig_len);

$p -= $sig_len;
my $raw_sig = substr($buf, $p, $sig_len);
$p -= $kid_len;
my $raw_kid = substr($buf, $p, $kid_len);
$p -= $name_len;
my $raw_name = substr($buf, $p, $name_len);

my $module_len = $p;

if ($sig_len > 0) {
    print STDERR "Found $sig_len bytes of signature [";
    my $n = $sig_len > 16 ? 16 : $sig_len;
    foreach my $i (unpack("C" x $n, substr($raw_sig, 0, $n))) {
	printf STDERR "%02x", $i;
    }
    print STDERR "]\n";
}

if ($kid_len > 0) {
    print STDERR "Found $kid_len bytes of key identifier [";
    my $n = $kid_len > 16 ? 16 : $kid_len;
    foreach my $i (unpack("C" x $n, substr($raw_kid, 0, $n))) {
	printf STDERR "%02x", $i;
    }
    print STDERR "]\n";
}

if ($name_len > 0) {
    print STDERR "Found $name_len bytes of signer's name [$raw_name]\n";
}

#
# Produce the requested output
#
if ($part eq "-0") {
    # The unsigned module, no signature data at all
    binmode(STDOUT);
    print substr($buf, 0, $module_len);
} elsif ($part eq "-a") {
    # All of the signature data, including magic number
    binmode(STDOUT);
    print substr($buf, $module_len);
} elsif ($part eq "-d") {
    # Just the descriptor values as a sequence of numbers
    print join(" ", @info), "\n";
} elsif ($part eq "-n") {
    # Just the signer's name
    print STDERR "No signer's name for PKCS#7 message type sig\n"
	if ($id_type == 2);
    binmode(STDOUT);
    print $raw_name;
} elsif ($part eq "-k") {
    # Just the key identifier
    print STDERR "No key ID for PKCS#7 message type sig\n"
	if ($id_type == 2);
    binmode(STDOUT);
    print $raw_kid;
} elsif ($part eq "-s") {
    # Just the crypto signature or PKCS#7 message
    binmode(STDOUT);
    print $raw_sig;
}
'2017-02-10 14:31:51 -0500'>2017-02-10</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=0d2164af2696821b27b04bebd8420b0e881bf44d'>Merge tag 'mac80211-next-for-davem-2017-02-09' of ↵</a></td><td>David S. Miller</td><td>4</td><td><span class='deletions'>-40</span>/<span class='insertions'>+114</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Some more updates:
 * use shash in mac80211 crypto code where applicable
 * some documentation fixes
 * pass RSSI levels up in change notifications
 * remove unused rfkill-regulator
 * various other cleanups
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-09 15:17:30 +0100'>2017-02-09</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=8585989d146c61dd073d2135c5bb11d0f979d576'>cfg80211: fix NAN bands definition</a></td><td>Luca Coelho</td><td>3</td><td><span class='deletions'>-17</span>/<span class='insertions'>+37</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
The nl80211_nan_dual_band_conf enumeration doesn't make much sense.
The default value is assigned to a bit, which makes it weird if the
default bit and other bits are set at the same time.

To improve this, get rid of NL80211_NAN_BAND_DEFAULT and add a wiphy
configuration to let the drivers define which bands are supported.
This is exposed to the userspace, which then can make a decision on
which band(s) to use.  Additionally, rename all "dual_band" elements
to "bands", to make things clearer.

Signed-off-by: Luca Coelho &lt;luciano.coelho@intel.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-08 10:43:40 +0100'>2017-02-08</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=bee427b86217b78a0a5fc85575cc155e4c32bbf9'>cfg80211: Pass new RSSI level in CQM RSSI notification</a></td><td>Andrzej Zaborowski</td><td>2</td><td><span class='deletions'>-6</span>/<span class='insertions'>+14</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Update the drivers to pass the RSSI level as a cfg80211_cqm_rssi_notify
parameter and pass this value to userspace in a new nl80211 attribute.
This helps both userspace and also helps in the implementation of the
multiple RSSI thresholds CQM mechanism.

Note for marvell/mwifiex I pass 0 for the RSSI value because the new
RSSI value is not available to the driver at the time of the
cfg80211_cqm_rssi_notify call, but the driver queries the new value
immediately after that, so it is actually available just a moment later
if we wanted to defer caling cfg80211_cqm_rssi_notify until that moment.
Without this, the new cfg80211 code (patch 3) will call .get_station
which will send a duplicate HostCmd_CMD_RSSI_INFO command to the hardware.

Signed-off-by: Andrew Zaborowski &lt;andrew.zaborowski@intel.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-08 10:09:23 +0100'>2017-02-08</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=aad1e812eee31a0e075709c247577b0328a6deab'>nl80211: fix validation of scheduled scan info for wowlan netdetect</a></td><td>Arend Van Spriel</td><td>1</td><td><span class='deletions'>-4</span>/<span class='insertions'>+6</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
For wowlan netdetect a separate limit is defined for the number of
matchsets. Currently, this limit is ignored and the regular limit
for scheduled scan matchsets, ie. struct wiphy::max_match_sets, is
used for the net-detect case as well.

Cc: Johannes Berg &lt;johannes@sipsolutions.net&gt;
Reviewed-by: Hante Meuleman &lt;hante.meuleman@broadcom.com&gt;
Reviewed-by: Pieter-Paul Giesberts &lt;pieter-paul.giesberts@broadcom.com&gt;
Reviewed-by: Franky Lin &lt;franky.lin@broadcom.com&gt;
Signed-off-by: Arend van Spriel &lt;arend.vanspriel@broadcom.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-08 10:06:24 +0100'>2017-02-08</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=66cd794e3c30b8af3b6befe42a378557efb3114a'>nl80211: add HT/VHT capabilities to AP parameters</a></td><td>Johannes Berg</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+46</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
For the benefit of drivers that rebuild IEs in firmware, parse the
IEs for HT/VHT capabilities and the respective membership selector
in the (extended) supported rates. This avoids duplicating the same
code into all drivers that need this information.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-08 10:05:44 +0100'>2017-02-08</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=a4956dca0764569640374ae1afb8be54a23201b8'>cfg80211: make rdev assignment clearer in nl80211_testmode_dump()</a></td><td>Luca Coelho</td><td>1</td><td><span class='deletions'>-7</span>/<span class='insertions'>+6</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Avoid assigning rdev to NULL when we already have it and getting it
again from the wiphy index, by moving this code to relevant if block.

Signed-off-by: Luca Coelho &lt;luciano.coelho@intel.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-08 09:15:59 +0100'>2017-02-08</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=b699b71d82e77203be43bda5ff1b72516f129581'>cfg80211 debugfs: Cleanup some checkpatch issues</a></td><td>Pichugin Dmitry</td><td>1</td><td><span class='deletions'>-5</span>/<span class='insertions'>+5</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
This fixes the checkpatch.pl warnings:
* Macros should not use a trailing semicolon.
* Spaces required around that '='.
* Symbolic permissions 'S_IRUGO' are not preferred.

Signed-off-by: Dmitriy Pichugin &lt;smokeman85@gmail.com&gt;
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2017-02-07 16:29:30 -0500'>2017-02-07</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/net/wireless?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</a></td><td>David S. Miller