diff options
Diffstat (limited to 'rpkid/left-right-schema.rnc')
| -rw-r--r-- | rpkid/left-right-schema.rnc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rpkid/left-right-schema.rnc b/rpkid/left-right-schema.rnc index 44ae964f..83be22bd 100644 --- a/rpkid/left-right-schema.rnc +++ b/rpkid/left-right-schema.rnc @@ -81,19 +81,18 @@ bsc_bool = ((attribute generate_keypair { "yes" }, bsc_id = attribute bsc_id { sql_id } -bsc_payload = (element signing_cert { base64 }*, - element public_key { base64 }?) +bsc_payload = (element signing_cert { base64 }*) -bsc_pkcs10 = element pkcs10_cert_request { base64 }? +bsc_pkcs10 = element pkcs10_request { base64 }? bsc_elt |= element bsc { ctl_cq, self_id, bsc_bool, bsc_payload } bsc_elt |= element bsc { ctl_cr, self_id, bsc_id, bsc_pkcs10 } bsc_elt |= element bsc { ctl_sq, self_id, bsc_id, bsc_bool, bsc_payload } bsc_elt |= element bsc { ctl_sr, self_id, bsc_id, bsc_pkcs10 } bsc_elt |= element bsc { ctl_gq, self_id, bsc_id } -bsc_elt |= element bsc { ctl_gr, self_id, bsc_id, bsc_payload } +bsc_elt |= element bsc { ctl_gr, self_id, bsc_id, bsc_payload, bsc_pkcs10 } bsc_elt |= element bsc { ctl_lq, self_id } -bsc_elt |= element bsc { ctl_lr, self_id, bsc_id, bsc_payload } +bsc_elt |= element bsc { ctl_lr, self_id, bsc_id, bsc_payload, bsc_pkcs10 } bsc_elt |= element bsc { ctl_dq, self_id, bsc_id } bsc_elt |= element bsc { ctl_dr, self_id, bsc_id } |