vbatts/sbsigntools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fileio: Unify key & cert loading

Browse source 
Rather than duplicating the key & certificate loading in each tool,
unify it in a fileio object.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
This commit is contained in:
Jeremy Kerr 2012-08-03 10:36:38 +08:00
parent d27647ba69
commit d19b993024
6 changed files with 138 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sbsign.c
View file

@ -53,6 +53,7 @@
#include "idc.h"
#include "image.h"
#include "fileio.h"
static const char *toolname = "sbsign";
@ -185,20 +186,13 @@ int main(int argc, char **argv)
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
BIO *privkey_bio = BIO_new_file(keyfilename, "r");
EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privkey_bio, NULL, NULL, NULL);
if (!pkey) {
fprintf(stderr, "error reading private key %s\n", keyfilename);
EVP_PKEY *pkey = fileio_read_pkey(keyfilename);
if (!pkey)
return EXIT_FAILURE;
}
BIO *cert_bio = BIO_new_file(certfilename, "r");
X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
if (!cert) {
fprintf(stderr, "error reading certificate %s\n", certfilename);
X509 *cert = fileio_read_cert(certfilename);
if (!cert)
return EXIT_FAILURE;
}
const EVP_MD *md = EVP_get_digestbyname("SHA256");