p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modsign: Make sign-file determine the format of the X.509 cert 

Make sign-file determine the format of the X.509 certificate by reading the
first two bytes and seeing if the first byte is 0x30 and the second
0x81-0x84.  If this is the case, assume it's DER encoded, otherwise assume
it to be PEM encoded.

Without this, it gets awkward to deal with the error messages from
d2i_X509_bio() when we want to call BIO_reset() and then PEM_read_bio() in
case the certificate was PEM encoded rather than X.509 encoded.

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Ben Hutchings <ben@decadent.org.uk>
cc: David Woodhouse <dwmw2@infradead.org>
cc: Juerg Haefliger <juerg.haefliger@hpe.com>
cc: Ben Hutchings <ben@decadent.org.uk>
This commit is contained in:
David Howells 2016-06-14 13:18:33 +01:00
parent 965475acca
commit 9552c7aebb
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/sign-file.c
View File

@ -1,6 +1,6 @@
/* Sign a module file using the given key. /* Sign a module file using the given key.
* *
* Copyright © 2014-2015 Red Hat, Inc. All Rights Reserved. * Copyright © 2014-2016 Red Hat, Inc. All Rights Reserved.
* Copyright © 2015 Intel Corporation. * Copyright © 2015 Intel Corporation.
* Copyright © 2016 Hewlett Packard Enterprise Development LP * Copyright © 2016 Hewlett Packard Enterprise Development LP
* *
@ -167,19 +167,37 @@ static EVP_PKEY *read_private_key(const char *private_key_name)
static X509 *read_x509(const char *x509_name) static X509 *read_x509(const char *x509_name)
{ {
unsigned char buf[2];
X509 *x509; X509 *x509;
BIO *b; BIO *b;
int n;
b = BIO_new_file(x509_name, "rb"); b = BIO_new_file(x509_name, "rb");
ERR(!b, "%s", x509_name); ERR(!b, "%s", x509_name);
x509 = d2i_X509_bio(b, NULL); /* Binary encoded X.509 */
if (!x509) { /* Look at the first two bytes of the file to determine the encoding */
ERR(BIO_reset(b) != 1, "%s", x509_name); n = BIO_read(b, buf, 2);
x509 = PEM_read_bio_X509(b, NULL, NULL, if (n != 2) {
NULL); /* PEM encoded X.509 */ if (BIO_should_retry(b)) {
if (x509) fprintf(stderr, "%s: Read wanted retry\n", x509_name);
drain_openssl_errors(); exit(1);
}
if (n >= 0) {
fprintf(stderr, "%s: Short read\n", x509_name);
exit(1);
}
ERR(1, "%s", x509_name);
} }
ERR(BIO_reset(b) != 0, "%s", x509_name);
if (buf[0] == 0x30 && buf[1] >= 0x81 && buf[1] <= 0x84)
/* Assume raw DER encoded X.509 */
x509 = d2i_X509_bio(b, NULL);
else
/* Assume PEM encoded X.509 */
x509 = PEM_read_bio_X509(b, NULL, NULL, NULL);
BIO_free(b); BIO_free(b);
ERR(!x509, "%s", x509_name); ERR(!x509, "%s", x509_name);