diff options
| author | Michael Brown | 2016-08-25 16:38:58 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-08-31 16:41:02 +0200 |
| commit | 9a1a42f2830ac797070cb6f807869872d7e7c19a (patch) | |
| tree | 1ddddac488c2fd20a17a0e7df895411f05769f19 | |
| parent | [crypto] Expose certstore_del() to explicitly remove stored certificates (diff) | |
| download | ipxe-9a1a42f2830ac797070cb6f807869872d7e7c19a.tar.gz ipxe-9a1a42f2830ac797070cb6f807869872d7e7c19a.tar.xz ipxe-9a1a42f2830ac797070cb6f807869872d7e7c19a.zip | |
[crypto] Allow certificates to be marked as having been added explicitly
Allow certificates to be marked as having been added explicitly at run
time. Such certificates will not be discarded via the certificate
store cache discarder.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/crypto/certstore.c | 23 | ||||
| -rw-r--r-- | src/include/ipxe/x509.h | 4 |
2 files changed, 23 insertions, 4 deletions
diff --git a/src/crypto/certstore.c b/src/crypto/certstore.c index 9809413a..d0ef5c5d 100644 --- a/src/crypto/certstore.c +++ b/src/crypto/certstore.c @@ -152,6 +152,10 @@ void certstore_add ( struct x509_certificate *cert ) { */ void certstore_del ( struct x509_certificate *cert ) { + /* Ignore attempts to remove permanent certificates */ + if ( cert->flags & X509_FL_PERMANENT ) + return; + /* Remove certificate from store */ DBGC ( &certstore, "CERTSTORE removed certificate %s\n", x509_name ( cert ) ); @@ -171,11 +175,22 @@ static unsigned int certstore_discard ( void ) { * only reference is held by the store itself. */ list_for_each_entry_reverse ( cert, &certstore.links, store.list ) { - if ( cert->refcnt.count == 0 ) { - certstore_del ( cert ); - return 1; - } + + /* Skip certificates for which another reference is held */ + if ( cert->refcnt.count > 0 ) + continue; + + /* Skip certificates that were added at build time or + * added explicitly at run time. + */ + if ( cert->flags & ( X509_FL_PERMANENT | X509_FL_EXPLICIT ) ) + continue; + + /* Discard certificate */ + certstore_del ( cert ); + return 1; } + return 0; } diff --git a/src/include/ipxe/x509.h b/src/include/ipxe/x509.h index 58f91c01..78eeafbf 100644 --- a/src/include/ipxe/x509.h +++ b/src/include/ipxe/x509.h @@ -220,6 +220,10 @@ struct x509_certificate { enum x509_flags { /** Certificate has been validated */ X509_FL_VALIDATED = 0x0001, + /** Certificate was added at build time */ + X509_FL_PERMANENT = 0x0002, + /** Certificate was added explicitly at run time */ + X509_FL_EXPLICIT = 0x0004, }; /** |