diff options
| author | Rob Austein <sra@hactrn.net> | 2012-04-17 16:00:14 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-04-17 16:00:14 +0000 |
| commit | b2758f76e29bd2d30dcad3b86a44825fdd320afa (patch) | |
| tree | 9ff1c9d7b02c94142b0bc1bf422096d1e30d759d /rpkid | |
| parent | 7e3dbedf0de90c748890117fb649af9bc2c6554d (diff) | |
Make "valid_until" optional in schema for setup protocol. Fixes #237.
svn path=/trunk/; revision=4430
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/myrpki.rnc | 2 | ||||
| -rw-r--r-- | rpkid/myrpki.rng | 8 | ||||
| -rw-r--r-- | rpkid/rpki/relaxng.py | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/rpkid/myrpki.rnc b/rpkid/myrpki.rnc index 8acb16cf..74603229 100644 --- a/rpkid/myrpki.rnc +++ b/rpkid/myrpki.rnc @@ -111,7 +111,7 @@ repository_payload = ( start |= element parent { attribute version { version }, - attribute valid_until { timestamp }, + attribute valid_until { timestamp }?, attribute service_uri { uri }?, attribute child_handle { object_handle }, attribute parent_handle { object_handle }, diff --git a/rpkid/myrpki.rng b/rpkid/myrpki.rng index 5893f1e5..c4f7eb92 100644 --- a/rpkid/myrpki.rng +++ b/rpkid/myrpki.rng @@ -265,9 +265,11 @@ <attribute name="version"> <ref name="version"/> </attribute> - <attribute name="valid_until"> - <ref name="timestamp"/> - </attribute> + <optional> + <attribute name="valid_until"> + <ref name="timestamp"/> + </attribute> + </optional> <optional> <attribute name="service_uri"> <ref name="uri"/> diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py index bbe52eb5..0c719102 100644 --- a/rpkid/rpki/relaxng.py +++ b/rpkid/rpki/relaxng.py @@ -2108,9 +2108,11 @@ myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encodin <attribute name="version"> <ref name="version"/> </attribute> - <attribute name="valid_until"> - <ref name="timestamp"/> - </attribute> + <optional> + <attribute name="valid_until"> + <ref name="timestamp"/> + </attribute> + </optional> <optional> <attribute name="service_uri"> <ref name="uri"/> |