diff --git a/ietf-voucher-request.yang b/ietf-voucher-request.yang
index 38d4e6e..d027cd3 100644
--- a/ietf-voucher-request.yang
+++ b/ietf-voucher-request.yang
@@ -25,18 +25,18 @@ module ietf-voucher-request {
"IETF ANIMA Working Group";
contact
- "WG Web:
- WG List:
- Author: Kent Watsen
-
- Author: Michael H. Behringer
-
- Author: Toerless Eckert
-
- Author: Max Pritikin
-
- Author: Michael Richardson
- ";
+ "WG Web:
+ WG List:
+ Author: Kent Watsen
+
+ Author: Michael Richardson
+
+ Author: Max Pritikin
+
+ Author: Toerless Eckert
+
+ Author: Qiufang Ma
+ ";
description
"This module defines the format for a voucher request.
@@ -50,18 +50,25 @@ module ietf-voucher-request {
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.
- Copyright (c) 2019 IETF Trust and the persons identified as
- authors of the code. All rights reserved.
+ Copyright (c) 2024 IETF Trust and the persons identified as
+ authors of the code. All rights reserved.
- Redistribution and use in source and binary forms, with or
- without modification, is permitted pursuant to, and subject
- to the license terms contained in, the Simplified BSD License
- set forth in Section 4.c of the IETF Trust's Legal Provisions
- Relating to IETF Documents
- (http://trustee.ietf.org/license-info).
+ Redistribution and use in source and binary forms, with or
+ without modification, is permitted pursuant to, and subject to
+ the license terms contained in, the Revised BSD License set
+ forth in Section 4.c of the IETF Trust's Legal Provisions
+ Relating to IETF Documents
+ (https://trustee.ietf.org/license-info).
- This version of this YANG module is part of RFC XXXX; see the
- RFC itself for full legal notices.";
+ This version of this YANG module is part of RFC XXXX
+ (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
+ for full legal notices.
+
+ The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+ NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
+ 'MAY', and 'OPTIONAL' in this document are to be interpreted as
+ described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
+ they appear in all capitals, as shown here.";
revision "YYYY-MM-DD" {
description
@@ -254,6 +261,4 @@ module ietf-voucher-request {
}
}
}
-
}
-
diff --git a/ietf-voucher.yang b/ietf-voucher.yang
index aeadf2b..3dd4e78 100644
--- a/ietf-voucher.yang
+++ b/ietf-voucher.yang
@@ -20,16 +20,19 @@ module ietf-voucher {
organization
"IETF ANIMA Working Group";
contact
- "WG Web:
- WG List:
- Author: Kent Watsen
-
- Author: Max Pritikin
-
- Author: Michael Richardson
-
- Author: Toerless Eckert
- ";
+ "WG Web:
+ WG List:
+ Author: Kent Watsen
+
+ Author: Michael Richardson
+
+ Author: Max Pritikin
+
+ Author: Toerless Eckert
+
+ Author: Qiufang Ma
+ ";
+
description
"This module defines the format for a voucher, which is
produced by a pledge's manufacturer or delegate (MASA)
@@ -37,24 +40,25 @@ module ietf-voucher {
pledge may establish a secure connection to the owner's
network infrastructure.
- The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
- NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
- 'MAY', and 'OPTIONAL' in this document are to be interpreted as
- described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
- they appear in all capitals, as shown here.
-
- Copyright (c) 2023 IETF Trust and the persons identified as
+ Copyright (c) 2024 IETF Trust and the persons identified as
authors of the code. All rights reserved.
Redistribution and use in source and binary forms, with or
- without modification, is permitted pursuant to, and subject
- to the license terms contained in, the Simplified BSD License
- set forth in Section 4.c of the IETF Trust's Legal Provisions
+ without modification, is permitted pursuant to, and subject to
+ the license terms contained in, the Revised BSD License set
+ forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents
(https://trustee.ietf.org/license-info).
- This version of this YANG module is part of RFC 8366; see the
- RFC itself for full legal notices.";
+ This version of this YANG module is part of RFC XXXX
+ (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
+ for full legal notices.
+
+ The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+ NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
+ 'MAY', and 'OPTIONAL' in this document are to be interpreted as
+ described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
+ they appear in all capitals, as shown here.";
revision YYYY-MM-DD {
description
@@ -79,7 +83,6 @@ module ietf-voucher {
leaf created-on {
type yang:date-and-time;
- mandatory false;
description
"A value indicating the date this voucher was created.
This node is primarily for human consumption and auditing.
@@ -140,6 +143,12 @@ module ietf-voucher {
a registrar agent has made contact with the device.";
}
}
+ description
+ "The assertion is a statement from the MASA regarding how
+ the owner was verified. This statement enables pledges
+ to support more detailed policy checks. Pledges MUST
+ ensure that the assertion provided is acceptable, per
+ local policy, before processing the voucher.";
}
leaf serial-number {
type string;
@@ -170,7 +179,6 @@ module ietf-voucher {
}
leaf pinned-domain-cert {
type binary;
- mandatory false;
description
"An X.509 v3 certificate structure, as specified by
RFC 5280, using Distinguished Encoding Rules (DER)