mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-22 14:41:27 +00:00
MODSIGN: perlify sign-file and merge in x509keyid
Turn sign-file into perl and merge in x509keyid. The latter doesn't need to be a separate script as it doesn't actually need to work out the SHA1 sum of the X.509 certificate itself, since it can get that from the X.509 certificate. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells
Linus Torvalds
parent
9e7814404b
commit
b37d1bfb55
3 changed files with 399 additions and 346 deletions
2
Makefile
2
Makefile
|
|
@ -723,7 +723,7 @@ ifeq ($(CONFIG_MODULE_SIG),y)
|
||||||
MODSECKEY = ./signing_key.priv
|
MODSECKEY = ./signing_key.priv
|
||||||
MODPUBKEY = ./signing_key.x509
|
MODPUBKEY = ./signing_key.x509
|
||||||
export MODPUBKEY
|
export MODPUBKEY
|
||||||
mod_sign_cmd = sh $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY) $(srctree)/scripts/x509keyid
|
mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY)
|
||||||
else
|
else
|
||||||
mod_sign_cmd = true
|
mod_sign_cmd = true
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
475
scripts/sign-file
Normal file → Executable file
475
scripts/sign-file
Normal file → Executable file
|
|
@ -1,108 +1,429 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/perl -w
|
||||||
#
|
#
|
||||||
# Sign a module file using the given key.
|
# Sign a module file using the given key.
|
||||||
#
|
#
|
||||||
# Format: sign-file <key> <x509> <keyid-script> <module>
|
# Format:
|
||||||
#
|
#
|
||||||
|
# ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]
|
||||||
|
#
|
||||||
|
#
|
||||||
|
use strict;
|
||||||
|
use FileHandle;
|
||||||
|
use IPC::Open2;
|
||||||
|
|
||||||
scripts=`dirname $0`
|
my $verbose = 0;
|
||||||
|
if ($#ARGV >= 0 && $ARGV[0] eq "-v") {
|
||||||
|
$verbose = 1;
|
||||||
|
shift;
|
||||||
|
}
|
||||||
|
|
||||||
CONFIG_MODULE_SIG_SHA512=y
|
die "Format: ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]\n"
|
||||||
if [ -r .config ]
|
if ($#ARGV != 2 && $#ARGV != 3);
|
||||||
then
|
|
||||||
. ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
key="$1"
|
my $private_key = $ARGV[0];
|
||||||
x509="$2"
|
my $x509 = $ARGV[1];
|
||||||
keyid_script="$3"
|
my $module = $ARGV[2];
|
||||||
mod="$4"
|
my $dest = ($#ARGV == 3) ? $ARGV[3] : $ARGV[2] . "~";
|
||||||
|
|
||||||
if [ ! -r "$key" ]
|
die "Can't read private key\n" unless (-r $private_key);
|
||||||
then
|
die "Can't read X.509 certificate\n" unless (-r $x509);
|
||||||
echo "Can't read private key" >&2
|
die "Can't read module\n" unless (-r $module);
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -r "$x509" ]
|
#
|
||||||
then
|
# Read the kernel configuration
|
||||||
echo "Can't read X.509 certificate" >&2
|
#
|
||||||
exit 2
|
my %config = (
|
||||||
fi
|
CONFIG_MODULE_SIG_SHA512 => 1
|
||||||
|
);
|
||||||
|
|
||||||
|
if (-r ".config") {
|
||||||
|
open(FD, "<.config") || die ".config";
|
||||||
|
while (<FD>) {
|
||||||
|
if ($_ =~ /^(CONFIG_.*)=[ym]/) {
|
||||||
|
$config{$1} = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
close(FD);
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Function to read the contents of a file into a variable.
|
||||||
|
#
|
||||||
|
sub read_file($)
|
||||||
|
{
|
||||||
|
my ($file) = @_;
|
||||||
|
my $contents;
|
||||||
|
my $len;
|
||||||
|
|
||||||
|
open(FD, "<$file") || die $file;
|
||||||
|
binmode FD;
|
||||||
|
my @st = stat(FD);
|
||||||
|
die $file if (!@st);
|
||||||
|
$len = read(FD, $contents, $st[7]) || die $file;
|
||||||
|
close(FD) || die $file;
|
||||||
|
die "$file: Wanted length ", $st[7], ", got ", $len, "\n"
|
||||||
|
if ($len != $st[7]);
|
||||||
|
return $contents;
|
||||||
|
}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# First of all, we have to parse the X.509 certificate to find certain details
|
||||||
|
# about it.
|
||||||
|
#
|
||||||
|
# We read the DER-encoded X509 certificate and parse it to extract the Subject
|
||||||
|
# name and Subject Key Identifier. Theis provides the data we need to build
|
||||||
|
# the certificate identifier.
|
||||||
|
#
|
||||||
|
# The signer's name part of the identifier is fabricated from the commonName,
|
||||||
|
# the organizationName or the emailAddress components of the X.509 subject
|
||||||
|
# name.
|
||||||
|
#
|
||||||
|
# The subject key ID is used to select which of that signer's certificates
|
||||||
|
# we're intending to use to sign the module.
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
my $x509_certificate = read_file($x509);
|
||||||
|
|
||||||
|
my $UNIV = 0 << 6;
|
||||||
|
my $APPL = 1 << 6;
|
||||||
|
my $CONT = 2 << 6;
|
||||||
|
my $PRIV = 3 << 6;
|
||||||
|
|
||||||
|
my $CONS = 0x20;
|
||||||
|
|
||||||
|
my $BOOLEAN = 0x01;
|
||||||
|
my $INTEGER = 0x02;
|
||||||
|
my $BIT_STRING = 0x03;
|
||||||
|
my $OCTET_STRING = 0x04;
|
||||||
|
my $NULL = 0x05;
|
||||||
|
my $OBJ_ID = 0x06;
|
||||||
|
my $UTF8String = 0x0c;
|
||||||
|
my $SEQUENCE = 0x10;
|
||||||
|
my $SET = 0x11;
|
||||||
|
my $UTCTime = 0x17;
|
||||||
|
my $GeneralizedTime = 0x18;
|
||||||
|
|
||||||
|
my %OIDs = (
|
||||||
|
pack("CCC", 85, 4, 3) => "commonName",
|
||||||
|
pack("CCC", 85, 4, 6) => "countryName",
|
||||||
|
pack("CCC", 85, 4, 10) => "organizationName",
|
||||||
|
pack("CCC", 85, 4, 11) => "organizationUnitName",
|
||||||
|
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 1) => "rsaEncryption",
|
||||||
|
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 5) => "sha1WithRSAEncryption",
|
||||||
|
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 9, 1) => "emailAddress",
|
||||||
|
pack("CCC", 85, 29, 35) => "authorityKeyIdentifier",
|
||||||
|
pack("CCC", 85, 29, 14) => "subjectKeyIdentifier",
|
||||||
|
pack("CCC", 85, 29, 19) => "basicConstraints"
|
||||||
|
);
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Extract an ASN.1 element from a string and return information about it.
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
sub asn1_extract($$@)
|
||||||
|
{
|
||||||
|
my ($cursor, $expected_tag, $optional) = @_;
|
||||||
|
|
||||||
|
return [ -1 ]
|
||||||
|
if ($cursor->[1] == 0 && $optional);
|
||||||
|
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (elem ", $cursor->[1], ")\n"
|
||||||
|
if ($cursor->[1] < 2);
|
||||||
|
|
||||||
|
my ($tag, $len) = unpack("CC", substr(${$cursor->[2]}, $cursor->[0], 2));
|
||||||
|
|
||||||
|
if ($expected_tag != -1 && $tag != $expected_tag) {
|
||||||
|
return [ -1 ]
|
||||||
|
if ($optional);
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 unexpected tag (", $tag,
|
||||||
|
" not ", $expected_tag, ")\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$cursor->[0] += 2;
|
||||||
|
$cursor->[1] -= 2;
|
||||||
|
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 long tag\n"
|
||||||
|
if (($tag & 0x1f) == 0x1f);
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 indefinite length\n"
|
||||||
|
if ($len == 0x80);
|
||||||
|
|
||||||
|
if ($len > 0x80) {
|
||||||
|
my $l = $len - 0x80;
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (len len $l)\n"
|
||||||
|
if ($cursor->[1] < $l);
|
||||||
|
|
||||||
|
if ($l == 0x1) {
|
||||||
|
$len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1));
|
||||||
|
} elsif ($l = 0x2) {
|
||||||
|
$len = unpack("n", substr(${$cursor->[2]}, $cursor->[0], 2));
|
||||||
|
} elsif ($l = 0x3) {
|
||||||
|
$len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1)) << 16;
|
||||||
|
$len = unpack("n", substr(${$cursor->[2]}, $cursor->[0] + 1, 2));
|
||||||
|
} elsif ($l = 0x4) {
|
||||||
|
$len = unpack("N", substr(${$cursor->[2]}, $cursor->[0], 4));
|
||||||
|
} else {
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 element too long (", $l, ")\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$cursor->[0] += $l;
|
||||||
|
$cursor->[1] -= $l;
|
||||||
|
}
|
||||||
|
|
||||||
|
die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (", $len, ")\n"
|
||||||
|
if ($cursor->[1] < $len);
|
||||||
|
|
||||||
|
my $ret = [ $tag, [ $cursor->[0], $len, $cursor->[2] ] ];
|
||||||
|
$cursor->[0] += $len;
|
||||||
|
$cursor->[1] -= $len;
|
||||||
|
|
||||||
|
return $ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Retrieve the data referred to by a cursor
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
sub asn1_retrieve($)
|
||||||
|
{
|
||||||
|
my ($cursor) = @_;
|
||||||
|
my ($offset, $len, $data) = @$cursor;
|
||||||
|
return substr($$data, $offset, $len);
|
||||||
|
}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Roughly parse the X.509 certificate
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
my $cursor = [ 0, length($x509_certificate), \$x509_certificate ];
|
||||||
|
|
||||||
|
my $cert = asn1_extract($cursor, $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $tbs = asn1_extract($cert->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $version = asn1_extract($tbs->[1], $CONT | $CONS | 0, 1);
|
||||||
|
my $serial_number = asn1_extract($tbs->[1], $UNIV | $INTEGER);
|
||||||
|
my $sig_type = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $issuer = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $validity = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $subject = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $key = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $issuer_uid = asn1_extract($tbs->[1], $CONT | $CONS | 1, 1);
|
||||||
|
my $subject_uid = asn1_extract($tbs->[1], $CONT | $CONS | 2, 1);
|
||||||
|
my $extension_list = asn1_extract($tbs->[1], $CONT | $CONS | 3, 1);
|
||||||
|
|
||||||
|
my $subject_key_id = ();
|
||||||
|
my $authority_key_id = ();
|
||||||
|
|
||||||
|
#
|
||||||
|
# Parse the extension list
|
||||||
|
#
|
||||||
|
if ($extension_list->[0] != -1) {
|
||||||
|
my $extensions = asn1_extract($extension_list->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
|
||||||
|
while ($extensions->[1]->[1] > 0) {
|
||||||
|
my $ext = asn1_extract($extensions->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $x_oid = asn1_extract($ext->[1], $UNIV | $OBJ_ID);
|
||||||
|
my $x_crit = asn1_extract($ext->[1], $UNIV | $BOOLEAN, 1);
|
||||||
|
my $x_val = asn1_extract($ext->[1], $UNIV | $OCTET_STRING);
|
||||||
|
|
||||||
|
my $raw_oid = asn1_retrieve($x_oid->[1]);
|
||||||
|
next if (!exists($OIDs{$raw_oid}));
|
||||||
|
my $x_type = $OIDs{$raw_oid};
|
||||||
|
|
||||||
|
my $raw_value = asn1_retrieve($x_val->[1]);
|
||||||
|
|
||||||
|
if ($x_type eq "subjectKeyIdentifier") {
|
||||||
|
my $vcursor = [ 0, length($raw_value), \$raw_value ];
|
||||||
|
|
||||||
|
$subject_key_id = asn1_extract($vcursor, $UNIV | $OCTET_STRING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Determine what we're going to use as the signer's name. In order of
|
||||||
|
# preference, take one of: commonName, organizationName or emailAddress.
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
my $org = "";
|
||||||
|
my $cn = "";
|
||||||
|
my $email = "";
|
||||||
|
|
||||||
|
while ($subject->[1]->[1] > 0) {
|
||||||
|
my $rdn = asn1_extract($subject->[1], $UNIV | $CONS | $SET);
|
||||||
|
my $attr = asn1_extract($rdn->[1], $UNIV | $CONS | $SEQUENCE);
|
||||||
|
my $n_oid = asn1_extract($attr->[1], $UNIV | $OBJ_ID);
|
||||||
|
my $n_val = asn1_extract($attr->[1], -1);
|
||||||
|
|
||||||
|
my $raw_oid = asn1_retrieve($n_oid->[1]);
|
||||||
|
next if (!exists($OIDs{$raw_oid}));
|
||||||
|
my $n_type = $OIDs{$raw_oid};
|
||||||
|
|
||||||
|
my $raw_value = asn1_retrieve($n_val->[1]);
|
||||||
|
|
||||||
|
if ($n_type eq "organizationName") {
|
||||||
|
$org = $raw_value;
|
||||||
|
} elsif ($n_type eq "commonName") {
|
||||||
|
$cn = $raw_value;
|
||||||
|
} elsif ($n_type eq "emailAddress") {
|
||||||
|
$email = $raw_value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
my $signers_name = $email;
|
||||||
|
|
||||||
|
if ($org && $cn) {
|
||||||
|
# Don't use the organizationName if the commonName repeats it
|
||||||
|
if (length($org) <= length($cn) &&
|
||||||
|
substr($cn, 0, length($org)) eq $org) {
|
||||||
|
$signers_name = $cn;
|
||||||
|
goto got_id_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Or a signifcant chunk of it
|
||||||
|
if (length($org) >= 7 &&
|
||||||
|
length($cn) >= 7 &&
|
||||||
|
substr($cn, 0, 7) eq substr($org, 0, 7)) {
|
||||||
|
$signers_name = $cn;
|
||||||
|
goto got_id_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
$signers_name = $org . ": " . $cn;
|
||||||
|
} elsif ($org) {
|
||||||
|
$signers_name = $org;
|
||||||
|
} elsif ($cn) {
|
||||||
|
$signers_name = $cn;
|
||||||
|
}
|
||||||
|
|
||||||
|
got_id_name:
|
||||||
|
|
||||||
|
die $x509, ": ", "X.509: Couldn't find the Subject Key Identifier extension\n"
|
||||||
|
if (!$subject_key_id);
|
||||||
|
|
||||||
|
my $key_identifier = asn1_retrieve($subject_key_id->[1]);
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Create and attach the module signature
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
#
|
#
|
||||||
# Signature parameters
|
# Signature parameters
|
||||||
#
|
#
|
||||||
algo=1 # Public-key crypto algorithm: RSA
|
my $algo = 1; # Public-key crypto algorithm: RSA
|
||||||
hash= # Digest algorithm
|
my $hash = 0; # Digest algorithm
|
||||||
id_type=1 # Identifier type: X.509
|
my $id_type = 1; # Identifier type: X.509
|
||||||
|
|
||||||
#
|
#
|
||||||
# Digest the data
|
# Digest the data
|
||||||
#
|
#
|
||||||
dgst=
|
my ($dgst, $prologue) = ();
|
||||||
if [ "$CONFIG_MODULE_SIG_SHA1" = "y" ]
|
if (exists $config{"CONFIG_MODULE_SIG_SHA1"}) {
|
||||||
then
|
$prologue = pack("C*",
|
||||||
prologue="0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A, 0x05, 0x00, 0x04, 0x14"
|
0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
|
||||||
dgst=-sha1
|
0x2B, 0x0E, 0x03, 0x02, 0x1A,
|
||||||
hash=2
|
0x05, 0x00, 0x04, 0x14);
|
||||||
elif [ "$CONFIG_MODULE_SIG_SHA224" = "y" ]
|
$dgst = "-sha1";
|
||||||
then
|
$hash = 2;
|
||||||
prologue="0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1C"
|
} elsif (exists $config{"CONFIG_MODULE_SIG_SHA224"}) {
|
||||||
dgst=-sha224
|
$prologue = pack("C*",
|
||||||
hash=7
|
0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
|
||||||
elif [ "$CONFIG_MODULE_SIG_SHA256" = "y" ]
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
|
||||||
then
|
0x05, 0x00, 0x04, 0x1C);
|
||||||
prologue="0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20"
|
$dgst = "-sha224";
|
||||||
dgst=-sha256
|
$hash = 7;
|
||||||
hash=4
|
} elsif (exists $config{"CONFIG_MODULE_SIG_SHA256"}) {
|
||||||
elif [ "$CONFIG_MODULE_SIG_SHA384" = "y" ]
|
$prologue = pack("C*",
|
||||||
then
|
0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
|
||||||
prologue="0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30"
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
|
||||||
dgst=-sha384
|
0x05, 0x00, 0x04, 0x20);
|
||||||
hash=5
|
$dgst = "-sha256";
|
||||||
elif [ "$CONFIG_MODULE_SIG_SHA512" = "y" ]
|
$hash = 4;
|
||||||
then
|
} elsif (exists $config{"CONFIG_MODULE_SIG_SHA384"}) {
|
||||||
prologue="0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40"
|
$prologue = pack("C*",
|
||||||
dgst=-sha512
|
0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
|
||||||
hash=6
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
|
||||||
else
|
0x05, 0x00, 0x04, 0x30);
|
||||||
echo "$0: Can't determine hash algorithm" >&2
|
$dgst = "-sha384";
|
||||||
exit 2
|
$hash = 5;
|
||||||
fi
|
} elsif (exists $config{"CONFIG_MODULE_SIG_SHA512"}) {
|
||||||
|
$prologue = pack("C*",
|
||||||
|
0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
|
||||||
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
|
||||||
|
0x05, 0x00, 0x04, 0x40);
|
||||||
|
$dgst = "-sha512";
|
||||||
|
$hash = 6;
|
||||||
|
} else {
|
||||||
|
die "Can't determine hash algorithm";
|
||||||
|
}
|
||||||
|
|
||||||
(
|
#
|
||||||
perl -e "binmode STDOUT; print pack(\"C*\", $prologue)" || exit $?
|
# Generate the digest and read from openssl's stdout
|
||||||
openssl dgst $dgst -binary $mod || exit $?
|
#
|
||||||
) >$mod.dig || exit $?
|
my $digest;
|
||||||
|
$digest = readpipe("openssl dgst $dgst -binary $module") || die "openssl dgst";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Generate the binary signature, which will be just the integer that comprises
|
# Generate the binary signature, which will be just the integer that comprises
|
||||||
# the signature with no metadata attached.
|
# the signature with no metadata attached.
|
||||||
#
|
#
|
||||||
openssl rsautl -sign -inkey $key -keyform PEM -in $mod.dig -out $mod.sig || exit $?
|
my $pid;
|
||||||
siglen=`stat -c %s $mod.sig`
|
$pid = open2(*read_from, *write_to,
|
||||||
|
"openssl rsautl -sign -inkey $private_key -keyform PEM") ||
|
||||||
|
die "openssl rsautl";
|
||||||
|
binmode write_to;
|
||||||
|
print write_to $prologue . $digest || die "pipe to openssl rsautl";
|
||||||
|
close(write_to) || die "pipe to openssl rsautl";
|
||||||
|
|
||||||
SIGNER="`perl $keyid_script $x509 signer-name`"
|
binmode read_from;
|
||||||
KEYID="`perl $keyid_script $x509 keyid`"
|
my $signature;
|
||||||
keyidlen=$(echo -n "$KEYID" | wc -c)
|
read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
|
||||||
signerlen=$(echo -n "$SIGNER" | wc -c)
|
close(read_from) || die "pipe from openssl rsautl";
|
||||||
|
$signature = pack("n", length($signature)) . $signature,
|
||||||
|
|
||||||
|
waitpid($pid, 0) || die;
|
||||||
|
die "openssl rsautl died: $?" if ($? >> 8);
|
||||||
|
|
||||||
#
|
#
|
||||||
# Build the signed binary
|
# Build the signed binary
|
||||||
#
|
#
|
||||||
(
|
my $unsigned_module = read_file($module);
|
||||||
cat $mod || exit $?
|
|
||||||
echo '~Module signature appended~' || exit $?
|
|
||||||
echo -n "$SIGNER" || exit $?
|
|
||||||
echo -n "$KEYID" || exit $?
|
|
||||||
|
|
||||||
# Preface each signature integer with a 2-byte BE length
|
my $magic_number = "~Module signature appended~\n";
|
||||||
perl -e "binmode STDOUT; print pack(\"n\", $siglen)" || exit $?
|
|
||||||
cat $mod.sig || exit $?
|
|
||||||
|
|
||||||
# Generate the information block
|
my $info = pack("CCCCCxxxN",
|
||||||
perl -e "binmode STDOUT; print pack(\"CCCCCxxxN\", $algo, $hash, $id_type, $signerlen, $keyidlen, $siglen + 2)" || exit $?
|
$algo, $hash, $id_type,
|
||||||
) >$mod~ || exit $?
|
length($signers_name),
|
||||||
|
length($key_identifier),
|
||||||
|
length($signature));
|
||||||
|
|
||||||
mv $mod~ $mod || exit $?
|
if ($verbose) {
|
||||||
|
print "Size of unsigned module: ", length($unsigned_module), "\n";
|
||||||
|
print "Size of magic number : ", length($magic_number), "\n";
|
||||||
|
print "Size of signer's name : ", length($signers_name), "\n";
|
||||||
|
print "Size of key identifier : ", length($key_identifier), "\n";
|
||||||
|
print "Size of signature : ", length($signature), "\n";
|
||||||
|
print "Size of informaton : ", length($info), "\n";
|
||||||
|
print "Signer's name : '", $signers_name, "'\n";
|
||||||
|
print "Digest : $dgst\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
open(FD, ">$dest") || die $dest;
|
||||||
|
binmode FD;
|
||||||
|
print FD
|
||||||
|
$unsigned_module,
|
||||||
|
$magic_number,
|
||||||
|
$signers_name,
|
||||||
|
$key_identifier,
|
||||||
|
$signature,
|
||||||
|
$info
|
||||||
|
;
|
||||||
|
close FD || die $dest;
|
||||||
|
|
||||||
|
if ($#ARGV != 3) {
|
||||||
|
rename($dest, $module) || die $module;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,268 +0,0 @@
|
||||||
#!/usr/bin/perl -w
|
|
||||||
#
|
|
||||||
# Generate an identifier from an X.509 certificate that can be placed in a
|
|
||||||
# module signature to indentify the key to use.
|
|
||||||
#
|
|
||||||
# Format:
|
|
||||||
#
|
|
||||||
# ./scripts/x509keyid <x509-cert> <signer's-name> <key-id>
|
|
||||||
#
|
|
||||||
# We read the DER-encoded X509 certificate and parse it to extract the Subject
|
|
||||||
# name and Subject Key Identifier. The provide the data we need to build the
|
|
||||||
# certificate identifier.
|
|
||||||
#
|
|
||||||
# The signer's name part of the identifier is fabricated from the commonName,
|
|
||||||
# the organizationName or the emailAddress components of the X.509 subject
|
|
||||||
# name and written to the second named file.
|
|
||||||
#
|
|
||||||
# The subject key ID to select which of that signer's certificates we're
|
|
||||||
# intending to use to sign the module is written to the third named file.
|
|
||||||
#
|
|
||||||
use strict;
|
|
||||||
|
|
||||||
my $raw_data;
|
|
||||||
|
|
||||||
die "Need a filename [keyid|signer-name]\n" if ($#ARGV != 1);
|
|
||||||
|
|
||||||
my $src = $ARGV[0];
|
|
||||||
|
|
||||||
open(FD, "<$src") || die $src;
|
|
||||||
binmode FD;
|
|
||||||
my @st = stat(FD);
|
|
||||||
die $src if (!@st);
|
|
||||||
read(FD, $raw_data, $st[7]) || die $src;
|
|
||||||
close(FD);
|
|
||||||
|
|
||||||
my $UNIV = 0 << 6;
|
|
||||||
my $APPL = 1 << 6;
|
|
||||||
my $CONT = 2 << 6;
|
|
||||||
my $PRIV = 3 << 6;
|
|
||||||
|
|
||||||
my $CONS = 0x20;
|
|
||||||
|
|
||||||
my $BOOLEAN = 0x01;
|
|
||||||
my $INTEGER = 0x02;
|
|
||||||
my $BIT_STRING = 0x03;
|
|
||||||
my $OCTET_STRING = 0x04;
|
|
||||||
my $NULL = 0x05;
|
|
||||||
my $OBJ_ID = 0x06;
|
|
||||||
my $UTF8String = 0x0c;
|
|
||||||
my $SEQUENCE = 0x10;
|
|
||||||
my $SET = 0x11;
|
|
||||||
my $UTCTime = 0x17;
|
|
||||||
my $GeneralizedTime = 0x18;
|
|
||||||
|
|
||||||
my %OIDs = (
|
|
||||||
pack("CCC", 85, 4, 3) => "commonName",
|
|
||||||
pack("CCC", 85, 4, 6) => "countryName",
|
|
||||||
pack("CCC", 85, 4, 10) => "organizationName",
|
|
||||||
pack("CCC", 85, 4, 11) => "organizationUnitName",
|
|
||||||
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 1) => "rsaEncryption",
|
|
||||||
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 5) => "sha1WithRSAEncryption",
|
|
||||||
pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 9, 1) => "emailAddress",
|
|
||||||
pack("CCC", 85, 29, 35) => "authorityKeyIdentifier",
|
|
||||||
pack("CCC", 85, 29, 14) => "subjectKeyIdentifier",
|
|
||||||
pack("CCC", 85, 29, 19) => "basicConstraints"
|
|
||||||
);
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Extract an ASN.1 element from a string and return information about it.
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
sub asn1_extract($$@)
|
|
||||||
{
|
|
||||||
my ($cursor, $expected_tag, $optional) = @_;
|
|
||||||
|
|
||||||
return [ -1 ]
|
|
||||||
if ($cursor->[1] == 0 && $optional);
|
|
||||||
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 data underrun (elem ", $cursor->[1], ")\n"
|
|
||||||
if ($cursor->[1] < 2);
|
|
||||||
|
|
||||||
my ($tag, $len) = unpack("CC", substr(${$cursor->[2]}, $cursor->[0], 2));
|
|
||||||
|
|
||||||
if ($expected_tag != -1 && $tag != $expected_tag) {
|
|
||||||
return [ -1 ]
|
|
||||||
if ($optional);
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 unexpected tag (", $tag,
|
|
||||||
" not ", $expected_tag, ")\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$cursor->[0] += 2;
|
|
||||||
$cursor->[1] -= 2;
|
|
||||||
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 long tag\n"
|
|
||||||
if (($tag & 0x1f) == 0x1f);
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 indefinite length\n"
|
|
||||||
if ($len == 0x80);
|
|
||||||
|
|
||||||
if ($len > 0x80) {
|
|
||||||
my $l = $len - 0x80;
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 data underrun (len len $l)\n"
|
|
||||||
if ($cursor->[1] < $l);
|
|
||||||
|
|
||||||
if ($l == 0x1) {
|
|
||||||
$len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1));
|
|
||||||
} elsif ($l = 0x2) {
|
|
||||||
$len = unpack("n", substr(${$cursor->[2]}, $cursor->[0], 2));
|
|
||||||
} elsif ($l = 0x3) {
|
|
||||||
$len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1)) << 16;
|
|
||||||
$len = unpack("n", substr(${$cursor->[2]}, $cursor->[0] + 1, 2));
|
|
||||||
} elsif ($l = 0x4) {
|
|
||||||
$len = unpack("N", substr(${$cursor->[2]}, $cursor->[0], 4));
|
|
||||||
} else {
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 element too long (", $l, ")\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$cursor->[0] += $l;
|
|
||||||
$cursor->[1] -= $l;
|
|
||||||
}
|
|
||||||
|
|
||||||
die $src, ": ", $cursor->[0], ": ASN.1 data underrun (", $len, ")\n"
|
|
||||||
if ($cursor->[1] < $len);
|
|
||||||
|
|
||||||
my $ret = [ $tag, [ $cursor->[0], $len, $cursor->[2] ] ];
|
|
||||||
$cursor->[0] += $len;
|
|
||||||
$cursor->[1] -= $len;
|
|
||||||
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Retrieve the data referred to by a cursor
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
sub asn1_retrieve($)
|
|
||||||
{
|
|
||||||
my ($cursor) = @_;
|
|
||||||
my ($offset, $len, $data) = @$cursor;
|
|
||||||
return substr($$data, $offset, $len);
|
|
||||||
}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Roughly parse the X.509 certificate
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
my $cursor = [ 0, length($raw_data), \$raw_data ];
|
|
||||||
|
|
||||||
my $cert = asn1_extract($cursor, $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $tbs = asn1_extract($cert->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $version = asn1_extract($tbs->[1], $CONT | $CONS | 0, 1);
|
|
||||||
my $serial_number = asn1_extract($tbs->[1], $UNIV | $INTEGER);
|
|
||||||
my $sig_type = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $issuer = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $validity = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $subject = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $key = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $issuer_uid = asn1_extract($tbs->[1], $CONT | $CONS | 1, 1);
|
|
||||||
my $subject_uid = asn1_extract($tbs->[1], $CONT | $CONS | 2, 1);
|
|
||||||
my $extension_list = asn1_extract($tbs->[1], $CONT | $CONS | 3, 1);
|
|
||||||
|
|
||||||
my $subject_key_id = ();
|
|
||||||
my $authority_key_id = ();
|
|
||||||
|
|
||||||
#
|
|
||||||
# Parse the extension list
|
|
||||||
#
|
|
||||||
if ($extension_list->[0] != -1) {
|
|
||||||
my $extensions = asn1_extract($extension_list->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
|
|
||||||
while ($extensions->[1]->[1] > 0) {
|
|
||||||
my $ext = asn1_extract($extensions->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $x_oid = asn1_extract($ext->[1], $UNIV | $OBJ_ID);
|
|
||||||
my $x_crit = asn1_extract($ext->[1], $UNIV | $BOOLEAN, 1);
|
|
||||||
my $x_val = asn1_extract($ext->[1], $UNIV | $OCTET_STRING);
|
|
||||||
|
|
||||||
my $raw_oid = asn1_retrieve($x_oid->[1]);
|
|
||||||
next if (!exists($OIDs{$raw_oid}));
|
|
||||||
my $x_type = $OIDs{$raw_oid};
|
|
||||||
|
|
||||||
my $raw_value = asn1_retrieve($x_val->[1]);
|
|
||||||
|
|
||||||
if ($x_type eq "subjectKeyIdentifier") {
|
|
||||||
my $vcursor = [ 0, length($raw_value), \$raw_value ];
|
|
||||||
|
|
||||||
$subject_key_id = asn1_extract($vcursor, $UNIV | $OCTET_STRING);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Determine what we're going to use as the signer's name. In order of
|
|
||||||
# preference, take one of: commonName, organizationName or emailAddress.
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
my $org = "";
|
|
||||||
my $cn = "";
|
|
||||||
my $email = "";
|
|
||||||
|
|
||||||
while ($subject->[1]->[1] > 0) {
|
|
||||||
my $rdn = asn1_extract($subject->[1], $UNIV | $CONS | $SET);
|
|
||||||
my $attr = asn1_extract($rdn->[1], $UNIV | $CONS | $SEQUENCE);
|
|
||||||
my $n_oid = asn1_extract($attr->[1], $UNIV | $OBJ_ID);
|
|
||||||
my $n_val = asn1_extract($attr->[1], -1);
|
|
||||||
|
|
||||||
my $raw_oid = asn1_retrieve($n_oid->[1]);
|
|
||||||
next if (!exists($OIDs{$raw_oid}));
|
|
||||||
my $n_type = $OIDs{$raw_oid};
|
|
||||||
|
|
||||||
my $raw_value = asn1_retrieve($n_val->[1]);
|
|
||||||
|
|
||||||
if ($n_type eq "organizationName") {
|
|
||||||
$org = $raw_value;
|
|
||||||
} elsif ($n_type eq "commonName") {
|
|
||||||
$cn = $raw_value;
|
|
||||||
} elsif ($n_type eq "emailAddress") {
|
|
||||||
$email = $raw_value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
my $id_name = $email;
|
|
||||||
|
|
||||||
if ($org && $cn) {
|
|
||||||
# Don't use the organizationName if the commonName repeats it
|
|
||||||
if (length($org) <= length($cn) &&
|
|
||||||
substr($cn, 0, length($org)) eq $org) {
|
|
||||||
$id_name = $cn;
|
|
||||||
goto got_id_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Or a signifcant chunk of it
|
|
||||||
if (length($org) >= 7 &&
|
|
||||||
length($cn) >= 7 &&
|
|
||||||
substr($cn, 0, 7) eq substr($org, 0, 7)) {
|
|
||||||
$id_name = $cn;
|
|
||||||
goto got_id_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
$id_name = $org . ": " . $cn;
|
|
||||||
} elsif ($org) {
|
|
||||||
$id_name = $org;
|
|
||||||
} elsif ($cn) {
|
|
||||||
$id_name = $cn;
|
|
||||||
}
|
|
||||||
|
|
||||||
got_id_name:
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Output the signer's name and the key identifier that we're going to include
|
|
||||||
# in module signatures.
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
die $src, ": ", "X.509: Couldn't find the Subject Key Identifier extension\n"
|
|
||||||
if (!$subject_key_id);
|
|
||||||
|
|
||||||
my $id_key_id = asn1_retrieve($subject_key_id->[1]);
|
|
||||||
|
|
||||||
if ($ARGV[1] eq "signer-name") {
|
|
||||||
print $id_name;
|
|
||||||
} elsif ($ARGV[1] eq "keyid") {
|
|
||||||
print $id_key_id;
|
|
||||||
} else {
|
|
||||||
die "Unknown arg";
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue