diff options
| -rw-r--r-- | docs/rpki-db-schema.pdf | bin | 5685 -> 5712 bytes | |||
| -rw-r--r-- | docs/rpki-db-schema.sql | 4 | ||||
| -rw-r--r-- | scripts/README | 2 | ||||
| -rw-r--r-- | scripts/rpki/left_right.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/sql.py | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/docs/rpki-db-schema.pdf b/docs/rpki-db-schema.pdf Binary files differindex bdee4165..eb803b57 100644 --- a/docs/rpki-db-schema.pdf +++ b/docs/rpki-db-schema.pdf diff --git a/docs/rpki-db-schema.sql b/docs/rpki-db-schema.sql index 5ed0fe66..a9e08eb9 100644 --- a/docs/rpki-db-schema.sql +++ b/docs/rpki-db-schema.sql @@ -26,6 +26,7 @@ CREATE TABLE bsc ( private_key_id LONGBLOB, self_id BIGINT unsigned NOT NULL, public_key LONGBLOB, + hash_alg TEXT, PRIMARY KEY (bsc_id), FOREIGN KEY (self_id) REFERENCES self ); @@ -123,8 +124,9 @@ DROP TABLE IF EXISTS child_cert; CREATE TABLE child_cert ( child_cert_id SERIAL NOT NULL, cert LONGBLOB NOT NULL, - child_id BIGINT unsigned NOT NULL, ski TINYBLOB NOT NULL, + revoked BOOLEAN, + child_id BIGINT unsigned NOT NULL, ca_detail_id BIGINT unsigned NOT NULL, PRIMARY KEY (child_cert_id), FOREIGN KEY (ca_detail_id) REFERENCES ca_detail, diff --git a/scripts/README b/scripts/README index 2687d3c8..cc43c207 100644 --- a/scripts/README +++ b/scripts/README @@ -52,7 +52,7 @@ To do list: everything that might need to be done figuring out whether to regenerate or remove expired certs requires - some of the same data as crl generatoin + some of the same data as crl generation - tiny up-down root server -- no sql or left-right needed, just config file, http server, static root cert and key. in theory this should diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index e4756a51..d39c2e41 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -280,7 +280,7 @@ class bsc_elt(data_elt): elements = ('signing_cert',) booleans = ("generate_keypair", "clear_signing_certs") - sql_template = rpki.sql.template("bsc", "bsc_id", "self_id", "public_key", "private_key_id") + sql_template = rpki.sql.template("bsc", "bsc_id", "self_id", "public_key", "private_key_id", "hash_alg") pkcs10_cert_request = None public_key = None diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py index 9b78decc..26eaf07c 100644 --- a/scripts/rpki/sql.py +++ b/scripts/rpki/sql.py @@ -409,7 +409,7 @@ class ca_detail_obj(sql_persistant): class child_cert_obj(sql_persistant): """Certificate that has been issued to a child.""" - sql_template = template("child_cert", "child_cert_id", "cert", "child_id", "ca_detail_id") + sql_template = template("child_cert", "child_cert_id", "cert", "child_id", "ca_detail_id", "revoked") def __init__(self, child_id = None, ca_detail_id = None, cert = None): """Initialize a child_cert_obj.""" |