diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-09-05 20:35:53 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-09-05 20:35:53 +0900 |
| commit | 16b1353a36171ae06d63fd309f4772dbfb1da113 (patch) | |
| tree | cf6c297ee81aba0d9b47f23d78a889667e7bce48 /roms/ipxe/src/crypto/rootcert.c | |
| parent | a15119db2ff5c2fdfdeb913b297bf8aa3399132e (diff) | |
| download | qemu-16b1353a36171ae06d63fd309f4772dbfb1da113.tar.gz qemu-16b1353a36171ae06d63fd309f4772dbfb1da113.tar.bz2 qemu-16b1353a36171ae06d63fd309f4772dbfb1da113.zip | |
Imported Upstream version 2.1.0upstream/2.1.0
Diffstat (limited to 'roms/ipxe/src/crypto/rootcert.c')
| -rw-r--r-- | roms/ipxe/src/crypto/rootcert.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/roms/ipxe/src/crypto/rootcert.c b/roms/ipxe/src/crypto/rootcert.c index 30ca170f5..ae28905ac 100644 --- a/roms/ipxe/src/crypto/rootcert.c +++ b/roms/ipxe/src/crypto/rootcert.c @@ -58,7 +58,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); static const uint8_t fingerprints[] = { TRUSTED }; /** Root certificate fingerprint setting */ -static struct setting trust_setting __setting ( SETTING_CRYPTO ) = { +static struct setting trust_setting __setting ( SETTING_CRYPTO, trust ) = { .name = "trust", .description = "Trusted root certificate fingerprints", .tag = DHCP_EB_TRUST, @@ -91,7 +91,6 @@ struct x509_root root_certificates = { static void rootcert_init ( void ) { void *external = NULL; int len; - int rc; /* Allow trusted root certificates to be overridden only if * not explicitly specified at build time. @@ -101,21 +100,8 @@ static void rootcert_init ( void ) { /* Fetch copy of "trust" setting, if it exists. This * memory will never be freed. */ - len = fetch_setting_copy ( NULL, &trust_setting, &external ); - if ( len < 0 ) { - rc = len; - DBGC ( &root_certificates, "ROOTCERT cannot fetch " - "trusted root certificate fingerprints: %s\n", - strerror ( rc ) ); - /* No way to prevent startup; fail safe by - * trusting no certificates. - */ - root_certificates.count = 0; - return; - } - - /* Use certificates from "trust" setting, if present */ - if ( external ) { + if ( ( len = fetch_raw_setting_copy ( NULL, &trust_setting, + &external ) ) >= 0 ) { root_certificates.fingerprints = external; root_certificates.count = ( len / FINGERPRINT_LEN ); } |